Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5026) +++ trunk/doc-rnd/hacking/renames (revision 5027) @@ -925,3 +925,20 @@ UNDO_NETLISTCHANGE -> PCB_UNDO_NETLISTCHANGE UNDO_CHANGEPINNUM -> PCB_UNDO_CHANGEPINNUM UNDO_CHANGERADII -> PCB_UNDO_CHANGERADII +ROTATE_TYPES -> PCB_ROTATE_TYPES +CHANGENAME_TYPES -> PCB_CHANGENAME_TYPES +CHANGESIZE_TYPES -> PCB_CHANGESIZE_TYPES +CHANGE2NDSIZE_TYPES -> PCB_CHANGE2NDSIZE_TYPES +CHANGECLEARSIZE_TYPES -> PCB_CHANGECLEARSIZE_TYPES +CHANGENONETLIST_TYPES -> PCB_CHANGENONETLIST_TYPES +CHANGESQUARE_TYPES -> PCB_CHANGESQUARE_TYPES +CHANGEOCTAGON_TYPES -> PCB_CHANGEOCTAGON_TYPES +CHANGEJOIN_TYPES -> PCB_CHANGEJOIN_TYPES +CHANGETHERMAL_TYPES -> PCB_CHANGETHERMAL_TYPES +CHANGEMASKSIZE_TYPES -> PCB_CHANGEMASKSIZE_TYPES +SELECT_TYPES -> PCB_SELECT_TYPES +MOVE_TYPES -> PCB_MOVE_TYPES +MOVETOLAYER_TYPES -> PCB_MOVETOLAYER_TYPES +INSERT_TYPES -> PCB_INSERT_TYPES +COPY_TYPES -> PCB_COPY_TYPES +REMOVE_TYPES -> PCB_REMOVE_TYPES Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5026) +++ trunk/src/action_helper.c (revision 5027) @@ -574,15 +574,15 @@ * (Note.Moving) or clicked on a MOVE_TYPE * (Note.Hit) */ - for (test = (SELECT_TYPES | MOVE_TYPES) & ~PCB_TYPE_RATLINE; test; test &= ~type) { + for (test = (PCB_SELECT_TYPES | PCB_MOVE_TYPES) & ~PCB_TYPE_RATLINE; test; test &= ~type) { type = pcb_search_screen(Note.X, Note.Y, test, &ptr1, &ptr2, &ptr3); - if (!Note.Hit && (type & MOVE_TYPES) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) { + if (!Note.Hit && (type & PCB_MOVE_TYPES) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) { Note.Hit = type; Note.ptr1 = ptr1; Note.ptr2 = ptr2; Note.ptr3 = ptr3; } - if (!Note.Moving && (type & SELECT_TYPES) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2)) + if (!Note.Moving && (type & PCB_SELECT_TYPES) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2)) Note.Moving = pcb_true; if ((Note.Hit && Note.Moving) || type == PCB_TYPE_NONE) break; @@ -1101,7 +1101,7 @@ } case PCB_MODE_REMOVE: - if ((type = pcb_search_screen(Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(Note.X, Note.Y, PCB_REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); break; @@ -1141,7 +1141,7 @@ /* first notify, lookup object */ case STATE_FIRST: { - int types = (conf_core.editor.mode == PCB_MODE_COPY) ? COPY_TYPES : MOVE_TYPES; + int types = (conf_core.editor.mode == PCB_MODE_COPY) ? PCB_COPY_TYPES : PCB_MOVE_TYPES; Crosshair.AttachedObject.Type = pcb_search_screen(Note.X, Note.Y, types, @@ -1188,7 +1188,7 @@ /* first notify, lookup object */ case STATE_FIRST: Crosshair.AttachedObject.Type = - pcb_search_screen(Note.X, Note.Y, INSERT_TYPES, + pcb_search_screen(Note.X, Note.Y, PCB_INSERT_TYPES, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { Index: trunk/src/action_helper.h =================================================================== --- trunk/src/action_helper.h (revision 5026) +++ trunk/src/action_helper.h (revision 5027) @@ -31,8 +31,6 @@ #include "global_typedefs.h" -#define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_VIA | PCB_TYPE_POLYGON - /* Event handler to set the cursor according to the X pointer position called from inside main.c */ void pcb_event_move_crosshair(int ev_x, int ev_y); Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 5026) +++ trunk/src/change.h (revision 5027) @@ -34,36 +34,36 @@ /* --------------------------------------------------------------------------- * some defines */ -#define CHANGENAME_TYPES \ +#define PCB_CHANGENAME_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE) -#define CHANGESIZE_TYPES \ +#define PCB_CHANGESIZE_TYPES \ (PCB_TYPE_POLYGON | PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_LINE | \ PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ELEMENT) -#define CHANGE2NDSIZE_TYPES \ +#define PCB_CHANGE2NDSIZE_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_ELEMENT) /* We include polygons here only to inform the user not to do it that way. */ -#define CHANGECLEARSIZE_TYPES \ +#define PCB_CHANGECLEARSIZE_TYPES \ (PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON) -#define CHANGENONETLIST_TYPES \ +#define PCB_CHANGENONETLIST_TYPES \ (PCB_TYPE_ELEMENT) -#define CHANGESQUARE_TYPES \ +#define PCB_CHANGESQUARE_TYPES \ (PCB_TYPE_ELEMENT | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA) -#define CHANGEOCTAGON_TYPES \ +#define PCB_CHANGEOCTAGON_TYPES \ (PCB_TYPE_ELEMENT | PCB_TYPE_PIN | PCB_TYPE_VIA) -#define CHANGEJOIN_TYPES \ +#define PCB_CHANGEJOIN_TYPES \ (PCB_TYPE_ARC | PCB_TYPE_LINE | PCB_TYPE_TEXT) -#define CHANGETHERMAL_TYPES \ +#define PCB_CHANGETHERMAL_TYPES \ (PCB_TYPE_PIN | PCB_TYPE_VIA) -#define CHANGEMASKSIZE_TYPES \ +#define PCB_CHANGEMASKSIZE_TYPES \ (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_PAD) pcb_bool pcb_chg_selected_size(int, pcb_coord_t, pcb_bool); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 5026) +++ trunk/src/change_act.c (revision 5027) @@ -81,12 +81,12 @@ if (funcid == F_Object) { gui->get_coords(_("Select an Object"), &x, &y); - type = pcb_search_screen(x, y, CHANGECLEARSIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, PCB_CHANGECLEARSIZE_TYPES, &ptr1, &ptr2, &ptr3); } if (strcmp(argv[1], "style") == 0) { - if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLYGON)) /* workaround: pcb_search_screen(CHANGECLEARSIZE_TYPES) wouldn't return elements */ - type = pcb_search_screen(x, y, CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); + if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLYGON)) /* 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; absolute = 1; @@ -124,7 +124,7 @@ break; case F_Selected: case F_SelectedObjects: - if (pcb_chg_selected_clear_size(CHANGECLEARSIZE_TYPES, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_CHANGECLEARSIZE_TYPES, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; } @@ -195,7 +195,7 @@ int type; void *ptr1, *ptr2, *ptr3; - if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (set_object(type, ptr1, ptr2, ptr3)) @@ -240,7 +240,7 @@ case F_Selected: case F_SelectedObjects: - if (set_selected(CHANGESIZE_TYPES)) + if (set_selected(PCB_CHANGESIZE_TYPES)) pcb_board_set_changed_flag(pcb_true); break; } @@ -394,7 +394,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) - type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); if (strcmp(argv[1], "style") == 0) { if (pcb_get_style_size(funcid, &value, type, 0) != 0) @@ -462,7 +462,7 @@ case F_Selected: case F_SelectedObjects: - if (pcb_chg_selected_size(CHANGESIZE_TYPES, value, absolute)) + if (pcb_chg_selected_size(PCB_CHANGESIZE_TYPES, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; } @@ -497,7 +497,7 @@ if (funcid == F_Object) { gui->get_coords(_("Select an Object"), &x, &y); - type = pcb_search_screen(x, y, CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); } if (strcmp(argv[1], "style") == 0) { @@ -658,7 +658,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_undo_save_serial(); if ((pinnums != NULL) && (strcasecmp(pinnums, "Number") == 0)) pinnum = 1; @@ -735,7 +735,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_chg_obj_join(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -753,7 +753,7 @@ case F_Selected: case F_SelectedObjects: - if (pcb_chg_selected_join(CHANGEJOIN_TYPES)) + if (pcb_chg_selected_join(PCB_CHANGEJOIN_TYPES)) pcb_board_set_changed_flag(pcb_true); break; } @@ -790,7 +790,7 @@ gui->get_coords(_("Select an Element"), &x, &y); ptr3 = NULL; - type = pcb_search_screen(x, y, CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, PCB_CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); if (pcb_chg_obj_nonetlist(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -836,7 +836,7 @@ gui->get_coords(_("Select an Object"), &x, &y); ptr3 = NULL; - type = pcb_search_screen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, PCB_CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3); if (ptr3 != NULL) { int qstyle = PCB_FLAG_SQUARE_GET((pcb_pin_t *) ptr3); @@ -896,7 +896,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_set_obj_square(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -948,7 +948,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_clr_obj_square(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -999,7 +999,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_chg_obj_octagon(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -1054,7 +1054,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_set_obj_octagon(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -1110,7 +1110,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_clr_obj_octagon(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -1186,7 +1186,7 @@ if (absolute) switch (pcb_funchash_get(function, NULL)) { case F_Object: - if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind); pcb_undo_inc_serial(); pcb_draw(); @@ -1200,7 +1200,7 @@ break; case F_Selected: case F_SelectedElements: - pcb_chg_selected_thermals(CHANGETHERMAL_TYPES, kind); + pcb_chg_selected_thermals(PCB_CHANGETHERMAL_TYPES, kind); break; default: err = 1; @@ -1395,7 +1395,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) - type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); { /* convert angle from string */ char *end; @@ -1429,7 +1429,7 @@ case F_Selected: case F_SelectedObjects: - if (pcb_chg_selected_angle(CHANGESIZE_TYPES, which, value, absolute)) + if (pcb_chg_selected_angle(PCB_CHANGESIZE_TYPES, which, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; } @@ -1467,7 +1467,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) - type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); value = pcb_get_value(delta, units, &absolute, NULL); @@ -1492,7 +1492,7 @@ case F_Selected: case F_SelectedObjects: - if (pcb_chg_selected_radius(CHANGESIZE_TYPES, which, value, absolute)) + if (pcb_chg_selected_radius(PCB_CHANGESIZE_TYPES, which, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; } Index: trunk/src/copy.h =================================================================== --- trunk/src/copy.h (revision 5026) +++ trunk/src/copy.h (revision 5027) @@ -34,7 +34,7 @@ /* --------------------------------------------------------------------------- * some defines */ -#define COPY_TYPES \ +#define PCB_COPY_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | \ PCB_TYPE_ELEMENT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_POLYGON | PCB_TYPE_ARC) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 5026) +++ trunk/src/gui_act.c (revision 5027) @@ -46,6 +46,7 @@ #include "obj_pinvia_draw.h" #include "obj_pad_draw.h" +#define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_VIA | PCB_TYPE_POLYGON /* --------------------------------------------------------------------------- */ /* Toggle actions are kept for compatibility; new code should use the conf system instead */ Index: trunk/src/insert.h =================================================================== --- trunk/src/insert.h (revision 5026) +++ trunk/src/insert.h (revision 5027) @@ -31,7 +31,7 @@ #include "config.h" -#define INSERT_TYPES (PCB_TYPE_POLYGON | PCB_TYPE_LINE | PCB_TYPE_RATLINE) +#define PCB_INSERT_TYPES (PCB_TYPE_POLYGON | PCB_TYPE_LINE | PCB_TYPE_RATLINE) /* --------------------------------------------------------------------------- * prototypes Index: trunk/src/move.h =================================================================== --- trunk/src/move.h (revision 5026) +++ trunk/src/move.h (revision 5027) @@ -40,10 +40,10 @@ ((ys) += (deltay)); \ } -#define MOVE_TYPES \ +#define PCB_MOVE_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_ELEMENT_NAME | \ PCB_TYPE_POLYGON | PCB_TYPE_POLYGON_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_ARC) -#define MOVETOLAYER_TYPES \ +#define PCB_MOVETOLAYER_TYPES \ (PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC) Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5026) +++ trunk/src/object_act.c (revision 5027) @@ -377,7 +377,7 @@ ny = pcb_get_value(y_str, units, &absolute1, NULL); nx = pcb_get_value(x_str, units, &absolute2, NULL); - type = pcb_search_screen(x, y, MOVE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, PCB_MOVE_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_NONE) { pcb_message(PCB_MSG_DEFAULT, _("Nothing found under crosshair\n")); return 1; @@ -421,7 +421,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, MOVETOLAYER_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_MOVETOLAYER_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, CURRENT, pcb_false)) pcb_board_set_changed_flag(pcb_true); break; Index: trunk/src/remove.h =================================================================== --- trunk/src/remove.h (revision 5026) +++ trunk/src/remove.h (revision 5027) @@ -34,7 +34,7 @@ /* --------------------------------------------------------------------------- * some constants */ -#define REMOVE_TYPES \ +#define PCB_REMOVE_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | \ PCB_TYPE_POLYGON_POINT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC) Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 5026) +++ trunk/src/rotate.c (revision 5027) @@ -132,7 +132,7 @@ { int type; void *ptr1, *ptr2, *ptr3; - if ((type = pcb_search_screen(X, Y, ROTATE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return; Index: trunk/src/rotate.h =================================================================== --- trunk/src/rotate.h (revision 5026) +++ trunk/src/rotate.h (revision 5027) @@ -52,7 +52,7 @@ } \ } while(0) -#define ROTATE_TYPES (PCB_TYPE_ELEMENT | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ARC) +#define PCB_ROTATE_TYPES (PCB_TYPE_ELEMENT | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ARC) void *pcb_obj_rotate90(int, void *, void *, void *, pcb_coord_t, pcb_coord_t, unsigned); void pcb_screen_obj_rotate90(pcb_coord_t, pcb_coord_t, unsigned); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 5026) +++ trunk/src/select.c (revision 5027) @@ -115,7 +115,7 @@ pcb_bool changed = pcb_true; - type = pcb_search_screen(Crosshair.X, Crosshair.Y, SELECT_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_SELECT_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_NONE || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) return (pcb_false); switch (type) { Index: trunk/src/select.h =================================================================== --- trunk/src/select.h (revision 5026) +++ trunk/src/select.h (revision 5027) @@ -32,7 +32,7 @@ #include "config.h" #include "operation.h" -#define SELECT_TYPES \ +#define PCB_SELECT_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | \ PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_RATLINE | PCB_TYPE_ARC)