Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5046) +++ trunk/doc-rnd/hacking/renames (revision 5047) @@ -1043,3 +1043,12 @@ MAX_BUFFER -> PCB_MAX_BUFFER DEFAULT_DRILLINGHOLE -> PCB_DEFAULT_DRILLINGHOLE MAXPATHLEN -> PCB_PATH_MAX +MAX_LINE_POINT_DISTANCE -> PCB_MAX_LINE_POINT_DISTANCE +MAX_POLYGON_POINT_DISTANCE -> PCB_MAX_POLYGON_POINT_DISTANCE +MAX_ELEMENTNAMES -> PCB_MAX_ELEMENTNAMES +MAX_NETLIST_LINE_LENGTH -> PCB_MAX_NETLIST_LINE_LENGTH +MAX_MODESTACK_DEPTH -> PCB_MAX_MODESTACK_DEPTH +MIN_GRID_DISTANCE -> PCB_MIN_GRID_DISTANCE +EMARK_SIZE -> PCB_EMARK_SIZE +FONT_CAPHEIGHT -> PCB_FONT_CAPHEIGHT +DEFAULT_CELLSIZE -> PCB_DEFAULT_CELLSIZE Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5046) +++ trunk/src/action_helper.c (revision 5047) @@ -1055,7 +1055,7 @@ case PCB_MODE_PASTE_BUFFER: { - pcb_text_t estr[MAX_ELEMENTNAMES]; + pcb_text_t estr[PCB_MAX_ELEMENTNAMES]; pcb_element_t *e = 0; if (gui->shift_is_pressed()) { @@ -1066,8 +1066,8 @@ if (e) { int i; - memcpy(estr, e->Name, MAX_ELEMENTNAMES * sizeof(pcb_text_t)); - for (i = 0; i < MAX_ELEMENTNAMES; ++i) + memcpy(estr, e->Name, PCB_MAX_ELEMENTNAMES * sizeof(pcb_text_t)); + for (i = 0; i < PCB_MAX_ELEMENTNAMES; ++i) estr[i].TextString = estr[i].TextString ? pcb_strdup(estr[i].TextString) : NULL; pcb_element_remove(e); } @@ -1084,7 +1084,7 @@ save_n = NAME_INDEX(); - for (i = 0; i < MAX_ELEMENTNAMES; i++) { + for (i = 0; i < PCB_MAX_ELEMENTNAMES; i++) { if (i == save_n) EraseElementName(e); pcb_r_delete_entry(PCB->Data->name_tree[i], (pcb_box_t *) & (e->Name[i])); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5046) +++ trunk/src/crosshair.c (revision 5047) @@ -267,13 +267,13 @@ END_LOOP; /* mark */ gui->draw_line(pcb_crosshair.GC, - Element->MarkX + DX - EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY - EMARK_SIZE); + Element->MarkX + DX - PCB_EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY - PCB_EMARK_SIZE); gui->draw_line(pcb_crosshair.GC, - Element->MarkX + DX + EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY - EMARK_SIZE); + Element->MarkX + DX + PCB_EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY - PCB_EMARK_SIZE); gui->draw_line(pcb_crosshair.GC, - Element->MarkX + DX - EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY + EMARK_SIZE); + Element->MarkX + DX - PCB_EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY + PCB_EMARK_SIZE); gui->draw_line(pcb_crosshair.GC, - Element->MarkX + DX + EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY + EMARK_SIZE); + Element->MarkX + DX + PCB_EMARK_SIZE, Element->MarkY + DY, Element->MarkX + DX, Element->MarkY + DY + PCB_EMARK_SIZE); } /* --------------------------------------------------------------------------- @@ -1257,7 +1257,7 @@ /************************* mode *************************************/ static int mode_position = 0; -static int mode_stack[MAX_MODESTACK_DEPTH]; +static int mode_stack[PCB_MAX_MODESTACK_DEPTH]; /* sets the crosshair range to the current buffer extents */ void pcb_crosshair_range_to_buffer(void) @@ -1275,7 +1275,7 @@ void pcb_crosshair_save_mode(void) { mode_stack[mode_position] = conf_core.editor.mode; - if (mode_position < MAX_MODESTACK_DEPTH - 1) + if (mode_position < PCB_MAX_MODESTACK_DEPTH - 1) mode_position++; } Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 5046) +++ trunk/src/data.c (revision 5047) @@ -233,7 +233,7 @@ if (data->element_tree) pcb_r_destroy_tree(&data->element_tree); - for (i = 0; i < MAX_ELEMENTNAMES; i++) + for (i = 0; i < PCB_MAX_ELEMENTNAMES; i++) if (data->name_tree[i]) pcb_r_destroy_tree(&data->name_tree[i]); if (data->via_tree) Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 5046) +++ trunk/src/font.c (revision 5047) @@ -68,12 +68,12 @@ pcb_line_t *line; pcb_coord_t totalminy = PCB_MAX_COORD; - /* calculate cell with and height (is at least DEFAULT_CELLSIZE) + /* calculate cell with and height (is at least PCB_DEFAULT_CELLSIZE) * maximum cell width and height * minimum x and y position of all lines */ - Ptr->MaxWidth = DEFAULT_CELLSIZE; - Ptr->MaxHeight = DEFAULT_CELLSIZE; + Ptr->MaxWidth = PCB_DEFAULT_CELLSIZE; + Ptr->MaxHeight = PCB_DEFAULT_CELLSIZE; for (i = 0, symbol = Ptr->Symbol; i <= PCB_MAX_FONTPOSITION; i++, symbol++) { pcb_coord_t minx, miny, maxx, maxy; Index: trunk/src/globalconst.h =================================================================== --- trunk/src/globalconst.h (revision 5046) +++ trunk/src/globalconst.h (revision 5047) @@ -91,18 +91,13 @@ #endif #endif -#define MAX_LINE_POINT_DISTANCE 0 /* maximum distance when searching */ - /* line points */ -#define MAX_POLYGON_POINT_DISTANCE 0 /* maximum distance when searching */ - /* polygon points */ -#define MAX_ELEMENTNAMES 3 /* number of supported names of */ - /* an element */ -#define MAX_NETLIST_LINE_LENGTH 255 /* maximum line length for netlist files */ -#define MAX_MODESTACK_DEPTH 16 /* maximum depth of mode stack */ -#define MIN_GRID_DISTANCE 4 /* minimum distance between point */ - /* to enable grid drawing */ - /* size of diamond element mark */ -#define EMARK_SIZE PCB_MIL_TO_COORD (10) +#define PCB_MAX_LINE_POINT_DISTANCE 0 /* maximum distance when searching line points */ +#define PCB_MAX_POLYGON_POINT_DISTANCE 0 /* maximum distance when searching polygon points */ +#define PCB_MAX_ELEMENTNAMES 3 /* number of supported names of an element */ +#define PCB_MAX_NETLIST_LINE_LENGTH 255 /* maximum line length for netlist files */ +#define PCB_MAX_MODESTACK_DEPTH 16 /* maximum depth of mode stack */ +#define PCB_MIN_GRID_DISTANCE 4 /* minimum distance between point to enable grid drawing */ +#define PCB_EMARK_SIZE PCB_MIL_TO_COORD(10) /* size of diamond element mark */ /**** Font ***/ @@ -109,7 +104,7 @@ /* These are used in debug draw font rendering (e.g. pin names) and reverse scale calculations (e.g. when report is trying to figure how the font is scaled. Changing these values is not really supported. */ -#define FONT_CAPHEIGHT PCB_MIL_TO_COORD (45) /* (Approximate) capheight size of the default PCB font */ -#define DEFAULT_CELLSIZE 50 /* default cell size for symbols */ +#define PCB_FONT_CAPHEIGHT PCB_MIL_TO_COORD (45) /* (Approximate) capheight size of the default PCB font */ +#define PCB_DEFAULT_CELLSIZE 50 /* default cell size for symbols */ #endif Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5046) +++ trunk/src/obj_elem.c (revision 5047) @@ -1754,7 +1754,7 @@ static void DrawEMark(pcb_element_t *e, pcb_coord_t X, pcb_coord_t Y, pcb_bool invisible) { - pcb_coord_t mark_size = EMARK_SIZE; + pcb_coord_t mark_size = PCB_EMARK_SIZE; if (!PCB->InvisibleObjectsOn && invisible) return; Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 5046) +++ trunk/src/obj_elem.h (revision 5047) @@ -39,7 +39,7 @@ struct pcb_element_s { PCB_ANYOBJECTFIELDS; - pcb_text_t Name[MAX_ELEMENTNAMES]; /* the elements names: description text, name on PCB second, value third - see NAME_INDEX() below */ + pcb_text_t Name[PCB_MAX_ELEMENTNAMES]; /* the elements names: description text, name on PCB second, value third - see NAME_INDEX() below */ pcb_coord_t MarkX, MarkY; /* position mark */ pinlist_t Pin; padlist_t Pad; @@ -130,7 +130,7 @@ #define PCB_ELEMENT_PCB_TEXT_LOOP(element) do { \ pcb_cardinal_t n; \ pcb_text_t *text; \ - for (n = MAX_ELEMENTNAMES-1; n != -1; n--) \ + for (n = PCB_MAX_ELEMENTNAMES-1; n != -1; n--) \ { \ text = &(element)->Name[n] @@ -137,7 +137,7 @@ #define PCB_ELEMENT_NAME_LOOP(element) do { \ pcb_cardinal_t n; \ char *textstring; \ - for (n = MAX_ELEMENTNAMES-1; n != -1; n--) \ + for (n = PCB_MAX_ELEMENTNAMES-1; n != -1; n--) \ { \ textstring = (element)->Name[n].TextString Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 5046) +++ trunk/src/obj_pad.c (revision 5047) @@ -335,7 +335,7 @@ text.Flags = pcb_no_flags(); /* Set font height to approx 90% of pin thickness */ - text.Scale = 90 * pad->Thickness / FONT_CAPHEIGHT; + text.Scale = 90 * pad->Thickness / PCB_FONT_CAPHEIGHT; text.X = box.X1; text.Y = box.Y1; text.Direction = vert ? 1 : 0; Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 5046) +++ trunk/src/obj_pinvia.c (revision 5047) @@ -835,7 +835,7 @@ text.Flags = pcb_no_flags(); /* Set font height to approx 56% of pin thickness */ - text.Scale = 56 * pv->Thickness / FONT_CAPHEIGHT; + text.Scale = 56 * pv->Thickness / PCB_FONT_CAPHEIGHT; text.X = box.X1; text.Y = box.Y1; text.Direction = vert ? 1 : 0; Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5046) +++ trunk/src/object_act.c (revision 5047) @@ -607,7 +607,7 @@ if (er != pr) pcb_element_rotate90(PCB_PASTEBUFFER->Data, pe, pe->MarkX, pe->MarkY, (er - pr + 4) % 4); - for (i = 0; i < MAX_ELEMENTNAMES; i++) { + for (i = 0; i < PCB_MAX_ELEMENTNAMES; i++) { pe->Name[i].X = e->Name[i].X - mx + pe->MarkX; pe->Name[i].Y = e->Name[i].Y - my + pe->MarkY; pe->Name[i].Direction = e->Name[i].Direction; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 5046) +++ trunk/src/search.c (revision 5047) @@ -390,7 +390,7 @@ info.Line = Line; info.Point = Point; *Point = NULL; - info.least = MAX_LINE_POINT_DISTANCE + SearchRadius; + info.least = PCB_MAX_LINE_POINT_DISTANCE + SearchRadius; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, linepoint_callback, &info, NULL)) return pcb_true; @@ -406,7 +406,7 @@ double d, least; pcb_bool found = pcb_false; - least = SearchRadius + MAX_POLYGON_POINT_DISTANCE; + least = SearchRadius + PCB_MAX_POLYGON_POINT_DISTANCE; *Layer = SearchLayer; PCB_POLY_LOOP(*Layer); { Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 5046) +++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 5047) @@ -255,7 +255,7 @@ if (!conf_hid_gtk.plugins.hid_gtk.local_grid.enable) return; - if ((Vz(PCB->Grid) < MIN_GRID_DISTANCE) || (!conf_core.editor.draw_grid)) + if ((Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE) || (!conf_core.editor.draw_grid)) return; /* cx and cy are the actual cursor snapped to wherever - round them to the nearest real grid point */ Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 5046) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 5047) @@ -174,7 +174,7 @@ static void ghid_draw_grid(pcb_box_t *drawn_area) { - if (Vz(PCB->Grid) < MIN_GRID_DISTANCE) + if (Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE) return; if (gdk_color_parse(conf_core.appearance.color.grid, &gport->grid_color)) { Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 5046) +++ trunk/src_plugins/hid_lesstif/main.c (revision 5047) @@ -2177,7 +2177,7 @@ if (!conf_core.editor.draw_grid) return; - if (Vz(PCB->Grid) < MIN_GRID_DISTANCE) + if (Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE) return; if (!grid_gc) { grid_gc = XCreateGC(display, window, 0, 0); Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 5046) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 5047) @@ -50,8 +50,8 @@ static int ReadNetlist(const char *filename) { char *command = NULL; - char inputline[MAX_NETLIST_LINE_LENGTH + 1]; - char temp[MAX_NETLIST_LINE_LENGTH + 1]; + char inputline[PCB_MAX_NETLIST_LINE_LENGTH + 1]; + char temp[PCB_MAX_NETLIST_LINE_LENGTH + 1]; FILE *fp; pcb_lib_menu_t *menu = NULL; pcb_lib_entry_t *entry; @@ -93,13 +93,13 @@ * kind = 2 is connection */ kind = 0; - while (fgets(inputline, MAX_NETLIST_LINE_LENGTH, fp)) { + while (fgets(inputline, PCB_MAX_NETLIST_LINE_LENGTH, fp)) { size_t len = strlen(inputline); /* check for maximum length line */ if (len) { if (inputline[--len] != '\n') pcb_message(PCB_MSG_DEFAULT, _("Line length (%i) exceeded in netlist file.\n" - "additional characters will be ignored.\n"), MAX_NETLIST_LINE_LENGTH); + "additional characters will be ignored.\n"), PCB_MAX_NETLIST_LINE_LENGTH); else inputline[len] = '\0'; } Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 5046) +++ trunk/src_plugins/io_lihata/read.c (revision 5047) @@ -683,7 +683,7 @@ if (onsld) { int n; - for(n = 0; n < MAX_ELEMENTNAMES; n++) + for(n = 0; n < PCB_MAX_ELEMENTNAMES; n++) PCB_FLAG_SET(PCB_FLAG_ONSOLDER, &elem->Name[n]); } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 5046) +++ trunk/src_plugins/report/report.c (revision 5047) @@ -394,7 +394,7 @@ PCB_EMPTY(element->Name[0].TextString), PCB_EMPTY(element->Name[1].TextString), PCB_EMPTY(element->Name[2].TextString), - PCB_SCALE_TEXT(FONT_CAPHEIGHT, element->Name[1].Scale), + PCB_SCALE_TEXT(PCB_FONT_CAPHEIGHT, element->Name[1].Scale), element->Name[1].X, element->Name[1].Y, PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element) ? ",\n but it's hidden" : "", element->MarkX, element->MarkY, @@ -432,7 +432,7 @@ "The bounding box is %$mD %$mD.\n" "%s\n" "%s", USER_UNITMASK, text->ID, pcb_strflg_f2s(text->Flags, PCB_TYPE_TEXT), - text->X, text->Y, PCB_SCALE_TEXT(FONT_CAPHEIGHT, text->Scale), + text->X, text->Y, PCB_SCALE_TEXT(PCB_FONT_CAPHEIGHT, text->Scale), text->TextString, text->Direction, text->BoundingBox.X1, text->BoundingBox.Y1, text->BoundingBox.X2, text->BoundingBox.Y2,