Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 30975) +++ trunk/src/crosshair.c (revision 30976) @@ -877,8 +877,8 @@ PCB->hidlib.ch_x = pcb_crosshair.X = PCB_CLAMP(X, -PCB->hidlib.size_x/2, PCB->hidlib.size_x*3/2); PCB->hidlib.ch_y = pcb_crosshair.Y = PCB_CLAMP(Y, -PCB->hidlib.size_y/2, PCB->hidlib.size_y*3/2); - nearest_grid_x = pcb_grid_fit(pcb_crosshair.X, PCB->hidlib.grid, PCB->hidlib.grid_ox); - nearest_grid_y = pcb_grid_fit(pcb_crosshair.Y, PCB->hidlib.grid, PCB->hidlib.grid_oy); + nearest_grid_x = rnd_grid_fit(pcb_crosshair.X, PCB->hidlib.grid, PCB->hidlib.grid_ox); + nearest_grid_y = rnd_grid_fit(pcb_crosshair.Y, PCB->hidlib.grid, PCB->hidlib.grid_oy); if (pcb_marked.status && conf_core.editor.orthogonal_moves) { rnd_coord_t dx = pcb_crosshair.X - hidlib->tool_grabbed.X; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30975) +++ trunk/src/gui_act.c (revision 30976) @@ -294,7 +294,7 @@ if (pcb_crosshair_move_absolute(pcb_crosshair.X, pcb_crosshair.Y)) pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */ pcb_hidlib_set_grid(RND_ACT_HIDLIB, oldGrid, pcb_true, pcb_crosshair.X, pcb_crosshair.Y); - pcb_grid_inval(); + rnd_grid_inval(); } break; Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 30975) +++ trunk/src/librnd/core/conf_act.c (revision 30976) @@ -305,7 +305,7 @@ rnd_message(RND_MSG_ERROR, "SetGrid: Invalid multiplier/divider for grid set: needs to be a positive number\n"); return 1; } - pcb_grid_inval(); + rnd_grid_inval(); if (val[0] == '*') pcb_hidlib_set_grid(RND_ACT_HIDLIB, rnd_round(RND_ACT_HIDLIB->grid * d), pcb_false, 0, 0); else @@ -315,7 +315,7 @@ value = pcb_get_value(val, units, &absolute, NULL); - pcb_grid_inval(); + rnd_grid_inval(); if (absolute) pcb_hidlib_set_grid(RND_ACT_HIDLIB, value, pcb_false, 0, 0); else { Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 30975) +++ trunk/src/librnd/core/grid.c (revision 30976) @@ -45,7 +45,7 @@ #include #include -rnd_coord_t pcb_grid_fit(rnd_coord_t x, rnd_coord_t grid_spacing, rnd_coord_t grid_offset) +rnd_coord_t rnd_grid_fit(rnd_coord_t x, rnd_coord_t grid_spacing, rnd_coord_t grid_offset) { x -= grid_offset; x = grid_spacing * rnd_round((double) x / grid_spacing); @@ -53,7 +53,7 @@ return x; } -pcb_bool_t pcb_grid_parse(pcb_grid_t *dst, const char *src) +pcb_bool_t rnd_grid_parse(rnd_grid_t *dst, const char *src) { const char *nsep; char *sep3, *sep2, *sep, *tmp, *size, *ox = NULL, *oy = NULL, *unit = NULL; @@ -136,7 +136,7 @@ return pcb_false; } -pcb_bool_t pcb_grid_append_print(gds_t *dst, const pcb_grid_t *src) +pcb_bool_t rnd_grid_append_print(gds_t *dst, const rnd_grid_t *src) { if (src->size <= 0) return pcb_false; @@ -154,11 +154,11 @@ return pcb_true; } -char *pcb_grid_print(const pcb_grid_t *src) +char *rnd_grid_print(const rnd_grid_t *src) { gds_t tmp; gds_init(&tmp); - if (!pcb_grid_append_print(&tmp, src)) { + if (!rnd_grid_append_print(&tmp, src)) { gds_uninit(&tmp); return NULL; } @@ -165,7 +165,7 @@ return tmp.array; /* do not uninit tmp */ } -void pcb_grid_set(rnd_hidlib_t *hidlib, const pcb_grid_t *src) +void rnd_grid_set(rnd_hidlib_t *hidlib, const rnd_grid_t *src) { pcb_hidlib_set_grid(hidlib, src->size, pcb_true, src->ox, src->oy); if (src->unit != NULL) @@ -172,16 +172,16 @@ pcb_hidlib_set_unit(hidlib, src->unit); } -void pcb_grid_free(pcb_grid_t *dst) +void rnd_grid_free(rnd_grid_t *dst) { free(dst->name); dst->name = NULL; } -pcb_bool_t pcb_grid_list_jump(rnd_hidlib_t *hidlib, int dst) +pcb_bool_t rnd_grid_list_jump(rnd_hidlib_t *hidlib, int dst) { const rnd_conf_listitem_t *li; - pcb_grid_t g; + rnd_grid_t g; int max = rnd_conflist_length((rnd_conflist_t *)&pcbhl_conf.editor.grids); if (dst < 0) @@ -198,23 +198,23 @@ if (li == NULL) return pcb_false; - if (!pcb_grid_parse(&g, li->payload)) + if (!rnd_grid_parse(&g, li->payload)) return pcb_false; - pcb_grid_set(hidlib, &g); - pcb_grid_free(&g); + rnd_grid_set(hidlib, &g); + rnd_grid_free(&g); return pcb_true; } -pcb_bool_t pcb_grid_list_step(rnd_hidlib_t *hidlib, int stp) +pcb_bool_t rnd_grid_list_step(rnd_hidlib_t *hidlib, int stp) { int dst = pcbhl_conf.editor.grids_idx; if (dst < 0) dst = -dst-1; - return pcb_grid_list_jump(hidlib, dst + stp); + return rnd_grid_list_jump(hidlib, dst + stp); } -void pcb_grid_inval(void) +void rnd_grid_inval(void) { if (pcbhl_conf.editor.grids_idx > 0) rnd_conf_setf(RND_CFR_DESIGN, "editor/grids_idx", -1, "%d", -1 - pcbhl_conf.editor.grids_idx); Index: trunk/src/librnd/core/grid.h =================================================================== --- trunk/src/librnd/core/grid.h (revision 30975) +++ trunk/src/librnd/core/grid.h (revision 30976) @@ -27,8 +27,8 @@ * */ -#ifndef PCB_GRID_H -#define PCB_GRID_H +#ifndef RND_GRID_H +#define RND_GRID_H #include #include @@ -45,34 +45,34 @@ rnd_coord_t size; rnd_coord_t ox, oy; const rnd_unit_t *unit; /* force switching to unit if not NULL */ -} pcb_grid_t; +} rnd_grid_t; /* Returns the nearest grid-point to the given coord x */ -rnd_coord_t pcb_grid_fit(rnd_coord_t x, rnd_coord_t grid_spacing, rnd_coord_t grid_offset); +rnd_coord_t rnd_grid_fit(rnd_coord_t x, rnd_coord_t grid_spacing, rnd_coord_t grid_offset); /* Parse packed string format src into dst; allocat dst->name on success */ -pcb_bool_t pcb_grid_parse(pcb_grid_t *dst, const char *src); +pcb_bool_t rnd_grid_parse(rnd_grid_t *dst, const char *src); /* Free all allocated fields of a grid struct */ -void pcb_grid_free(pcb_grid_t *dst); +void rnd_grid_free(rnd_grid_t *dst); /* Convert src into packed string format */ -pcb_bool_t pcb_grid_append_print(gds_t *dst, const pcb_grid_t *src); -char *pcb_grid_print(const pcb_grid_t *src); +pcb_bool_t rnd_grid_append_print(gds_t *dst, const rnd_grid_t *src); +char *rnd_grid_print(const rnd_grid_t *src); /* Apply grid settings from src to the pcb */ -void pcb_grid_set(rnd_hidlib_t *hidlib, const pcb_grid_t *src); +void rnd_grid_set(rnd_hidlib_t *hidlib, const rnd_grid_t *src); /* Jump to grid index dst (clamped); absolute set */ -pcb_bool_t pcb_grid_list_jump(rnd_hidlib_t *hidlib, int dst); +pcb_bool_t rnd_grid_list_jump(rnd_hidlib_t *hidlib, int dst); /* Step stp steps (can be 0) on the grids list and set the resulting grid; relative set */ -pcb_bool_t pcb_grid_list_step(rnd_hidlib_t *hidlib, int stp); +pcb_bool_t rnd_grid_list_step(rnd_hidlib_t *hidlib, int stp); /* invalidate the grid index; call this when changing the grid settings */ -void pcb_grid_inval(void); +void rnd_grid_inval(void); /* Reinstall grid menus */ -void pcb_grid_install_menu(void); +void rnd_grid_install_menu(void); #endif Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30975) +++ trunk/src/librnd/core/gui_act.c (revision 30976) @@ -256,23 +256,23 @@ RND_ACT_IRES(0); if (strcmp(op, "set") == 0) { - pcb_grid_t dst; + rnd_grid_t dst; RND_PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); - if (!pcb_grid_parse(&dst, a)) + if (!rnd_grid_parse(&dst, a)) RND_ACT_FAIL(grid); - pcb_grid_set(RND_ACT_HIDLIB, &dst); - pcb_grid_free(&dst); + rnd_grid_set(RND_ACT_HIDLIB, &dst); + rnd_grid_free(&dst); } else if ((strcmp(op, "up") == 0) || (strcmp(op, "+") == 0)) - pcb_grid_list_step(RND_ACT_HIDLIB, +1); + rnd_grid_list_step(RND_ACT_HIDLIB, +1); else if ((strcmp(op, "down") == 0) || (strcmp(op, "-") == 0)) - pcb_grid_list_step(RND_ACT_HIDLIB, -1); + rnd_grid_list_step(RND_ACT_HIDLIB, -1); else if (strcmp(op, "idx") == 0) { RND_PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); - pcb_grid_list_jump(RND_ACT_HIDLIB, atoi(a)); + rnd_grid_list_jump(RND_ACT_HIDLIB, atoi(a)); } else if (op[0] == '#') { - pcb_grid_list_jump(RND_ACT_HIDLIB, atoi(op+1)); + rnd_grid_list_jump(RND_ACT_HIDLIB, atoi(op+1)); } else RND_ACT_FAIL(grid); Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30975) +++ trunk/src/librnd/pcb_compat.h (revision 30976) @@ -519,3 +519,14 @@ #define PCB_MAX_POLYGON_POINT_DISTANCE RND_MAX_POLYGON_POINT_DISTANCE #define PCB_MAX_NETLIST_LINE_LENGTH RND_MAX_NETLIST_LINE_LENGTH #define PCB_MIN_GRID_DISTANCE RND_MIN_GRID_DISTANCE +#define pcb_grid_t rnd_grid_t +#define pcb_grid_fit rnd_grid_fit +#define pcb_grid_parse rnd_grid_parse +#define pcb_grid_free rnd_grid_free +#define pcb_grid_append_print rnd_grid_append_print +#define pcb_grid_print rnd_grid_print +#define pcb_grid_set rnd_grid_set +#define pcb_grid_list_jump rnd_grid_list_jump +#define pcb_grid_list_step rnd_grid_list_step +#define pcb_grid_inval rnd_grid_inval +#define pcb_grid_install_menu rnd_grid_install_menu Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 30975) +++ trunk/src/select_act.c (revision 30976) @@ -161,8 +161,8 @@ pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB, PCB_PASTEBUFFER); rnd_hid_get_coords("Select the Subcircuit's Origin (mark) Location", &x, &y, 0); - x = pcb_grid_fit(x, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_ox); - y = pcb_grid_fit(y, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_oy); + x = rnd_grid_fit(x, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_ox); + y = rnd_grid_fit(y, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_oy); pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, x, y, pcb_true, pcb_false); pcb_undo_save_serial(); pcb_remove_selected(pcb_false); Index: trunk/src/tool_logic.c =================================================================== --- trunk/src/tool_logic.c (revision 30975) +++ trunk/src/tool_logic.c (revision 30976) @@ -145,8 +145,8 @@ get_grid_lock_coordinates(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, &mx, &my); - mx = pcb_grid_fit(mx, hl->grid, hl->grid_ox) - mx; - my = pcb_grid_fit(my, hl->grid, hl->grid_oy) - my; + mx = rnd_grid_fit(mx, hl->grid, hl->grid_ox) - mx; + my = rnd_grid_fit(my, hl->grid, hl->grid_oy) - my; } pcb_crosshair.AttachedObject.X = PlaceX - mx; pcb_crosshair.AttachedObject.Y = PlaceY - my; Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30975) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30976) @@ -146,10 +146,10 @@ static GdkPoint *points = NULL; static int npoints = 0; - x1 = pcb_grid_fit(MAX(0, SIDE_X(&ghidgui->port.view, ghidgui->port.view.x0)), hidlib->grid, hidlib->grid_ox); - y1 = pcb_grid_fit(MAX(0, SIDE_Y(&ghidgui->port.view, ghidgui->port.view.y0)), hidlib->grid, hidlib->grid_oy); - x2 = pcb_grid_fit(MIN(hidlib->size_x, SIDE_X(&ghidgui->port.view, ghidgui->port.view.x0 + ghidgui->port.view.width - 1)), hidlib->grid, hidlib->grid_ox); - y2 = pcb_grid_fit(MIN(hidlib->size_y, SIDE_Y(&ghidgui->port.view, ghidgui->port.view.y0 + ghidgui->port.view.height - 1)), hidlib->grid, hidlib->grid_oy); + x1 = rnd_grid_fit(MAX(0, SIDE_X(&ghidgui->port.view, ghidgui->port.view.x0)), hidlib->grid, hidlib->grid_ox); + y1 = rnd_grid_fit(MAX(0, SIDE_Y(&ghidgui->port.view, ghidgui->port.view.y0)), hidlib->grid, hidlib->grid_oy); + x2 = rnd_grid_fit(MIN(hidlib->size_x, SIDE_X(&ghidgui->port.view, ghidgui->port.view.x0 + ghidgui->port.view.width - 1)), hidlib->grid, hidlib->grid_ox); + y2 = rnd_grid_fit(MIN(hidlib->size_y, SIDE_Y(&ghidgui->port.view, ghidgui->port.view.y0 + ghidgui->port.view.height - 1)), hidlib->grid, hidlib->grid_oy); grd = hidlib->grid; if (grd <= 0) Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30975) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30976) @@ -1891,8 +1891,8 @@ XSetForeground(display, grid_gc, grid_color); } if (pcbhl_conf.editor.view.flip_x) { - x2 = pcb_grid_fit(Px(0), ltf_hidlib->grid, ltf_hidlib->grid_ox); - x1 = pcb_grid_fit(Px(view_width), ltf_hidlib->grid, ltf_hidlib->grid_ox); + x2 = rnd_grid_fit(Px(0), ltf_hidlib->grid, ltf_hidlib->grid_ox); + x1 = rnd_grid_fit(Px(view_width), ltf_hidlib->grid, ltf_hidlib->grid_ox); if (Vx(x2) < 0) x2 -= ltf_hidlib->grid; if (Vx(x1) >= view_width) @@ -1899,8 +1899,8 @@ x1 += ltf_hidlib->grid; } else { - x1 = pcb_grid_fit(Px(0), ltf_hidlib->grid, ltf_hidlib->grid_ox); - x2 = pcb_grid_fit(Px(view_width), ltf_hidlib->grid, ltf_hidlib->grid_ox); + x1 = rnd_grid_fit(Px(0), ltf_hidlib->grid, ltf_hidlib->grid_ox); + x2 = rnd_grid_fit(Px(view_width), ltf_hidlib->grid, ltf_hidlib->grid_ox); if (Vx(x1) < 0) x1 += ltf_hidlib->grid; if (Vx(x2) >= view_width) @@ -1907,8 +1907,8 @@ x2 -= ltf_hidlib->grid; } if (pcbhl_conf.editor.view.flip_y) { - y2 = pcb_grid_fit(Py(0), ltf_hidlib->grid, ltf_hidlib->grid_oy); - y1 = pcb_grid_fit(Py(view_height), ltf_hidlib->grid, ltf_hidlib->grid_oy); + y2 = rnd_grid_fit(Py(0), ltf_hidlib->grid, ltf_hidlib->grid_oy); + y1 = rnd_grid_fit(Py(view_height), ltf_hidlib->grid, ltf_hidlib->grid_oy); if (Vy(y2) < 0) y2 -= ltf_hidlib->grid; if (Vy(y1) >= view_height) @@ -1915,8 +1915,8 @@ y1 += ltf_hidlib->grid; } else { - y1 = pcb_grid_fit(Py(0), ltf_hidlib->grid, ltf_hidlib->grid_oy); - y2 = pcb_grid_fit(Py(view_height), ltf_hidlib->grid, ltf_hidlib->grid_oy); + y1 = rnd_grid_fit(Py(0), ltf_hidlib->grid, ltf_hidlib->grid_oy); + y2 = rnd_grid_fit(Py(view_height), ltf_hidlib->grid, ltf_hidlib->grid_oy); if (Vy(y1) < 0) y1 += ltf_hidlib->grid; if (Vy(y2) >= view_height) Index: trunk/src_plugins/lib_hid_common/grid_menu.c =================================================================== --- trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30975) +++ trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30976) @@ -85,7 +85,7 @@ } -void pcb_grid_install_menu(void) +void rnd_grid_install_menu(void) { pcb_hid_cfg_map_anchor_menus(ANCH, grid_install_menu, NULL); } @@ -96,7 +96,7 @@ { if (grid_lock) return; grid_lock++; - pcb_grid_install_menu(); + rnd_grid_install_menu(); grid_lock--; } @@ -104,11 +104,11 @@ { if (grid_lock) return; grid_lock++; - pcb_grid_install_menu(); + rnd_grid_install_menu(); /* to get the right menu checked */ if ((grids_idx.nat != NULL) && (grids_idx.nat->val.integer[0] >= 0)) - pcb_grid_list_step(hidlib, 0); + rnd_grid_list_step(hidlib, 0); grid_lock--; } Index: trunk/src_plugins/lib_hid_gl/hidgl.c =================================================================== --- trunk/src_plugins/lib_hid_gl/hidgl.c (revision 30975) +++ trunk/src_plugins/lib_hid_gl/hidgl.c (revision 30976) @@ -230,10 +230,10 @@ rnd_coord_t x1, y1, x2, y2, n, i; double x, y; - x1 = pcb_grid_fit(MAX(0, drawn_area->X1), hidlib->grid, hidlib->grid_ox); - y1 = pcb_grid_fit(MAX(0, drawn_area->Y1), hidlib->grid, hidlib->grid_oy); - x2 = pcb_grid_fit(MIN(hidlib->size_x, drawn_area->X2), hidlib->grid, hidlib->grid_ox); - y2 = pcb_grid_fit(MIN(hidlib->size_y, drawn_area->Y2), hidlib->grid, hidlib->grid_oy); + x1 = rnd_grid_fit(MAX(0, drawn_area->X1), hidlib->grid, hidlib->grid_ox); + y1 = rnd_grid_fit(MAX(0, drawn_area->Y1), hidlib->grid, hidlib->grid_oy); + x2 = rnd_grid_fit(MIN(hidlib->size_x, drawn_area->X2), hidlib->grid, hidlib->grid_ox); + y2 = rnd_grid_fit(MIN(hidlib->size_y, drawn_area->Y2), hidlib->grid, hidlib->grid_oy); if (x1 > x2) { rnd_coord_t tmp = x1;