Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5031) +++ trunk/doc-rnd/hacking/renames (revision 5032) @@ -948,3 +948,6 @@ ATTRIBUTE_UNUSED -> PCB_ATTRIBUTE_UNUSED UNLIKELY -> PCB_UNLIKELY LIKELY -> PCB_LIKELY +STATE_FIRST -> PCB_CH_STATE_FIRST +STATE_SECOND -> PCB_CH_STATE_SECOND +STATE_THIRD -> PCB_CH_STATE_THIRD Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5031) +++ trunk/src/action_helper.c (revision 5032) @@ -123,7 +123,7 @@ Crosshair.AttachedObject.Y = PlaceY - my; if (!Marked.status || conf_core.editor.local_ref) pcb_crosshair_set_local_ref(PlaceX - mx, PlaceY - my, pcb_true); - Crosshair.AttachedObject.State = STATE_SECOND; + Crosshair.AttachedObject.State = PCB_CH_STATE_SECOND; /* get boundingbox of object and set cursor range */ box = GetObjectBoundingBox(Crosshair.AttachedObject.Type, @@ -413,7 +413,7 @@ pcb_board_set_changed_flag(pcb_true); else if (Bumped) pcb_undo_inc_serial(); - Crosshair.AttachedBox.State = STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } if (saved_mode) pcb_crosshair_restore_mode(); @@ -431,7 +431,7 @@ return; } switch (Crosshair.AttachedBox.State) { - case STATE_SECOND: /* one corner is selected */ + case PCB_CH_STATE_SECOND: /* one corner is selected */ { /* update coordinates */ Crosshair.AttachedBox.Point2.X = Crosshair.X; @@ -491,7 +491,7 @@ if (!Marked.status || conf_core.editor.local_ref) pcb_crosshair_set_local_ref(Crosshair.X, Crosshair.Y, pcb_true); switch (Crosshair.AttachedLine.State) { - case STATE_FIRST: /* first point */ + case PCB_CH_STATE_FIRST: /* first point */ if (PCB->RatDraw && pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr1, &ptr1) == PCB_TYPE_NONE) { gui->beep(); break; @@ -524,14 +524,14 @@ Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = Crosshair.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = Crosshair.Y; } - Crosshair.AttachedLine.State = STATE_SECOND; + Crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; break; - case STATE_SECOND: + case PCB_CH_STATE_SECOND: /* fall through to third state too */ lastLayer = CURRENT; default: /* all following points */ - Crosshair.AttachedLine.State = STATE_THIRD; + Crosshair.AttachedLine.State = PCB_CH_STATE_THIRD; break; } } @@ -540,14 +540,14 @@ { pcb_notify_crosshair_change(pcb_false); switch (Crosshair.AttachedBox.State) { - case STATE_FIRST: /* setup first point */ + case PCB_CH_STATE_FIRST: /* setup first point */ Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Crosshair.X; Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = Crosshair.Y; - Crosshair.AttachedBox.State = STATE_SECOND; + Crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; break; - case STATE_SECOND: /* setup second point */ - Crosshair.AttachedBox.State = STATE_THIRD; + case PCB_CH_STATE_SECOND: /* setup second point */ + Crosshair.AttachedBox.State = PCB_CH_STATE_THIRD; break; } pcb_notify_crosshair_change(pcb_true); @@ -614,14 +614,14 @@ case PCB_MODE_ARC: { switch (Crosshair.AttachedBox.State) { - case STATE_FIRST: + case PCB_CH_STATE_FIRST: Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Note.X; Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = Note.Y; - Crosshair.AttachedBox.State = STATE_SECOND; + Crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; break; - case STATE_SECOND: - case STATE_THIRD: + case PCB_CH_STATE_SECOND: + case PCB_CH_STATE_THIRD: { pcb_arc_t *arc; pcb_coord_t wx, wy; @@ -670,7 +670,7 @@ addedLines++; DrawArc(CURRENT, arc); pcb_draw(); - Crosshair.AttachedBox.State = STATE_THIRD; + Crosshair.AttachedBox.State = PCB_CH_STATE_THIRD; } break; } @@ -740,7 +740,7 @@ case PCB_MODE_LINE: /* do update of position */ pcb_notify_line(); - if (Crosshair.AttachedLine.State != STATE_THIRD) + if (Crosshair.AttachedLine.State != PCB_CH_STATE_THIRD) break; /* Remove anchor if clicking on start point; @@ -875,7 +875,7 @@ /* create rectangle if both corners are determined * and width, height are != 0 */ - if (Crosshair.AttachedBox.State == STATE_THIRD && + if (Crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && Crosshair.AttachedBox.Point1.X != Crosshair.AttachedBox.Point2.X && Crosshair.AttachedBox.Point1.Y != Crosshair.AttachedBox.Point2.Y) { pcb_polygon_t *polygon; @@ -895,7 +895,7 @@ } /* reset state to 'first corner' */ - Crosshair.AttachedBox.State = STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } break; @@ -968,7 +968,7 @@ { switch (Crosshair.AttachedObject.State) { /* first notify, lookup object */ - case STATE_FIRST: + case PCB_CH_STATE_FIRST: Crosshair.AttachedObject.Type = pcb_search_screen(Note.X, Note.Y, PCB_TYPE_POLYGON, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); @@ -985,11 +985,11 @@ break; } else - Crosshair.AttachedObject.State = STATE_SECOND; + Crosshair.AttachedObject.State = PCB_CH_STATE_SECOND; /* fall thru: first click is also the first point of the poly hole */ /* second notify, insert new point into object */ - case STATE_SECOND: + case PCB_CH_STATE_SECOND: { pcb_point_t *points = Crosshair.AttachedPolygon.Points; pcb_cardinal_t n = Crosshair.AttachedPolygon.PointN; @@ -1029,8 +1029,8 @@ /* reset state of attached line */ memset(&Crosshair.AttachedPolygon, 0, sizeof(pcb_polygon_t)); - Crosshair.AttachedLine.State = STATE_FIRST; - Crosshair.AttachedObject.State = STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; + Crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; addedLines = 0; break; @@ -1139,7 +1139,7 @@ case PCB_MODE_MOVE: switch (Crosshair.AttachedObject.State) { /* first notify, lookup object */ - case STATE_FIRST: + case PCB_CH_STATE_FIRST: { int types = (conf_core.editor.mode == PCB_MODE_COPY) ? PCB_COPY_TYPES : PCB_MOVE_TYPES; @@ -1159,7 +1159,7 @@ } /* second notify, move or copy object */ - case STATE_SECOND: + case PCB_CH_STATE_SECOND: if (conf_core.editor.mode == PCB_MODE_COPY) pcb_copy_obj(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, @@ -1177,7 +1177,7 @@ /* reset identifiers */ Crosshair.AttachedObject.Type = PCB_TYPE_NONE; - Crosshair.AttachedObject.State = STATE_FIRST; + Crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; break; } break; @@ -1186,7 +1186,7 @@ case PCB_MODE_INSERT_POINT: switch (Crosshair.AttachedObject.State) { /* first notify, lookup object */ - case STATE_FIRST: + case PCB_CH_STATE_FIRST: Crosshair.AttachedObject.Type = pcb_search_screen(Note.X, Note.Y, PCB_INSERT_TYPES, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); @@ -1208,7 +1208,7 @@ Crosshair.AttachedObject.Ptr2 = &fake.line; } - Crosshair.AttachedObject.State = STATE_SECOND; + Crosshair.AttachedObject.State = PCB_CH_STATE_SECOND; InsertedPoint = *pcb_adjust_insert_point(); } } @@ -1215,7 +1215,7 @@ break; /* second notify, insert new point into object */ - case STATE_SECOND: + case PCB_CH_STATE_SECOND: if (Crosshair.AttachedObject.Type == PCB_TYPE_POLYGON) pcb_insert_point_in_object(PCB_TYPE_POLYGON, Crosshair.AttachedObject.Ptr1, fake.poly, @@ -1228,7 +1228,7 @@ /* reset identifiers */ Crosshair.AttachedObject.Type = PCB_TYPE_NONE; - Crosshair.AttachedObject.State = STATE_FIRST; + Crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; break; } break; Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5031) +++ trunk/src/crosshair.c (revision 5032) @@ -520,7 +520,7 @@ case PCB_MODE_POLYGON: case PCB_MODE_POLYGON_HOLE: /* draw only if starting point is set */ - if (Crosshair.AttachedLine.State != STATE_FIRST) + if (Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) gui->draw_line(Crosshair.GC, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y); @@ -532,7 +532,7 @@ break; case PCB_MODE_ARC: - if (Crosshair.AttachedBox.State != STATE_FIRST) { + if (Crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) { XORDrawAttachedArc(conf_core.design.line_thickness); if (conf_core.editor.show_drc) { gui->set_color(Crosshair.GC, conf_core.appearance.color.cross); @@ -545,7 +545,7 @@ case PCB_MODE_LINE: /* draw only if starting point exists and the line has length */ - if (Crosshair.AttachedLine.State != STATE_FIRST && Crosshair.AttachedLine.draw) { + if (Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST && Crosshair.AttachedLine.draw) { XORDrawAttachedLine(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, @@ -585,7 +585,7 @@ } /* an attached box does not depend on a special mode */ - if (Crosshair.AttachedBox.State == STATE_SECOND || Crosshair.AttachedBox.State == STATE_THIRD) { + if (Crosshair.AttachedBox.State == PCB_CH_STATE_SECOND || Crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) { pcb_coord_t x1, y1, x2, y2; x1 = Crosshair.AttachedBox.Point1.X; @@ -1147,7 +1147,7 @@ pcb_hid_actionl("PointCursor", "True", NULL); } - if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST && conf_core.editor.auto_drc) + if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST && conf_core.editor.auto_drc) EnforceLineDRC(); gui->set_crosshair(Crosshair.X, Crosshair.Y, HID_SC_DO_NOTHING); @@ -1302,7 +1302,7 @@ pcb_notify_crosshair_change(pcb_false); addedLines = 0; Crosshair.AttachedObject.Type = PCB_TYPE_NONE; - Crosshair.AttachedObject.State = STATE_FIRST; + Crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; Crosshair.AttachedPolygon.PointN = 0; if (PCB->RatDraw) { if (Mode == PCB_MODE_ARC || Mode == PCB_MODE_RECTANGLE || @@ -1312,16 +1312,16 @@ Mode = PCB_MODE_NO; } } - if (conf_core.editor.mode == PCB_MODE_LINE && Mode == PCB_MODE_ARC && Crosshair.AttachedLine.State != STATE_FIRST) { - Crosshair.AttachedLine.State = STATE_FIRST; - Crosshair.AttachedBox.State = STATE_SECOND; + if (conf_core.editor.mode == PCB_MODE_LINE && Mode == PCB_MODE_ARC && Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) { + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Crosshair.AttachedLine.Point1.X; Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = Crosshair.AttachedLine.Point1.Y; pcb_adjust_attached_objects(); } - else if (conf_core.editor.mode == PCB_MODE_ARC && Mode == PCB_MODE_LINE && Crosshair.AttachedBox.State != STATE_FIRST) { - Crosshair.AttachedBox.State = STATE_FIRST; - Crosshair.AttachedLine.State = STATE_SECOND; + else if (conf_core.editor.mode == PCB_MODE_ARC && Mode == PCB_MODE_LINE && Crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) { + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = Crosshair.AttachedBox.Point1.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = Crosshair.AttachedBox.Point1.Y; sprintf(sMode, "%d", Mode); @@ -1331,8 +1331,8 @@ else { if (conf_core.editor.mode == PCB_MODE_ARC || conf_core.editor.mode == PCB_MODE_LINE) pcb_crosshair_set_local_ref(0, 0, pcb_false); - Crosshair.AttachedBox.State = STATE_FIRST; - Crosshair.AttachedLine.State = STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; if (Mode == PCB_MODE_LINE && conf_core.editor.auto_drc) { if (pcb_reset_conns(pcb_true)) { pcb_undo_inc_serial(); Index: trunk/src/crosshair.h =================================================================== --- trunk/src/crosshair.h (revision 5031) +++ trunk/src/crosshair.h (revision 5032) @@ -92,9 +92,9 @@ /* --------------------------------------------------------------------------- * all possible states of an attached object */ -#define STATE_FIRST 0 /* initial state */ -#define STATE_SECOND 1 -#define STATE_THIRD 2 +#define PCB_CH_STATE_FIRST 0 /* initial state */ +#define PCB_CH_STATE_SECOND 1 +#define PCB_CH_STATE_THIRD 2 pcb_coord_t pcb_grid_fit(pcb_coord_t x, pcb_coord_t grid_spacing, pcb_coord_t grid_offset); void pcb_notify_crosshair_change(pcb_bool changes_complete); Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 5031) +++ trunk/src/gui_act.c (revision 5032) @@ -382,7 +382,7 @@ pcb_undo_inc_serial(); pcb_draw(); } - if (Crosshair.AttachedLine.State != STATE_FIRST) + if (Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) pcb_lookup_conn(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, pcb_true, 1, PCB_FLAG_FOUND); } pcb_notify_crosshair_change(pcb_true); @@ -666,7 +666,7 @@ break; case PCB_MODE_LINE: - if (Crosshair.AttachedLine.State == STATE_FIRST) + if (Crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_ARROW); else { pcb_crosshair_set_mode(PCB_MODE_NO); @@ -675,7 +675,7 @@ break; case PCB_MODE_RECTANGLE: - if (Crosshair.AttachedBox.State == STATE_FIRST) + if (Crosshair.AttachedBox.State == PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_ARROW); else { pcb_crosshair_set_mode(PCB_MODE_NO); @@ -684,7 +684,7 @@ break; case PCB_MODE_POLYGON: - if (Crosshair.AttachedLine.State == STATE_FIRST) + if (Crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_ARROW); else { pcb_crosshair_set_mode(PCB_MODE_NO); @@ -693,7 +693,7 @@ break; case PCB_MODE_POLYGON_HOLE: - if (Crosshair.AttachedLine.State == STATE_FIRST) + if (Crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_ARROW); else { pcb_crosshair_set_mode(PCB_MODE_NO); @@ -702,7 +702,7 @@ break; case PCB_MODE_ARC: - if (Crosshair.AttachedBox.State == STATE_FIRST) + if (Crosshair.AttachedBox.State == PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_ARROW); else { pcb_crosshair_set_mode(PCB_MODE_NO); @@ -754,14 +754,14 @@ /* Handle middle mouse button restarts of drawing mode. If not in | a drawing mode, middle mouse button will select objects. */ - if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST) { + if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) { pcb_crosshair_set_mode(PCB_MODE_LINE); } - else if (conf_core.editor.mode == PCB_MODE_ARC && Crosshair.AttachedBox.State != STATE_FIRST) + else if (conf_core.editor.mode == PCB_MODE_ARC && Crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_ARC); - else if (conf_core.editor.mode == PCB_MODE_RECTANGLE && Crosshair.AttachedBox.State != STATE_FIRST) + else if (conf_core.editor.mode == PCB_MODE_RECTANGLE && Crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_RECTANGLE); - else if (conf_core.editor.mode == PCB_MODE_POLYGON && Crosshair.AttachedLine.State != STATE_FIRST) + else if (conf_core.editor.mode == PCB_MODE_POLYGON && Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) pcb_crosshair_set_mode(PCB_MODE_POLYGON); else { pcb_crosshair_save_mode(); Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 5031) +++ trunk/src/insert.c (revision 5032) @@ -90,7 +90,7 @@ pcb_coord_t x, y, m1, m2; pcb_line_t *line = (pcb_line_t *) Crosshair.AttachedObject.Ptr2; - if (Crosshair.AttachedObject.State == STATE_FIRST) + if (Crosshair.AttachedObject.State == PCB_CH_STATE_FIRST) return NULL; Crosshair.AttachedObject.Ptr3 = &InsertedPoint; if (gui->shift_is_pressed()) { Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5031) +++ trunk/src/obj_line_drcenf.c (revision 5032) @@ -47,7 +47,7 @@ pcb_attached_line_t *line = &Crosshair.AttachedLine; /* I need at least one point */ - if (line->State == STATE_FIRST) + if (line->State == PCB_CH_STATE_FIRST) return; /* don't draw outline when ctrl key is pressed */ if (conf_core.editor.mode == PCB_MODE_LINE && gui->control_is_pressed()) { @@ -152,7 +152,7 @@ pcb_coord_t dx, dy; pcb_attached_line_t *line = &Crosshair.AttachedLine; - if (Crosshair.AttachedLine.State == STATE_FIRST) + if (Crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) return; /* don't draw outline when ctrl key is pressed */ if (gui->control_is_pressed()) { Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5031) +++ trunk/src/polygon.c (revision 5032) @@ -1279,7 +1279,7 @@ /* reset number of points and 'PCB_MODE_LINE' state */ case 1: Crosshair.AttachedPolygon.PointN = 0; - Crosshair.AttachedLine.State = STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; addedLines = 0; break; @@ -1352,7 +1352,7 @@ pcb_board_set_changed_flag(pcb_true); /* reset state of attached line */ - Crosshair.AttachedLine.State = STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; addedLines = 0; /* add to undo list */ Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 5031) +++ trunk/src/select_act.c (revision 5032) @@ -184,9 +184,9 @@ box.Y2 = MAX(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y); pcb_notify_crosshair_change(pcb_false); pcb_notify_block(); - if (Crosshair.AttachedBox.State == STATE_THIRD && pcb_select_block(&box, pcb_true)) { + if (Crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(&box, pcb_true)) { pcb_board_set_changed_flag(pcb_true); - Crosshair.AttachedBox.State = STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } pcb_notify_crosshair_change(pcb_true); break; @@ -336,9 +336,9 @@ box.Y2 = MAX(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y); pcb_notify_crosshair_change(pcb_false); pcb_notify_block(); - if (Crosshair.AttachedBox.State == STATE_THIRD && pcb_select_block(&box, pcb_false)) { + if (Crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(&box, pcb_false)) { pcb_board_set_changed_flag(pcb_true); - Crosshair.AttachedBox.State = STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } pcb_notify_crosshair_change(pcb_true); break; Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 5031) +++ trunk/src/undo_act.c (revision 5032) @@ -128,9 +128,9 @@ const char *function = PCB_ACTION_ARG(0); if (!function || !*function) { /* don't allow undo in the middle of an operation */ - if (conf_core.editor.mode != PCB_MODE_POLYGON_HOLE && Crosshair.AttachedObject.State != STATE_FIRST) + if (conf_core.editor.mode != PCB_MODE_POLYGON_HOLE && Crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) return 1; - if (Crosshair.AttachedBox.State != STATE_FIRST && conf_core.editor.mode != PCB_MODE_ARC) + if (Crosshair.AttachedBox.State != PCB_CH_STATE_FIRST && conf_core.editor.mode != PCB_MODE_ARC) return 1; /* undo the last operation */ @@ -142,15 +142,15 @@ } /* move anchor point if undoing during line creation */ if (conf_core.editor.mode == PCB_MODE_LINE) { - if (Crosshair.AttachedLine.State == STATE_SECOND) { + if (Crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) { if (conf_core.editor.auto_drc) pcb_undo(pcb_true); /* undo the connection find */ - Crosshair.AttachedLine.State = STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; pcb_crosshair_set_local_ref(0, 0, pcb_false); pcb_notify_crosshair_change(pcb_true); return 0; } - if (Crosshair.AttachedLine.State == STATE_THIRD) { + if (Crosshair.AttachedLine.State == PCB_CH_STATE_THIRD) { int type; void *ptr1, *ptr3, *ptrtmp; pcb_line_t *ptr2; @@ -192,7 +192,7 @@ pcb_crosshair_grid_fit(Crosshair.X, Crosshair.Y); pcb_adjust_attached_objects(); if (--addedLines == 0) { - Crosshair.AttachedLine.State = STATE_SECOND; + Crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; lastLayer = CURRENT; } else { @@ -207,12 +207,12 @@ } } if (conf_core.editor.mode == PCB_MODE_ARC) { - if (Crosshair.AttachedBox.State == STATE_SECOND) { - Crosshair.AttachedBox.State = STATE_FIRST; + if (Crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) { + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; pcb_notify_crosshair_change(pcb_true); return 0; } - if (Crosshair.AttachedBox.State == STATE_THIRD) { + if (Crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) { void *ptr1, *ptr2, *ptr3; pcb_box_t *bx; /* guaranteed to succeed */ @@ -223,7 +223,7 @@ Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = bx->Y1; pcb_adjust_attached_objects(); if (--addedLines == 0) - Crosshair.AttachedBox.State = STATE_SECOND; + Crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; } } /* undo the last destructive operation */ @@ -266,12 +266,12 @@ int ActionRedo(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { if (((conf_core.editor.mode == PCB_MODE_POLYGON || - conf_core.editor.mode == PCB_MODE_POLYGON_HOLE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == STATE_SECOND) + conf_core.editor.mode == PCB_MODE_POLYGON_HOLE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) return 1; pcb_notify_crosshair_change(pcb_false); if (pcb_redo(pcb_true)) { pcb_board_set_changed_flag(pcb_true); - if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST) { + if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) { pcb_line_t *line = linelist_last(&CURRENT->Line); Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = line->Point2.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = line->Point2.Y; Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 5031) +++ trunk/src_plugins/hid_gtk/gui-misc.c (revision 5032) @@ -279,9 +279,9 @@ oldLineState = Crosshair.AttachedLine.State; oldBoxState = Crosshair.AttachedBox.State; pcb_notify_crosshair_change(pcb_false); - Crosshair.AttachedObject.State = STATE_FIRST; - Crosshair.AttachedLine.State = STATE_FIRST; - Crosshair.AttachedBox.State = STATE_FIRST; + Crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; + Crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; + Crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; ghid_hand_cursor(); pcb_notify_crosshair_change(pcb_true);