Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 2505) +++ trunk/src/action_helper.c (revision 2506) @@ -227,7 +227,7 @@ RemoveSelected(); SaveMode(); saved_mode = true; - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); } else if (Note.Hit && !gui->shift_is_pressed()) { BoxType box; @@ -234,7 +234,7 @@ SaveMode(); saved_mode = true; - SetMode(gui->control_is_pressed()? COPY_MODE : MOVE_MODE); + SetMode(gui->control_is_pressed()? PCB_MODE_COPY : PCB_MODE_MOVE); Crosshair.AttachedObject.Ptr1 = Note.ptr1; Crosshair.AttachedObject.Ptr2 = Note.ptr2; Crosshair.AttachedObject.Ptr3 = Note.ptr3; @@ -317,7 +317,7 @@ NotifyMode(); Note.Hit = 0; } - else if (conf_core.editor.mode == ARROW_MODE) { + else if (conf_core.editor.mode == PCB_MODE_ARROW) { box.X1 = Crosshair.AttachedBox.Point1.X; box.Y1 = Crosshair.AttachedBox.Point1.Y; box.X2 = Crosshair.AttachedBox.Point2.X; @@ -341,7 +341,7 @@ */ static void AdjustAttachedBox(void) { - if (conf_core.editor.mode == ARC_MODE) { + if (conf_core.editor.mode == PCB_MODE_ARC) { Crosshair.AttachedBox.otherway = gui->shift_is_pressed(); return; } @@ -364,8 +364,8 @@ PointTypePtr pnt; switch (conf_core.editor.mode) { /* update at least an attached block (selection) */ - case NO_MODE: - case ARROW_MODE: + case PCB_MODE_NO: + case PCB_MODE_ARROW: if (Crosshair.AttachedBox.State) { Crosshair.AttachedBox.Point2.X = Crosshair.X; Crosshair.AttachedBox.Point2.Y = Crosshair.Y; @@ -373,18 +373,18 @@ break; /* rectangle creation mode */ - case RECTANGLE_MODE: - case ARC_MODE: + case PCB_MODE_RECTANGLE: + case PCB_MODE_ARC: AdjustAttachedBox(); break; /* polygon creation mode */ - case POLYGON_MODE: - case POLYGONHOLE_MODE: + case PCB_MODE_POLYGON: + case PCB_MODE_POLYGON_HOLE: AdjustAttachedLine(); break; /* line creation mode */ - case LINE_MODE: + case PCB_MODE_LINE: if (PCB->RatDraw || PCB->Clipping == 0) AdjustAttachedLine(); else @@ -391,12 +391,12 @@ AdjustTwoLine(PCB->Clipping - 1); break; /* point insertion mode */ - case INSERTPOINT_MODE: + case PCB_MODE_INSERT_POINT: pnt = AdjustInsertPoint(); if (pnt) InsertedPoint = *pnt; break; - case ROTATE_MODE: + case PCB_MODE_ROTATE: break; } } @@ -417,7 +417,7 @@ gui->beep(); break; } - if (conf_core.editor.auto_drc && conf_core.editor.mode == LINE_MODE) { + if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { type = SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); LookupConnection(Crosshair.X, Crosshair.Y, true, 1, FOUNDFLAG); } @@ -488,7 +488,7 @@ if (conf_core.temp.rat_warn) ClearWarnings(); switch (conf_core.editor.mode) { - case ARROW_MODE: + case PCB_MODE_ARROW: { int test; hidval hv; @@ -517,7 +517,7 @@ break; } - case VIA_MODE: + case PCB_MODE_VIA: { PinTypePtr via; @@ -538,7 +538,7 @@ break; } - case ARC_MODE: + case PCB_MODE_ARC: { switch (Crosshair.AttachedBox.State) { case STATE_FIRST: @@ -604,7 +604,7 @@ } break; } - case LOCK_MODE: + case PCB_MODE_LOCK: { type = SearchScreen(Note.X, Note.Y, PCB_TYPEMASK_LOCK, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_ELEMENT) { @@ -645,7 +645,7 @@ } break; } - case THERMAL_MODE: + case PCB_MODE_THERMAL: { if (((type = SearchScreen(Note.X, Note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) && !TEST_FLAG(HOLEFLAG, (PinTypePtr) ptr3)) { @@ -664,7 +664,7 @@ break; } - case LINE_MODE: + case PCB_MODE_LINE: /* do update of position */ NotifyLine(); if (Crosshair.AttachedLine.State != STATE_THIRD) @@ -677,7 +677,7 @@ * the file after saving. */ if (Crosshair.X == Crosshair.AttachedLine.Point1.X && Crosshair.Y == Crosshair.AttachedLine.Point1.Y) { - SetMode(LINE_MODE); + SetMode(PCB_MODE_LINE); break; } @@ -795,7 +795,7 @@ } break; - case RECTANGLE_MODE: + case PCB_MODE_RECTANGLE: /* do update of position */ NotifyBlock(); @@ -826,7 +826,7 @@ } break; - case TEXT_MODE: + case PCB_MODE_TEXT: { char *string; @@ -850,12 +850,12 @@ break; } - case POLYGON_MODE: + case PCB_MODE_POLYGON: { PointTypePtr points = Crosshair.AttachedPolygon.Points; Cardinal n = Crosshair.AttachedPolygon.PointN; - /* do update of position; use the 'LINE_MODE' mechanism */ + /* do update of position; use the 'PCB_MODE_LINE' mechanism */ NotifyLine(); /* check if this is the last point of a polygon */ @@ -885,7 +885,7 @@ break; } - case POLYGONHOLE_MODE: + case PCB_MODE_POLYGON_HOLE: { switch (Crosshair.AttachedObject.State) { /* first notify, lookup object */ @@ -917,7 +917,7 @@ POLYAREA *original, *new_hole, *result; FlagType Flags; - /* do update of position; use the 'LINE_MODE' mechanism */ + /* do update of position; use the 'PCB_MODE_LINE' mechanism */ NotifyLine(); if (conf_core.editor.orthogonal_moves) { @@ -974,7 +974,7 @@ break; } - case PASTEBUFFER_MODE: + case PCB_MODE_PASTE_BUFFER: { TextType estr[MAX_ELEMENTNAMES]; ElementTypePtr e = 0; @@ -1021,7 +1021,7 @@ break; } - case REMOVE_MODE: + case PCB_MODE_REMOVE: if ((type = SearchScreen(Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { if (TEST_FLAG(LOCKFLAG, (LineTypePtr) ptr2)) { Message(_("Sorry, the object is locked\n")); @@ -1050,26 +1050,26 @@ } break; - case ROTATE_MODE: + case PCB_MODE_ROTATE: RotateScreenObject(Note.X, Note.Y, gui->shift_is_pressed()? (SWAP_IDENT ? 1 : 3) : (SWAP_IDENT ? 3 : 1)); break; /* both are almost the same */ - case COPY_MODE: - case MOVE_MODE: + case PCB_MODE_COPY: + case PCB_MODE_MOVE: pcb_trace("Move/copy: mode=%d state=%d {\n", conf_core.editor.mode, Crosshair.AttachedObject.State); switch (Crosshair.AttachedObject.State) { /* first notify, lookup object */ case STATE_FIRST: { - int types = (conf_core.editor.mode == COPY_MODE) ? COPY_TYPES : MOVE_TYPES; + int types = (conf_core.editor.mode == PCB_MODE_COPY) ? COPY_TYPES : MOVE_TYPES; Crosshair.AttachedObject.Type = SearchScreen(Note.X, Note.Y, types, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { - if (conf_core.editor.mode == MOVE_MODE && TEST_FLAG(LOCKFLAG, (PinTypePtr) + if (conf_core.editor.mode == PCB_MODE_MOVE && TEST_FLAG(LOCKFLAG, (PinTypePtr) Crosshair.AttachedObject.Ptr2)) { Message(_("Sorry, the object is locked\n")); Crosshair.AttachedObject.Type = PCB_TYPE_NONE; @@ -1082,7 +1082,7 @@ /* second notify, move or copy object */ case STATE_SECOND: - if (conf_core.editor.mode == COPY_MODE) + if (conf_core.editor.mode == PCB_MODE_COPY) CopyObject(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, @@ -1106,7 +1106,7 @@ break; /* insert a point into a polygon/line/... */ - case INSERTPOINT_MODE: + case PCB_MODE_INSERT_POINT: switch (Crosshair.AttachedObject.State) { /* first notify, lookup object */ case STATE_FIRST: Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 2505) +++ trunk/src/change.c (revision 2506) @@ -2456,7 +2456,7 @@ /* crosshair range is different if pastebuffer-mode * is enabled */ - if (conf_core.editor.mode == PASTEBUFFER_MODE) + if (conf_core.editor.mode == PCB_MODE_PASTE_BUFFER) SetCrosshairRange(PASTEBUFFER->X - PASTEBUFFER->BoundingBox.X1, PASTEBUFFER->Y - PASTEBUFFER->BoundingBox.Y1, MAX(0, Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 2505) +++ trunk/src/conf_act.c (revision 2506) @@ -174,24 +174,24 @@ char *name; int mode; } *m, modes[] = { - {"none", NO_MODE}, - {"arc", ARC_MODE}, - {"arrow", ARROW_MODE}, - {"copy", COPY_MODE}, - {"insertpoint", INSERTPOINT_MODE}, - {"line", LINE_MODE}, - {"lock", LOCK_MODE}, - {"move", MOVE_MODE}, - {"pastebuffer", PASTEBUFFER_MODE}, - {"polygon", POLYGON_MODE}, - {"polygonhole", POLYGONHOLE_MODE}, - {"rectangle", RECTANGLE_MODE}, - {"remove", REMOVE_MODE}, - {"rotate", ROTATE_MODE}, - {"rubberbandmove", RUBBERBANDMOVE_MODE}, - {"text", TEXT_MODE}, - {"thermal", THERMAL_MODE}, - {"via", VIA_MODE}, + {"none", PCB_MODE_NO}, + {"arc", PCB_MODE_ARC}, + {"arrow", PCB_MODE_ARROW}, + {"copy", PCB_MODE_COPY}, + {"insertpoint", PCB_MODE_INSERT_POINT}, + {"line", PCB_MODE_LINE}, + {"lock", PCB_MODE_LOCK}, + {"move", PCB_MODE_MOVE}, + {"pastebuffer", PCB_MODE_PASTE_BUFFER}, + {"polygon", PCB_MODE_POLYGON}, + {"polygonhole", PCB_MODE_POLYGON_HOLE}, + {"rectangle", PCB_MODE_RECTANGLE}, + {"remove", PCB_MODE_REMOVE}, + {"rotate", PCB_MODE_ROTATE}, + {"rubberbandmove", PCB_MODE_RUBBERBAND_MOVE}, + {"text", PCB_MODE_TEXT}, + {"thermal", PCB_MODE_THERMAL}, + {"via", PCB_MODE_VIA}, {NULL, 0} }; assert(argc == 1); Index: trunk/src/const.h =================================================================== --- trunk/src/const.h (revision 2505) +++ trunk/src/const.h (revision 2506) @@ -73,25 +73,25 @@ * modes */ typedef enum { - NO_MODE = 0, /* no mode selected */ - VIA_MODE = 1, /* draw vias */ - LINE_MODE = 2, /* draw lines */ - RECTANGLE_MODE = 3, /* create rectangles */ - POLYGON_MODE = 4, /* draw filled polygons */ - PASTEBUFFER_MODE = 5, /* paste objects from buffer */ - TEXT_MODE = 6, /* create text objects */ - ROTATE_MODE = 102, /* rotate objects */ - REMOVE_MODE = 103, /* remove objects */ - MOVE_MODE = 104, /* move objects */ - COPY_MODE = 105, /* copy objects */ - INSERTPOINT_MODE = 106, /* insert point into line/polygon */ - RUBBERBANDMOVE_MODE = 107, /* move objects and attached lines */ - THERMAL_MODE = 108, /* toggle thermal layer flag */ - ARC_MODE = 109, /* draw arcs */ - ARROW_MODE = 110, /* selection with arrow mode */ - PAN_MODE = 0, /* same as no mode */ - LOCK_MODE = 111, /* lock/unlock objects */ - POLYGONHOLE_MODE = 112 /* cut holes in filled polygons */ + PCB_MODE_NO = 0, /* no mode selected */ + PCB_MODE_VIA = 1, /* draw vias */ + PCB_MODE_LINE = 2, /* draw lines */ + PCB_MODE_RECTANGLE = 3, /* create rectangles */ + PCB_MODE_POLYGON = 4, /* draw filled polygons */ + PCB_MODE_PASTE_BUFFER = 5, /* paste objects from buffer */ + PCB_MODE_TEXT = 6, /* create text objects */ + PCB_MODE_ROTATE = 102, /* rotate objects */ + PCB_MODE_REMOVE = 103, /* remove objects */ + PCB_MODE_MOVE = 104, /* move objects */ + PCB_MODE_COPY = 105, /* copy objects */ + PCB_MODE_INSERT_POINT = 106, /* insert point into line/polygon */ + PCB_MODE_RUBBERBAND_MOVE = 107, /* move objects and attached lines */ + PCB_MODE_THERMAL = 108, /* toggle thermal layer flag */ + PCB_MODE_ARC = 109, /* draw arcs */ + PCB_MODE_ARROW = 110, /* selection with arrow mode */ + PCB_MODE_PAN = 0, /* same as no mode */ + PCB_MODE_LOCK = 111, /* lock/unlock objects */ + PCB_MODE_POLYGON_HOLE = 112 /* cut holes in filled polygons */ } pcb_mode_t; /* --------------------------------------------------------------------------- Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 2505) +++ trunk/src/crosshair.c (revision 2506) @@ -353,7 +353,7 @@ } /* --------------------------------------------------------------------------- - * draws the attached object while in MOVE_MODE or COPY_MODE + * draws the attached object while in PCB_MODE_MOVE or PCB_MODE_COPY */ static void XORDrawMoveOrCopyObject(void) { @@ -490,7 +490,7 @@ void DrawAttached(void) { switch (conf_core.editor.mode) { - case VIA_MODE: + case PCB_MODE_VIA: { /* Make a dummy via structure to draw from */ PinType via; @@ -514,9 +514,9 @@ break; } - /* the attached line is used by both LINEMODE, POLYGON_MODE and POLYGONHOLE_MODE */ - case POLYGON_MODE: - case POLYGONHOLE_MODE: + /* the attached line is used by both LINEMODE, PCB_MODE_POLYGON and PCB_MODE_POLYGON_HOLE */ + case PCB_MODE_POLYGON: + case PCB_MODE_POLYGON_HOLE: /* draw only if starting point is set */ if (Crosshair.AttachedLine.State != STATE_FIRST) gui->draw_line(Crosshair.GC, @@ -523,13 +523,13 @@ Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y); - /* draw attached polygon only if in POLYGON_MODE or POLYGONHOLE_MODE */ + /* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */ if (Crosshair.AttachedPolygon.PointN > 1) { XORPolygon(&Crosshair.AttachedPolygon, 0, 0, 1); } break; - case ARC_MODE: + case PCB_MODE_ARC: if (Crosshair.AttachedBox.State != STATE_FIRST) { XORDrawAttachedArc(conf_core.design.line_thickness); if (conf_core.editor.show_drc) { @@ -541,7 +541,7 @@ } break; - case LINE_MODE: + case PCB_MODE_LINE: /* draw only if starting point exists and the line has length */ if (Crosshair.AttachedLine.State != STATE_FIRST && Crosshair.AttachedLine.draw) { XORDrawAttachedLine(Crosshair.AttachedLine.Point1.X, @@ -568,16 +568,16 @@ } break; - case PASTEBUFFER_MODE: + case PCB_MODE_PASTE_BUFFER: XORDrawBuffer(PASTEBUFFER); break; - case COPY_MODE: - case MOVE_MODE: + case PCB_MODE_COPY: + case PCB_MODE_MOVE: XORDrawMoveOrCopyObject(); break; - case INSERTPOINT_MODE: + case PCB_MODE_INSERT_POINT: XORDrawInsertPointObject(); break; } @@ -933,8 +933,8 @@ * the same layer), and when moving a line end-point * (but don't snap to the same line) */ - if ((conf_core.editor.mode != LINE_MODE || CURRENT != ptr1) && - (conf_core.editor.mode != MOVE_MODE || + if ((conf_core.editor.mode != PCB_MODE_LINE || CURRENT != ptr1) && + (conf_core.editor.mode != PCB_MODE_MOVE || Crosshair.AttachedObject.Ptr1 != ptr1 || Crosshair.AttachedObject.Type != PCB_TYPE_LINE_POINT || Crosshair.AttachedObject.Ptr2 == line)) return; @@ -1039,11 +1039,11 @@ /* Avoid self-snapping when moving */ if (ans != PCB_TYPE_NONE && - conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == PCB_TYPE_ELEMENT && ptr1 == Crosshair.AttachedObject.Ptr1) + conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_ELEMENT && ptr1 == Crosshair.AttachedObject.Ptr1) ans = PCB_TYPE_NONE; if (ans != PCB_TYPE_NONE && - (conf_core.editor.mode == LINE_MODE || (conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT))) { + (conf_core.editor.mode == PCB_MODE_LINE || (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT))) { PadTypePtr pad = (PadTypePtr) ptr2; LayerType *desired_layer; Cardinal desired_group; @@ -1051,7 +1051,7 @@ int found_our_layer = false; desired_layer = CURRENT; - if (conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT) { + if (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT) { desired_layer = (LayerType *) Crosshair.AttachedObject.Ptr1; } @@ -1084,7 +1084,7 @@ /* Avoid self-snapping when moving */ if (ans != PCB_TYPE_NONE && - conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == PCB_TYPE_ELEMENT && ptr1 == Crosshair.AttachedObject.Ptr1) + conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_ELEMENT && ptr1 == Crosshair.AttachedObject.Ptr1) ans = PCB_TYPE_NONE; if (ans != PCB_TYPE_NONE) { @@ -1097,7 +1097,7 @@ ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); /* Avoid snapping vias to any other vias */ - if (conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == PCB_TYPE_VIA && (ans & PCB_TYPEMASK_PIN)) + if (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_VIA && (ans & PCB_TYPEMASK_PIN)) ans = PCB_TYPE_NONE; if (ans != PCB_TYPE_NONE) { @@ -1137,7 +1137,7 @@ if (conf_core.editor.highlight_on_point) onpoint_work(&Crosshair, Crosshair.X, Crosshair.Y); - if (conf_core.editor.mode == ARROW_MODE) { + if (conf_core.editor.mode == PCB_MODE_ARROW) { ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans == PCB_TYPE_NONE) hid_action("PointCursor"); @@ -1145,7 +1145,7 @@ hid_actionl("PointCursor", "True", NULL); } - if (conf_core.editor.mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST && conf_core.editor.auto_drc) + if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST && conf_core.editor.auto_drc) EnforceLineDRC(); gui->set_crosshair(Crosshair.X, Crosshair.Y, HID_SC_DO_NOTHING); Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 2505) +++ trunk/src/file_act.c (revision 2506) @@ -121,7 +121,7 @@ if (strcasecmp(function, "ElementToBuffer") == 0) { notify_crosshair_change(false); if (LoadElementToBuffer(PASTEBUFFER, name)) - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); notify_crosshair_change(true); } @@ -128,7 +128,7 @@ else if (strcasecmp(function, "LayoutToBuffer") == 0) { notify_crosshair_change(false); if (LoadLayoutToBuffer(PASTEBUFFER, name)) - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); notify_crosshair_change(true); } Index: trunk/src/global.h =================================================================== --- trunk/src/global.h (revision 2505) +++ trunk/src/global.h (revision 2506) @@ -361,7 +361,7 @@ } AttachedBoxType, *AttachedBoxTypePtr; typedef struct { /* currently attached object */ - Coord X, Y; /* saved position when MOVE_MODE */ + Coord X, Y; /* saved position when PCB_MODE_MOVE */ BoxType BoundingBox; long int Type, /* object type */ State; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 2505) +++ trunk/src/gui_act.c (revision 2506) @@ -357,7 +357,7 @@ case F_ToggleAutoDRC: notify_crosshair_change(false); conf_toggle_editor(auto_drc); - if (conf_core.editor.auto_drc && conf_core.editor.mode == LINE_MODE) { + if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { if (ResetConnections(true)) { IncrementUndoSerialNumber(); Draw(); @@ -597,34 +597,34 @@ notify_crosshair_change(false); switch (funchash_get(function, NULL)) { case F_Arc: - SetMode(ARC_MODE); + SetMode(PCB_MODE_ARC); break; case F_Arrow: - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); break; case F_Copy: pcb_trace("ActionMode() copy\n"); - SetMode(COPY_MODE); + SetMode(PCB_MODE_COPY); break; case F_InsertPoint: - SetMode(INSERTPOINT_MODE); + SetMode(PCB_MODE_INSERT_POINT); break; case F_Line: - SetMode(LINE_MODE); + SetMode(PCB_MODE_LINE); break; case F_Lock: - SetMode(LOCK_MODE); + SetMode(PCB_MODE_LOCK); break; case F_Move: - SetMode(MOVE_MODE); + SetMode(PCB_MODE_MOVE); break; case F_None: - SetMode(NO_MODE); + SetMode(PCB_MODE_NO); break; case F_Cancel: { int saved_mode = conf_core.editor.mode; - SetMode(NO_MODE); + SetMode(PCB_MODE_NO); SetMode(saved_mode); } break; @@ -631,67 +631,67 @@ case F_Escape: { switch (conf_core.editor.mode) { - case VIA_MODE: - case PASTEBUFFER_MODE: - case TEXT_MODE: - case ROTATE_MODE: - case REMOVE_MODE: - case MOVE_MODE: - case COPY_MODE: - case INSERTPOINT_MODE: - case RUBBERBANDMOVE_MODE: - case THERMAL_MODE: - case LOCK_MODE: - SetMode(NO_MODE); - SetMode(ARROW_MODE); + case PCB_MODE_VIA: + case PCB_MODE_PASTE_BUFFER: + case PCB_MODE_TEXT: + case PCB_MODE_ROTATE: + case PCB_MODE_REMOVE: + case PCB_MODE_MOVE: + case PCB_MODE_COPY: + case PCB_MODE_INSERT_POINT: + case PCB_MODE_RUBBERBAND_MOVE: + case PCB_MODE_THERMAL: + case PCB_MODE_LOCK: + SetMode(PCB_MODE_NO); + SetMode(PCB_MODE_ARROW); break; - case LINE_MODE: + case PCB_MODE_LINE: if (Crosshair.AttachedLine.State == STATE_FIRST) - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); else { - SetMode(NO_MODE); - SetMode(LINE_MODE); + SetMode(PCB_MODE_NO); + SetMode(PCB_MODE_LINE); } break; - case RECTANGLE_MODE: + case PCB_MODE_RECTANGLE: if (Crosshair.AttachedBox.State == STATE_FIRST) - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); else { - SetMode(NO_MODE); - SetMode(RECTANGLE_MODE); + SetMode(PCB_MODE_NO); + SetMode(PCB_MODE_RECTANGLE); } break; - case POLYGON_MODE: + case PCB_MODE_POLYGON: if (Crosshair.AttachedLine.State == STATE_FIRST) - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); else { - SetMode(NO_MODE); - SetMode(POLYGON_MODE); + SetMode(PCB_MODE_NO); + SetMode(PCB_MODE_POLYGON); } break; - case POLYGONHOLE_MODE: + case PCB_MODE_POLYGON_HOLE: if (Crosshair.AttachedLine.State == STATE_FIRST) - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); else { - SetMode(NO_MODE); - SetMode(POLYGONHOLE_MODE); + SetMode(PCB_MODE_NO); + SetMode(PCB_MODE_POLYGON_HOLE); } break; - case ARC_MODE: + case PCB_MODE_ARC: if (Crosshair.AttachedBox.State == STATE_FIRST) - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); else { - SetMode(NO_MODE); - SetMode(ARC_MODE); + SetMode(PCB_MODE_NO); + SetMode(PCB_MODE_ARC); } break; - case ARROW_MODE: + case PCB_MODE_ARROW: break; default: @@ -704,13 +704,13 @@ NotifyMode(); break; case F_PasteBuffer: - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); break; case F_Polygon: - SetMode(POLYGON_MODE); + SetMode(PCB_MODE_POLYGON); break; case F_PolygonHole: - SetMode(POLYGONHOLE_MODE); + SetMode(PCB_MODE_POLYGON_HOLE); break; case F_Release: if ((mid_stroke) && (conf_core.editor.enable_stroke)) @@ -719,13 +719,13 @@ ReleaseMode(); break; case F_Remove: - SetMode(REMOVE_MODE); + SetMode(PCB_MODE_REMOVE); break; case F_Rectangle: - SetMode(RECTANGLE_MODE); + SetMode(PCB_MODE_RECTANGLE); break; case F_Rotate: - SetMode(ROTATE_MODE); + SetMode(PCB_MODE_ROTATE); break; case F_Stroke: if (conf_core.editor.enable_stroke) { @@ -735,30 +735,30 @@ /* 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 == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { - SetMode(LINE_MODE); + if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST) { + SetMode(PCB_MODE_LINE); } - else if (conf_core.editor.mode == ARC_MODE && Crosshair.AttachedBox.State != STATE_FIRST) - SetMode(ARC_MODE); - else if (conf_core.editor.mode == RECTANGLE_MODE && Crosshair.AttachedBox.State != STATE_FIRST) - SetMode(RECTANGLE_MODE); - else if (conf_core.editor.mode == POLYGON_MODE && Crosshair.AttachedLine.State != STATE_FIRST) - SetMode(POLYGON_MODE); + else if (conf_core.editor.mode == PCB_MODE_ARC && Crosshair.AttachedBox.State != STATE_FIRST) + SetMode(PCB_MODE_ARC); + else if (conf_core.editor.mode == PCB_MODE_RECTANGLE && Crosshair.AttachedBox.State != STATE_FIRST) + SetMode(PCB_MODE_RECTANGLE); + else if (conf_core.editor.mode == PCB_MODE_POLYGON && Crosshair.AttachedLine.State != STATE_FIRST) + SetMode(PCB_MODE_POLYGON); else { SaveMode(); saved_mode = true; - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); NotifyMode(); } break; case F_Text: - SetMode(TEXT_MODE); + SetMode(PCB_MODE_TEXT); break; case F_Thermal: - SetMode(THERMAL_MODE); + SetMode(PCB_MODE_THERMAL); break; case F_Via: - SetMode(VIA_MODE); + SetMode(PCB_MODE_VIA); break; case F_Restore: /* restore the last saved mode */ @@ -1064,8 +1064,8 @@ conf_set_design("design/line_thickness", "%$mS", ((LineTypePtr) ptr2)->Thickness); conf_set_design("design/clearance", "%$mS", ((LineTypePtr) ptr2)->Clearance / 2); layer = (LayerTypePtr) ptr1; - if (conf_core.editor.mode != LINE_MODE) - SetMode(LINE_MODE); + if (conf_core.editor.mode != PCB_MODE_LINE) + SetMode(PCB_MODE_LINE); notify_crosshair_change(true); hid_action("RouteStylesChanged"); break; @@ -1075,8 +1075,8 @@ conf_set_design("design/line_thickness", "%$mS", ((ArcTypePtr) ptr2)->Thickness); conf_set_design("design/clearance", "%$mS", ((ArcTypePtr) ptr2)->Clearance / 2); layer = (LayerTypePtr) ptr1; - if (conf_core.editor.mode != ARC_MODE) - SetMode(ARC_MODE); + if (conf_core.editor.mode != PCB_MODE_ARC) + SetMode(PCB_MODE_ARC); notify_crosshair_change(true); hid_action("RouteStylesChanged"); break; @@ -1090,8 +1090,8 @@ conf_set_design("design/via_thickness", "%$mS", ((PinTypePtr) ptr2)->Thickness); conf_set_design("design/via_drilling_hole", "%$mS", ((PinTypePtr) ptr2)->DrillingHole); conf_set_design("design/clearance", "%$mS", ((PinTypePtr) ptr2)->Clearance / 2); - if (conf_core.editor.mode != VIA_MODE) - SetMode(VIA_MODE); + if (conf_core.editor.mode != PCB_MODE_VIA) + SetMode(PCB_MODE_VIA); notify_crosshair_change(true); hid_action("RouteStylesChanged"); break; Index: trunk/src/line.c =================================================================== --- trunk/src/line.c (revision 2505) +++ trunk/src/line.c (revision 2506) @@ -52,7 +52,7 @@ if (line->State == STATE_FIRST) return; /* don't draw outline when ctrl key is pressed */ - if (conf_core.editor.mode == LINE_MODE && gui->control_is_pressed()) { + if (conf_core.editor.mode == PCB_MODE_LINE && gui->control_is_pressed()) { line->draw = false; return; } Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 2505) +++ trunk/src/main.c (revision 2506) @@ -449,7 +449,7 @@ InitHandler(); InitBuffers(); - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); if (command_line_pcb) { /* keep filename even if initial load command failed; @@ -496,7 +496,7 @@ gui->parse_arguments(&hid_argc, &hid_argv); if (gui->gui) InitCrosshair(); - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); hid_action("LibraryChanged"); } } while(gui != NULL); Index: trunk/src/misc.c =================================================================== --- trunk/src/misc.c (revision 2505) +++ trunk/src/misc.c (revision 2506) @@ -1416,10 +1416,10 @@ PCB->MaxHeight - (box->Y2 - Crosshair.AttachedObject.Y)); /* get all attached objects if necessary */ - if ((conf_core.editor.mode != COPY_MODE) && conf_core.editor.rubber_band_mode) + if ((conf_core.editor.mode != PCB_MODE_COPY) && conf_core.editor.rubber_band_mode) LookupRubberbandLines(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3); - if (conf_core.editor.mode != COPY_MODE && + if (conf_core.editor.mode != PCB_MODE_COPY && (Crosshair.AttachedObject.Type == PCB_TYPE_ELEMENT || Crosshair.AttachedObject.Type == PCB_TYPE_VIA || Crosshair.AttachedObject.Type == PCB_TYPE_LINE || Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT)) Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 2505) +++ trunk/src/polygon.c (revision 2506) @@ -1277,7 +1277,7 @@ case 0: break; - /* reset number of points and 'LINE_MODE' state */ + /* reset number of points and 'PCB_MODE_LINE' state */ case 1: Crosshair.AttachedPolygon.PointN = 0; Crosshair.AttachedLine.State = STATE_FIRST; Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 2505) +++ trunk/src/polygon_act.c (revision 2506) @@ -114,7 +114,7 @@ static int ActionPolygon(int argc, char **argv, Coord x, Coord y) { char *function = ACTION_ARG(0); - if (function && conf_core.editor.mode == POLYGON_MODE) { + if (function && conf_core.editor.mode == PCB_MODE_POLYGON) { notify_crosshair_change(false); switch (funchash_get(function, NULL)) { /* close open polygon if possible */ Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 2505) +++ trunk/src/remove_act.c (revision 2506) @@ -57,7 +57,7 @@ switch (id) { case F_Object: SaveMode(); - SetMode(REMOVE_MODE); + SetMode(PCB_MODE_REMOVE); NotifyMode(); RestoreMode(); break; Index: trunk/src/set.c =================================================================== --- trunk/src/set.c (revision 2505) +++ trunk/src/set.c (revision 2506) @@ -144,7 +144,7 @@ */ void SetCrosshairRangeToBuffer(void) { - if (conf_core.editor.mode == PASTEBUFFER_MODE) { + if (conf_core.editor.mode == PCB_MODE_PASTE_BUFFER) { SetBufferBoundingBox(PASTEBUFFER); SetCrosshairRange(PASTEBUFFER->X - PASTEBUFFER->BoundingBox.X1, PASTEBUFFER->Y - PASTEBUFFER->BoundingBox.Y1, @@ -207,14 +207,14 @@ Crosshair.AttachedObject.State = STATE_FIRST; Crosshair.AttachedPolygon.PointN = 0; if (PCB->RatDraw) { - if (Mode == ARC_MODE || Mode == RECTANGLE_MODE || - Mode == VIA_MODE || Mode == POLYGON_MODE || - Mode == POLYGONHOLE_MODE || Mode == TEXT_MODE || Mode == INSERTPOINT_MODE || Mode == THERMAL_MODE) { + if (Mode == PCB_MODE_ARC || Mode == PCB_MODE_RECTANGLE || + Mode == PCB_MODE_VIA || Mode == PCB_MODE_POLYGON || + Mode == PCB_MODE_POLYGON_HOLE || Mode == PCB_MODE_TEXT || Mode == PCB_MODE_INSERT_POINT || Mode == PCB_MODE_THERMAL) { Message(_("That mode is NOT allowed when drawing ratlines!\n")); - Mode = NO_MODE; + Mode = PCB_MODE_NO; } } - if (conf_core.editor.mode == LINE_MODE && Mode == ARC_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { + 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; Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Crosshair.AttachedLine.Point1.X; @@ -221,7 +221,7 @@ Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = Crosshair.AttachedLine.Point1.Y; AdjustAttachedObjects(); } - else if (conf_core.editor.mode == ARC_MODE && Mode == LINE_MODE && Crosshair.AttachedBox.State != STATE_FIRST) { + 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; Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = Crosshair.AttachedBox.Point1.X; @@ -231,11 +231,11 @@ AdjustAttachedObjects(); } else { - if (conf_core.editor.mode == ARC_MODE || conf_core.editor.mode == LINE_MODE) + if (conf_core.editor.mode == PCB_MODE_ARC || conf_core.editor.mode == PCB_MODE_LINE) SetLocalRef(0, 0, false); Crosshair.AttachedBox.State = STATE_FIRST; Crosshair.AttachedLine.State = STATE_FIRST; - if (Mode == LINE_MODE && conf_core.editor.auto_drc) { + if (Mode == PCB_MODE_LINE && conf_core.editor.auto_drc) { if (ResetConnections(true)) { IncrementUndoSerialNumber(); Draw(); @@ -246,7 +246,7 @@ sprintf(sMode, "%d", Mode); conf_set(CFR_DESIGN, "editor/mode", -1, sMode, POL_OVERWRITE); - if (Mode == PASTEBUFFER_MODE) + if (Mode == PCB_MODE_PASTE_BUFFER) /* do an update on the crosshair range */ SetCrosshairRangeToBuffer(); else Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 2505) +++ trunk/src/undo_act.c (revision 2506) @@ -129,20 +129,20 @@ char *function = ACTION_ARG(0); if (!function || !*function) { /* don't allow undo in the middle of an operation */ - if (conf_core.editor.mode != POLYGONHOLE_MODE && Crosshair.AttachedObject.State != STATE_FIRST) + if (conf_core.editor.mode != PCB_MODE_POLYGON_HOLE && Crosshair.AttachedObject.State != STATE_FIRST) return 1; - if (Crosshair.AttachedBox.State != STATE_FIRST && conf_core.editor.mode != ARC_MODE) + if (Crosshair.AttachedBox.State != STATE_FIRST && conf_core.editor.mode != PCB_MODE_ARC) return 1; /* undo the last operation */ notify_crosshair_change(false); - if ((conf_core.editor.mode == POLYGON_MODE || conf_core.editor.mode == POLYGONHOLE_MODE) && Crosshair.AttachedPolygon.PointN) { + if ((conf_core.editor.mode == PCB_MODE_POLYGON || conf_core.editor.mode == PCB_MODE_POLYGON_HOLE) && Crosshair.AttachedPolygon.PointN) { GoToPreviousPoint(); notify_crosshair_change(true); return 0; } /* move anchor point if undoing during line creation */ - if (conf_core.editor.mode == LINE_MODE) { + if (conf_core.editor.mode == PCB_MODE_LINE) { if (Crosshair.AttachedLine.State == STATE_SECOND) { if (conf_core.editor.auto_drc) Undo(true); /* undo the connection find */ @@ -207,7 +207,7 @@ return 0; } } - if (conf_core.editor.mode == ARC_MODE) { + if (conf_core.editor.mode == PCB_MODE_ARC) { if (Crosshair.AttachedBox.State == STATE_SECOND) { Crosshair.AttachedBox.State = STATE_FIRST; notify_crosshair_change(true); @@ -266,13 +266,13 @@ int ActionRedo(int argc, char **argv, Coord x, Coord y) { - if (((conf_core.editor.mode == POLYGON_MODE || - conf_core.editor.mode == POLYGONHOLE_MODE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == STATE_SECOND) + if (((conf_core.editor.mode == PCB_MODE_POLYGON || + conf_core.editor.mode == PCB_MODE_POLYGON_HOLE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == STATE_SECOND) return 1; notify_crosshair_change(false); if (Redo(true)) { SetChangedFlag(true); - if (conf_core.editor.mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { + if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST) { LineType *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-library-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-library-window.c (revision 2505) +++ trunk/src_plugins/hid_gtk/gui-library-window.c (revision 2506) @@ -394,7 +394,7 @@ fullp = entry->data.fp.loc_info; } if (LoadElementToBuffer(PASTEBUFFER, name == NULL ? fullp : name)) - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); /* update the preview with new symbol data */ if ((PASTEBUFFER->Data != NULL) && (elementlist_length(&PASTEBUFFER->Data->Element) != 0)) Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 2505) +++ trunk/src_plugins/hid_gtk/gui-misc.c (revision 2506) @@ -129,52 +129,52 @@ void ghid_mode_cursor(int Mode) { switch (Mode) { - case NO_MODE: + case PCB_MODE_NO: gport_set_cursor((GdkCursorType) CUSTOM_CURSOR_DRAG); break; - case VIA_MODE: + case PCB_MODE_VIA: gport_set_cursor(GDK_ARROW); break; - case LINE_MODE: + case PCB_MODE_LINE: gport_set_cursor(GDK_PENCIL); break; - case ARC_MODE: + case PCB_MODE_ARC: gport_set_cursor(GDK_QUESTION_ARROW); break; - case ARROW_MODE: + case PCB_MODE_ARROW: gport_set_cursor(GDK_LEFT_PTR); break; - case POLYGON_MODE: - case POLYGONHOLE_MODE: + case PCB_MODE_POLYGON: + case PCB_MODE_POLYGON_HOLE: gport_set_cursor(GDK_SB_UP_ARROW); break; - case PASTEBUFFER_MODE: + case PCB_MODE_PASTE_BUFFER: gport_set_cursor(GDK_HAND1); break; - case TEXT_MODE: + case PCB_MODE_TEXT: gport_set_cursor(GDK_XTERM); break; - case RECTANGLE_MODE: + case PCB_MODE_RECTANGLE: gport_set_cursor(GDK_UL_ANGLE); break; - case THERMAL_MODE: + case PCB_MODE_THERMAL: gport_set_cursor(GDK_IRON_CROSS); break; - case REMOVE_MODE: + case PCB_MODE_REMOVE: gport_set_cursor(GDK_PIRATE); break; - case ROTATE_MODE: + case PCB_MODE_ROTATE: if (ghid_shift_is_pressed()) gport_set_cursor((GdkCursorType) CUSTOM_CURSOR_CLOCKWISE); else @@ -181,16 +181,16 @@ gport_set_cursor(GDK_EXCHANGE); break; - case COPY_MODE: - case MOVE_MODE: + case PCB_MODE_COPY: + case PCB_MODE_MOVE: gport_set_cursor(GDK_CROSSHAIR); break; - case INSERTPOINT_MODE: + case PCB_MODE_INSERT_POINT: gport_set_cursor(GDK_DOTBOX); break; - case LOCK_MODE: + case PCB_MODE_LOCK: gport_set_cursor((GdkCursorType) CUSTOM_CURSOR_LOCK); } } Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 2505) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 2506) @@ -129,8 +129,8 @@ static gboolean ghid_idle_cb(gpointer data) { - if (conf_core.editor.mode == NO_MODE) - SetMode(ARROW_MODE); + if (conf_core.editor.mode == PCB_MODE_NO) + SetMode(PCB_MODE_ARROW); ghid_mode_cursor(conf_core.editor.mode); if (ghidgui->settings_mode != conf_core.editor.mode) { ghid_mode_buttons_update(); Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 2505) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 2506) @@ -755,20 +755,20 @@ static ModeButton mode_buttons[] = { - {NULL, NULL, 0, 0, "via", VIA_MODE, via}, - {NULL, NULL, 0, 0, "line", LINE_MODE, line}, - {NULL, NULL, 0, 0, "arc", ARC_MODE, arc}, - {NULL, NULL, 0, 0, "text", TEXT_MODE, text}, - {NULL, NULL, 0, 0, "rectangle", RECTANGLE_MODE, rect}, - {NULL, NULL, 0, 0, "polygon", POLYGON_MODE, poly}, - {NULL, NULL, 0, 0, "polygonhole", POLYGONHOLE_MODE, polyhole}, - {NULL, NULL, 0, 0, "buffer", PASTEBUFFER_MODE, buf}, - {NULL, NULL, 0, 0, "remove", REMOVE_MODE, del}, - {NULL, NULL, 0, 0, "rotate", ROTATE_MODE, rot}, - {NULL, NULL, 0, 0, "insertPoint", INSERTPOINT_MODE, ins}, - {NULL, NULL, 0, 0, "thermal", THERMAL_MODE, thrm}, - {NULL, NULL, 0, 0, "select", ARROW_MODE, sel}, - {NULL, NULL, 0, 0, "lock", LOCK_MODE, lock} + {NULL, NULL, 0, 0, "via", PCB_MODE_VIA, via}, + {NULL, NULL, 0, 0, "line", PCB_MODE_LINE, line}, + {NULL, NULL, 0, 0, "arc", PCB_MODE_ARC, arc}, + {NULL, NULL, 0, 0, "text", PCB_MODE_TEXT, text}, + {NULL, NULL, 0, 0, "rectangle", PCB_MODE_RECTANGLE, rect}, + {NULL, NULL, 0, 0, "polygon", PCB_MODE_POLYGON, poly}, + {NULL, NULL, 0, 0, "polygonhole", PCB_MODE_POLYGON_HOLE, polyhole}, + {NULL, NULL, 0, 0, "buffer", PCB_MODE_PASTE_BUFFER, buf}, + {NULL, NULL, 0, 0, "remove", PCB_MODE_REMOVE, del}, + {NULL, NULL, 0, 0, "rotate", PCB_MODE_ROTATE, rot}, + {NULL, NULL, 0, 0, "insertPoint", PCB_MODE_INSERT_POINT, ins}, + {NULL, NULL, 0, 0, "thermal", PCB_MODE_THERMAL, thrm}, + {NULL, NULL, 0, 0, "select", PCB_MODE_ARROW, sel}, + {NULL, NULL, 0, 0, "lock", PCB_MODE_LOCK, lock} }; static gint n_mode_buttons = G_N_ELEMENTS(mode_buttons); @@ -1279,7 +1279,7 @@ ghid_update_toggle_flags(); ghid_init_icons(port); - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); ghid_mode_buttons_update(); } Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 2505) +++ trunk/src_plugins/hid_lesstif/library.c (revision 2506) @@ -67,7 +67,7 @@ library_t *e = picks.array[last_pick]; e = &e->data.dir.children.array[cbs->item_position - 1]; if (LoadElementToBuffer(PASTEBUFFER, e->data.fp.loc_info)) - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); } static int build_library_dialog() Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 2505) +++ trunk/src_plugins/hid_lesstif/main.c (revision 2506) @@ -2298,36 +2298,36 @@ XmString xs; switch (conf_core.editor.mode) { - case VIA_MODE: + case PCB_MODE_VIA: buf = pcb_strdup_printf("%m+%.2mS/%.2mS \370=%.2mS", UUNIT, conf_core.design.via_thickness, conf_core.design.clearance, conf_core.design.via_drilling_hole); break; - case LINE_MODE: - case ARC_MODE: + case PCB_MODE_LINE: + case PCB_MODE_ARC: buf = pcb_strdup_printf("%m+%.2mS/%.2mS %s", UUNIT, conf_core.design.line_thickness, conf_core.design.clearance, s45); break; - case RECTANGLE_MODE: - case POLYGON_MODE: + case PCB_MODE_RECTANGLE: + case PCB_MODE_POLYGON: buf = pcb_strdup_printf("%m+%.2mS %s", UUNIT, conf_core.design.clearance, s45); break; - case TEXT_MODE: + case PCB_MODE_TEXT: buf = pcb_strdup_printf("%d %%", conf_core.design.text_scale); break; - case MOVE_MODE: - case COPY_MODE: - case INSERTPOINT_MODE: - case RUBBERBANDMOVE_MODE: + case PCB_MODE_MOVE: + case PCB_MODE_COPY: + case PCB_MODE_INSERT_POINT: + case PCB_MODE_RUBBERBAND_MOVE: if (s45 != NULL) buf = strdup(s45); else buf = empty; break; - case NO_MODE: - case PASTEBUFFER_MODE: - case ROTATE_MODE: - case REMOVE_MODE: - case THERMAL_MODE: - case ARROW_MODE: - case LOCK_MODE: + case PCB_MODE_NO: + case PCB_MODE_PASTE_BUFFER: + case PCB_MODE_ROTATE: + case PCB_MODE_REMOVE: + case PCB_MODE_THERMAL: + case PCB_MODE_ARROW: + case PCB_MODE_LOCK: default: buf = empty; break; @@ -2555,71 +2555,71 @@ old_cursor_mode = conf_core.editor.mode; switch (conf_core.editor.mode) { - case NO_MODE: + case PCB_MODE_NO: s = "None"; cursor = XC_X_cursor; break; - case VIA_MODE: + case PCB_MODE_VIA: s = "Via"; cursor = -1; break; - case LINE_MODE: + case PCB_MODE_LINE: s = "Line"; cursor = XC_pencil; break; - case RECTANGLE_MODE: + case PCB_MODE_RECTANGLE: s = "Rectangle"; cursor = XC_ul_angle; break; - case POLYGON_MODE: + case PCB_MODE_POLYGON: s = "Polygon"; cursor = XC_sb_up_arrow; break; - case POLYGONHOLE_MODE: + case PCB_MODE_POLYGON_HOLE: s = "Polygon Hole"; cursor = XC_sb_up_arrow; break; - case PASTEBUFFER_MODE: + case PCB_MODE_PASTE_BUFFER: s = "Paste"; cursor = XC_hand1; break; - case TEXT_MODE: + case PCB_MODE_TEXT: s = "Text"; cursor = XC_xterm; break; - case ROTATE_MODE: + case PCB_MODE_ROTATE: s = "Rotate"; cursor = XC_exchange; break; - case REMOVE_MODE: + case PCB_MODE_REMOVE: s = "Remove"; cursor = XC_pirate; break; - case MOVE_MODE: + case PCB_MODE_MOVE: s = "Move"; cursor = XC_crosshair; break; - case COPY_MODE: + case PCB_MODE_COPY: s = "Copy"; cursor = XC_crosshair; break; - case INSERTPOINT_MODE: + case PCB_MODE_INSERT_POINT: s = "Insert"; cursor = XC_dotbox; break; - case RUBBERBANDMOVE_MODE: + case PCB_MODE_RUBBERBAND_MOVE: s = "RBMove"; cursor = XC_top_left_corner; break; - case THERMAL_MODE: + case PCB_MODE_THERMAL: s = "Thermal"; cursor = XC_iron_cross; break; - case ARC_MODE: + case PCB_MODE_ARC: s = "Arc"; cursor = XC_question_arrow; break; - case ARROW_MODE: + case PCB_MODE_ARROW: s = "Arrow"; if (over_point) cursor = XC_draped_box; @@ -2626,7 +2626,7 @@ else cursor = XC_left_ptr; break; - case LOCK_MODE: + case PCB_MODE_LOCK: s = "Lock"; cursor = XC_hand2; break; Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 2505) +++ trunk/src_plugins/shand_cmd/command.c (revision 2506) @@ -152,7 +152,7 @@ case 1: /* filename is passed in commandline */ filename = argv[0]; if (filename && LoadElementToBuffer(PASTEBUFFER, filename)) - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); break; default: /* usage */ @@ -186,7 +186,7 @@ case 1: /* filename is passed in commandline */ filename = argv[0]; if (filename && LoadLayoutToBuffer(PASTEBUFFER, filename)) - SetMode(PASTEBUFFER_MODE); + SetMode(PCB_MODE_PASTE_BUFFER); break; default: /* usage */ Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 2505) +++ trunk/src_plugins/stroke/stroke.c (revision 2506) @@ -57,8 +57,8 @@ num = atoi(msg); switch (num) { case 456: - if (Settings.Mode == LINE_MODE) { - SetMode(LINE_MODE); + if (Settings.Mode == PCB_MODE_LINE) { + SetMode(PCB_MODE_LINE); } break; case 9874123: @@ -75,10 +75,10 @@ RotateScreenObject(StrokeBox.X1, StrokeBox.Y1, SWAP_IDENT ? 3 : 1); break; case 258: - SetMode(LINE_MODE); + SetMode(PCB_MODE_LINE); break; case 852: - SetMode(ARROW_MODE); + SetMode(PCB_MODE_ARROW); break; case 1478963: ActionUndo(0, NULL, 0, 0); @@ -92,7 +92,7 @@ case 147863: case 147853: case 145863: - SetMode(VIA_MODE); + SetMode(PCB_MODE_VIA); break; case 951: case 9651: