Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 30979) +++ trunk/scconfig/hooks.c (revision 30980) @@ -22,9 +22,9 @@ const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */ {"disable-gd", "libs/gui/gd", arg_lib_nodes, "$do not use gd (many exporters need it)"}, - {"disable-gd-gif", "libs/gui/gd/gdImageGif", arg_lib_nodes, "$no gif support in the png pcb_exporter"}, - {"disable-gd-png", "libs/gui/gd/gdImagePng", arg_lib_nodes, "$no png support in the png pcb_exporter"}, - {"disable-gd-jpg", "libs/gui/gd/gdImageJpeg", arg_lib_nodes, "$no jpeg support in the png pcb_exporter"}, + {"disable-gd-gif", "libs/gui/gd/gdImageGif", arg_lib_nodes, "$no gif support in the png rnd_exporter"}, + {"disable-gd-png", "libs/gui/gd/gdImagePng", arg_lib_nodes, "$no png support in the png rnd_exporter"}, + {"disable-gd-jpg", "libs/gui/gd/gdImageJpeg", arg_lib_nodes, "$no jpeg support in the png rnd_exporter"}, {"enable-bison", "/local/pcb/want_bison", arg_true, "$enable generating language files using bison/flex"}, {"disable-bison", "/local/pcb/want_bison", arg_false, "$disable generating language files using bison/flex"}, {"enable-byaccic", "/local/pcb/want_byaccic", arg_true, "$enable generating language files using byaccic/ureglex"}, Index: trunk/scconfig/plugins.h =================================================================== --- trunk/scconfig/plugins.h (revision 30979) +++ trunk/scconfig/plugins.h (revision 30980) @@ -92,27 +92,27 @@ plugin_header("\nExport plugins:\n") plugin_def("cam", "cam/job based export", sbuildin, 1, 0) plugin_def("ddraft", "2D drafting helper", sbuildin, 1, 0) -plugin_def("export_bom", "bom pcb_exporter", sbuildin, 1, 0) -plugin_def("export_dsn", "specctra .dsn pcb_exporter", sbuildin, 1, 0) -plugin_def("export_dxf", "DXF pcb_exporter", sbuildin, 1, 0) +plugin_def("export_bom", "bom rnd_exporter", sbuildin, 1, 0) +plugin_def("export_dsn", "specctra .dsn rnd_exporter", sbuildin, 1, 0) +plugin_def("export_dxf", "DXF rnd_exporter", sbuildin, 1, 0) plugin_def("export_excellon", "Excellon drill exporter", sbuildin, 1, 0) -plugin_def("export_fidocadj", "FidoCadJ .fcd pcb_exporter", sbuildin, 1, 0) -plugin_def("export_gcode", "gcode pcb_exporter", sbuildin, 1, 0) -plugin_def("export_gerber", "Gerber pcb_exporter", sbuildin, 1, 0) -plugin_def("export_ipcd356", "IPC-D-356 Netlist pcb_exporter", sbuildin, 1, 0) -plugin_def("export_lpr", "lpr pcb_exporter (printer)", sbuildin, 1, 0) +plugin_def("export_fidocadj", "FidoCadJ .fcd rnd_exporter", sbuildin, 1, 0) +plugin_def("export_gcode", "gcode rnd_exporter", sbuildin, 1, 0) +plugin_def("export_gerber", "Gerber rnd_exporter", sbuildin, 1, 0) +plugin_def("export_ipcd356", "IPC-D-356 Netlist rnd_exporter", sbuildin, 1, 0) +plugin_def("export_lpr", "lpr rnd_exporter (printer)", sbuildin, 1, 0) plugin_def("export_oldconn", "old connection data format", sbuildin, 1, 0) plugin_def("export_openems", "openems exporter", sbuildin, 1, 0) -plugin_def("export_openscad", "openscad pcb_exporter", sbuildin, 1, 0) -plugin_def("export_png", "png/gif/jpg pcb_exporter", sbuildin, 1, 0) -plugin_def("export_ps", "postscript pcb_exporter", sbuildin, 1, 0) +plugin_def("export_openscad", "openscad rnd_exporter", sbuildin, 1, 0) +plugin_def("export_png", "png/gif/jpg rnd_exporter", sbuildin, 1, 0) +plugin_def("export_ps", "postscript rnd_exporter", sbuildin, 1, 0) plugin_def("export_stat", "export board statistics", sbuildin, 1, 0) plugin_def("export_stl", "3d export: STL", sbuildin, 1, 0) -plugin_def("export_svg", "SVG pcb_exporter", sbuildin, 1, 0) -plugin_def("export_test", "dummy test pcb_exporter", sdisable, 1, 0) +plugin_def("export_svg", "SVG rnd_exporter", sbuildin, 1, 0) +plugin_def("export_test", "dummy test rnd_exporter", sdisable, 1, 0) plugin_def("export_vfs_fuse", "FUSE VFS server", sdisable, 1, 0) plugin_def("export_vfs_mc", "GNU mc VFS server", sdisable, 1, 0) -plugin_def("export_xy", "xy (centroid) pcb_exporter", sbuildin, 1, 0) +plugin_def("export_xy", "xy (centroid) rnd_exporter", sbuildin, 1, 0) plugin_header("\nIO plugins (file formats):\n") plugin_def("io_autotrax", "autotrax (freeware PCB CAD)", sbuildin, 1, 0) Index: trunk/src/actions_pcb.c =================================================================== --- trunk/src/actions_pcb.c (revision 30979) +++ trunk/src/actions_pcb.c (revision 30980) @@ -335,7 +335,7 @@ defer_updates = 0; if (defer_needs_update) { pcb_undo_inc_serial(); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } return res; Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 30979) +++ trunk/src/board.c (revision 30980) @@ -381,8 +381,8 @@ void pcb_board_changed(int reverted) { - if ((pcb_gui != NULL) && (pcb_gui->set_hidlib != NULL)) - pcb_gui->set_hidlib(pcb_gui, &PCB->hidlib); + if ((rnd_gui != NULL) && (rnd_gui->set_hidlib != NULL)) + rnd_gui->set_hidlib(rnd_gui, &PCB->hidlib); rnd_event(&PCB->hidlib, RND_EVENT_BOARD_CHANGED, "i", reverted); } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30979) +++ trunk/src/buffer.c (revision 30980) @@ -501,11 +501,11 @@ if (wid == ctx->wy) { /* copy y into x */ hv.dbl = ctx->dlg[ctx->wy].val.dbl; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wx, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wx, &hv); } else { /* copy x into y */ hv.dbl = ctx->dlg[ctx->wx].val.dbl; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wy, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wy, &hv); } } @@ -1058,7 +1058,7 @@ case F_SaveAll: free_name = pcb_false; if (argc <= 2) { - name = pcb_gui->fileselect(pcb_gui, "Save Paste Buffer As ...", + name = rnd_gui->fileselect(rnd_gui, "Save Paste Buffer As ...", "Choose a file to save the contents of the\npaste buffer to.\n", default_file, ".lht", NULL, "buffer", 0, NULL); @@ -1092,7 +1092,7 @@ case F_LoadAll: free_name = pcb_false; if (argc <= 2) { - name = pcb_gui->fileselect(pcb_gui, "Load Paste Buffer ...", + name = rnd_gui->fileselect(rnd_gui, "Load Paste Buffer ...", "Choose a file to load the contents of the\npaste buffer from.\n", default_file, ".lht", NULL, "buffer", RND_HID_FSD_READ | RND_HID_FSD_MAY_NOT_EXIST, NULL); Index: trunk/src/build_run.c =================================================================== --- trunk/src/build_run.c (revision 30979) +++ trunk/src/build_run.c (revision 30980) @@ -50,12 +50,12 @@ else pcb_disable_emergency_save(); - if (pcb_gui->do_exit == NULL) { + if (rnd_gui->do_exit == NULL) { pcb_main_uninit(); exit(0); } else - pcb_gui->do_exit(pcb_gui); + rnd_gui->do_exit(rnd_gui); } char *pcb_get_info_program(void) @@ -150,8 +150,8 @@ gds_append_str(&info, "----- Run Time Options -----\n"); gds_append_str(&info, "GUI: "); - if (pcb_gui != NULL) { - gds_append_str(&info, pcb_gui->name); + if (rnd_gui != NULL) { + gds_append_str(&info, rnd_gui->name); gds_append_str(&info, "\n"); } else Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 30979) +++ trunk/src/change_act.c (revision 30980) @@ -466,7 +466,7 @@ defer_needs_update = 1; else { /* pcb_undo_inc_serial(); */ - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 30979) +++ trunk/src/crosshair.c (revision 30980) @@ -103,7 +103,7 @@ } /* normal contour line */ - pcb_render->draw_line(pcb_crosshair.GC, + rnd_render->draw_line(pcb_crosshair.GC, polygon->Points[i].X + dx, polygon->Points[i].Y + dy, polygon->Points[next].X + dx, polygon->Points[next].Y + dy); } @@ -125,7 +125,7 @@ } /* normal contour line */ - pcb_render->draw_line(pcb_crosshair.GC, + rnd_render->draw_line(pcb_crosshair.GC, PCB_CSWAP_X(polygon->Points[i].X, w, mirr) + dx, PCB_CSWAP_Y(polygon->Points[i].Y, h, mirr) + dy, PCB_CSWAP_X(polygon->Points[next].X, w, mirr) + dx, @@ -243,8 +243,8 @@ rnd_point_t *point = (rnd_point_t *) pcb_crosshair.AttachedObject.Ptr3; if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { - pcb_render->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point1.X, line->Point1.Y); - pcb_render->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point2.X, line->Point2.Y); + rnd_render->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point1.X, line->Point1.Y); + rnd_render->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point2.X, line->Point2.Y); } } @@ -297,11 +297,11 @@ /* Draw the DRC outline if it is enabled */ if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); pcb_draw_wireframe_line(pcb_crosshair.GC,line.Point1.X, line.Point1.Y, line.Point2.X, line.Point2.Y, line.Thickness + 2 * (conf_core.design.bloat + 1), 0); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } break; } @@ -320,10 +320,10 @@ /* Draw the DRC outline if it is enabled */ if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); arc.Thickness += 2 * (conf_core.design.bloat + 1); pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } break; } @@ -371,10 +371,10 @@ /* Draw the DRC outline if it is enabled */ if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, point2.Y,line->Thickness + 2 * (conf_core.design.bloat + 1), 0); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } } else { @@ -388,8 +388,8 @@ line->Thickness, line->Clearance, line->Flags, - pcb_gui->shift_is_pressed(pcb_gui), - pcb_gui->control_is_pressed(pcb_gui) ); + rnd_gui->shift_is_pressed(rnd_gui), + rnd_gui->control_is_pressed(rnd_gui) ); pcb_route_draw(&route,pcb_crosshair.GC); if (conf_core.editor.show_drc) pcb_route_draw_drc(&route,pcb_crosshair.GC); @@ -426,10 +426,10 @@ /* Draw the DRC outline if it is enabled */ if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); arc.Thickness += 2 * (conf_core.design.bloat + 1); pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } /* Get the new arc point positions, calculate the movement deltas and send them @@ -457,8 +457,8 @@ next = pcb_poly_contour_next_point(polygon, point_idx); /* draw the two segments */ - pcb_render->draw_line(pcb_crosshair.GC, polygon->Points[prev].X, polygon->Points[prev].Y, point->X + dx, point->Y + dy); - pcb_render->draw_line(pcb_crosshair.GC, point->X + dx, point->Y + dy, polygon->Points[next].X, polygon->Points[next].Y); + rnd_render->draw_line(pcb_crosshair.GC, polygon->Points[prev].X, polygon->Points[prev].Y, point->X + dx, point->Y + dy); + rnd_render->draw_line(pcb_crosshair.GC, point->X + dx, point->Y + dy, polygon->Points[next].X, polygon->Points[next].Y); break; } @@ -477,7 +477,7 @@ pcb_subc_t *sc = data->parent.subc; rnd_coord_t ox, oy; if (pcb_subc_get_origin(sc, &ox, &oy) == 0) - pcb_render->draw_line(pcb_crosshair.GC, ox, oy, pcb_crosshair.X, pcb_crosshair.Y); + rnd_render->draw_line(pcb_crosshair.GC, ox, oy, pcb_crosshair.X, pcb_crosshair.Y); } } } @@ -489,11 +489,11 @@ void pcbhl_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) { if (!inhibit_drawing_mode) { - pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_RESET, 1, NULL); - pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_POSITIVE_XOR, 1, NULL); + rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_RESET, 1, NULL); + rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_POSITIVE_XOR, 1, NULL); } - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); pcb_tool_draw_attached(hidlib); /* an attached box does not depend on a special mode */ @@ -504,11 +504,11 @@ y1 = pcb_crosshair.AttachedBox.Point1.Y; x2 = pcb_crosshair.AttachedBox.Point2.X; y2 = pcb_crosshair.AttachedBox.Point2.Y; - pcb_render->draw_rect(pcb_crosshair.GC, x1, y1, x2, y2); + rnd_render->draw_rect(pcb_crosshair.GC, x1, y1, x2, y2); } if (!inhibit_drawing_mode) - pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_FLUSH, 1, NULL); + rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_FLUSH, 1, NULL); } @@ -518,25 +518,25 @@ if ((pcb_marked.status) || (hidlib->tool_grabbed.status)) { if (!inhibit_drawing_mode) { - pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_RESET, 1, NULL); - pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_POSITIVE, 1, NULL); + rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_RESET, 1, NULL); + rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_POSITIVE, 1, NULL); } - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.mark); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.mark); } if (pcb_marked.status) { - pcb_render->draw_line(pcb_crosshair.GC, pcb_marked.X - ms, pcb_marked.Y - ms, pcb_marked.X + ms, pcb_marked.Y + ms); - pcb_render->draw_line(pcb_crosshair.GC, pcb_marked.X + ms, pcb_marked.Y - ms, pcb_marked.X - ms, pcb_marked.Y + ms); + rnd_render->draw_line(pcb_crosshair.GC, pcb_marked.X - ms, pcb_marked.Y - ms, pcb_marked.X + ms, pcb_marked.Y + ms); + rnd_render->draw_line(pcb_crosshair.GC, pcb_marked.X + ms, pcb_marked.Y - ms, pcb_marked.X - ms, pcb_marked.Y + ms); } if (hidlib->tool_grabbed.status) { - pcb_render->draw_line(pcb_crosshair.GC, hidlib->tool_grabbed.X - ms, hidlib->tool_grabbed.Y - ms2, hidlib->tool_grabbed.X + ms, hidlib->tool_grabbed.Y + ms2); - pcb_render->draw_line(pcb_crosshair.GC, hidlib->tool_grabbed.X + ms2, hidlib->tool_grabbed.Y - ms, hidlib->tool_grabbed.X - ms2, hidlib->tool_grabbed.Y + ms); + rnd_render->draw_line(pcb_crosshair.GC, hidlib->tool_grabbed.X - ms, hidlib->tool_grabbed.Y - ms2, hidlib->tool_grabbed.X + ms, hidlib->tool_grabbed.Y + ms2); + rnd_render->draw_line(pcb_crosshair.GC, hidlib->tool_grabbed.X + ms2, hidlib->tool_grabbed.Y - ms, hidlib->tool_grabbed.X - ms2, hidlib->tool_grabbed.Y + ms); } if ((pcb_marked.status) || (hidlib->tool_grabbed.status)) if (!inhibit_drawing_mode) - pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_FLUSH, 1, NULL); + rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_FLUSH, 1, NULL); } @@ -556,8 +556,8 @@ */ void pcb_notify_mark_change(rnd_bool changes_complete) { - if (pcb_gui->notify_mark_change) - pcb_gui->notify_mark_change(pcb_gui, changes_complete); + if (rnd_gui->notify_mark_change) + rnd_gui->notify_mark_change(rnd_gui, changes_complete); } @@ -766,7 +766,7 @@ } sq_dist = crosshair_sq_dist(snap_data->crosshair, x, y); - if (sq_dist < snap_data->nearest_sq_dist || (prefer_to_grid && snap_data->nearest_is_grid && !pcb_gui->shift_is_pressed(pcb_gui))) { + if (sq_dist < snap_data->nearest_sq_dist || (prefer_to_grid && snap_data->nearest_is_grid && !rnd_gui->shift_is_pressed(rnd_gui))) { snap_data->x = x; snap_data->y = y; snap_data->nearest_sq_dist = sq_dist; @@ -986,12 +986,12 @@ if (pcbhl_conf.editor.mode == pcb_crosshair.tool_arrow) { ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans == PCB_OBJ_VOID) { - if ((pcb_gui != NULL) && (pcb_gui->point_cursor != NULL)) - pcb_gui->point_cursor(pcb_gui, pcb_false); + if ((rnd_gui != NULL) && (rnd_gui->point_cursor != NULL)) + rnd_gui->point_cursor(rnd_gui, pcb_false); } else if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) { - if ((pcb_gui != NULL) && (pcb_gui->point_cursor != NULL)) - pcb_gui->point_cursor(pcb_gui, pcb_true); + if ((rnd_gui != NULL) && (rnd_gui->point_cursor != NULL)) + rnd_gui->point_cursor(rnd_gui, pcb_true); } } @@ -998,7 +998,7 @@ if (pcbhl_conf.editor.mode == pcb_crosshair.tool_line && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST && conf_core.editor.auto_drc) pcb_line_enforce_drc(PCB); - pcb_gui->set_crosshair(pcb_gui, pcb_crosshair.X, pcb_crosshair.Y, HID_SC_DO_NOTHING); + rnd_gui->set_crosshair(rnd_gui, pcb_crosshair.X, pcb_crosshair.Y, HID_SC_DO_NOTHING); } /* --------------------------------------------------------------------------- @@ -1047,7 +1047,7 @@ PCB->hidlib.grid = 1; if (pcb_crosshair_move_absolute(X, Y)) pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); - pcb_gui->set_crosshair(pcb_gui, pcb_crosshair.X, pcb_crosshair.Y, HID_SC_WARP_POINTER); + rnd_gui->set_crosshair(rnd_gui, pcb_crosshair.X, pcb_crosshair.Y, HID_SC_WARP_POINTER); PCB->hidlib.grid = save_grid; } @@ -1056,7 +1056,7 @@ { pcb_crosshair.GC = pcb_hid_make_gc(); - pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross); + rnd_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross); pcb_hid_set_draw_xor(pcb_crosshair.GC, 1); pcb_hid_set_line_cap(pcb_crosshair.GC, rnd_cap_round); pcb_hid_set_line_width(pcb_crosshair.GC, 1); @@ -1092,7 +1092,7 @@ { pcb_poly_free_fields(&pcb_crosshair.AttachedPolygon); pcb_route_destroy(&pcb_crosshair.Route); - if (pcb_render != NULL) + if (rnd_render != NULL) pcb_hid_destroy_gc(pcb_crosshair.GC); rnd_event_unbind_allcookie(crosshair_cookie); } Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 30979) +++ trunk/src/draw.c (revision 30980) @@ -112,13 +112,13 @@ double dx = x2-x1, dy = y2-y1; double len_mnt = PCB_ABS(dx) + PCB_ABS(dy); int n; - rnd_coord_t minlen = pcb_render->coord_per_pix * 8; + rnd_coord_t minlen = rnd_render->coord_per_pix * 8; /* Ignore info->xform->bloat because a dashed line is always thin */ if (len_mnt < minlen*2) { /* line too short, just draw it */ - pcb_render->draw_line(GC, x1, y1, x2, y2); + rnd_render->draw_line(GC, x1, y1, x2, y2); return; } @@ -133,7 +133,7 @@ /* first seg is drawn from x1, y1 with no rounding error due to n-1 == 0 */ for(n = 1; n < segs; n+=2) - pcb_render->draw_line(GC, + rnd_render->draw_line(GC, x1 + (dx * (double)(n-1) / (double)segs), y1 + (dy * (double)(n-1) / (double)segs), x1 + (dx * (double)n / (double)segs), y1 + (dy * (double)n / (double)segs)); @@ -140,7 +140,7 @@ /* make sure the last segment is drawn properly to x2 and y2, don't leave room for rounding errors */ - pcb_render->draw_line(GC, + rnd_render->draw_line(GC, x2 - (dx / (double)segs), y2 - (dy / (double)segs), x2, y2); } @@ -155,7 +155,7 @@ if (pcb_draw_inhibit) return; if (pcb_draw_invalidated.X1 <= pcb_draw_invalidated.X2 && pcb_draw_invalidated.Y1 <= pcb_draw_invalidated.Y2) - pcb_render->invalidate_lr(pcb_render, pcb_draw_invalidated.X1, pcb_draw_invalidated.X2, pcb_draw_invalidated.Y1, pcb_draw_invalidated.Y2); + rnd_render->invalidate_lr(rnd_render, pcb_draw_invalidated.X1, pcb_draw_invalidated.X2, pcb_draw_invalidated.Y1, pcb_draw_invalidated.Y2); /* shrink the update block */ pcb_draw_invalidated.X1 = pcb_draw_invalidated.Y1 = RND_COORD_MAX; @@ -169,12 +169,12 @@ if (plated && pcb_layer_gui_set_vlayer(PCB, PCB_VLY_PLATED_DRILL, 0, &info->xform_exporter)) { pcb_draw_pstk_holes(info, gid, PCB_PHOLE_PLATED); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } if (unplated && pcb_layer_gui_set_vlayer(PCB, PCB_VLY_UNPLATED_DRILL, 0, &info->xform_exporter)) { pcb_draw_pstk_holes(info, gid, PCB_PHOLE_UNPLATED); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } } @@ -206,7 +206,7 @@ if (set_vlayer(info, lvly_drawn->top_assy, lvly_drawn->top_assy_enable, PCB_VLY_TOP_ASSY)) { xform_setup(info, &tmp, NULL); pcb_draw_assembly(info, PCB_LYT_TOP); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); info->xform = NULL; info->layer = NULL; } @@ -213,7 +213,7 @@ if (set_vlayer(info, lvly_drawn->bot_assy, lvly_drawn->bot_assy_enable, PCB_VLY_BOTTOM_ASSY)) { xform_setup(info, &tmp, NULL); pcb_draw_assembly(info, PCB_LYT_BOTTOM); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); info->xform = NULL; info->layer = NULL; } @@ -220,7 +220,7 @@ if (set_vlayer(info, lvly_drawn->top_fab, lvly_drawn->top_fab_enable, PCB_VLY_FAB)) { xform_setup(info, &tmp, NULL); pcb_stub_draw_fab(info, pcb_draw_out.fgGC, &hid_exp); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); info->xform = NULL; info->layer = NULL; } @@ -227,7 +227,7 @@ if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_CSECT, 0, &info->xform_exporter)) { xform_setup(info, &tmp, NULL); pcb_stub_draw_csect(pcb_draw_out.fgGC, &hid_exp); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); info->xform = NULL; info->layer = NULL; } } @@ -253,8 +253,8 @@ ly = pcb_uilayers.array[i]; if ((ly != NULL) && (ly->meta.real.vis)) { if (!have_canvas) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); have_canvas = 1; } pcb_draw_layer(info, ly); @@ -261,8 +261,8 @@ } } if (have_canvas) - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->end_layer(rnd_render); } } @@ -270,8 +270,8 @@ static void draw_xor_marks(pcb_draw_info_t *info) { int per_side = conf_core.appearance.subc_layer_per_side; - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE_XOR, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE_XOR, pcb_draw_out.direct, info->drawn_area); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 1); @@ -291,17 +291,17 @@ rnd_event(&PCB->hidlib, RND_EVENT_GUI_DRAW_OVERLAY_XOR, "p", &pcb_draw_out.fgGC, NULL); pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 0); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } static void draw_rats(pcb_draw_info_t *info, const rnd_rnd_box_t *drawn_area) { if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_RATS, 0, NULL)) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); pcb_draw_rats(info, drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); + rnd_render->end_layer(rnd_render); } } @@ -310,8 +310,8 @@ int per_side = conf_core.appearance.subc_layer_per_side; /* Draw pins' and pads' names */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); if (PCB->SubcOn) { @@ -323,7 +323,7 @@ pcb_draw_pstk_labels(info); } pcb_draw_pstk_names(info, info->xform->show_solder_side ? solder : component, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } static int has_auto(pcb_layergrp_t *grp) @@ -366,7 +366,7 @@ } } - pcb_render->render_burst(pcb_render, RND_HID_BURST_START, info->drawn_area); + rnd_render->render_burst(rnd_render, RND_HID_BURST_START, info->drawn_area); memset(do_group, 0, sizeof(do_group)); lvly.top_fab = -1; @@ -420,10 +420,10 @@ pcb_draw_silk_doc(info, side, PCB_LYT_DOC, 0, 1); pcb_draw_silk_doc(info, side, PCB_LYT_SILK, 0, 1); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->end_layer(rnd_render); } /* Draw far side doc and silks */ @@ -454,35 +454,35 @@ } pcb_draw_layer_grp(info, group, is_current); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } } - if (conf_core.editor.check_planes && pcb_render->gui) + if (conf_core.editor.check_planes && rnd_render->gui) goto finish; /* Draw padstacks below silk */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); - if (pcb_render->gui) { + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + if (rnd_render->gui) { rnd_xform_t tmp; xform_setup(info, &tmp, NULL); pcb_draw_ppv(info, info->xform->show_solder_side ? solder : component); info->xform = NULL; info->layer = NULL; } - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); /* Draw the solder mask if turned on */ gid = pcb_layergrp_get_top_mask(); if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, 0, &info->xform_exporter))) { pcb_draw_mask(info, PCB_COMPONENT_SIDE); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } gid = pcb_layergrp_get_bottom_mask(); if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, 0, &info->xform_exporter))) { pcb_draw_mask(info, PCB_SOLDER_SIDE); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } /* Draw doc and silks */ @@ -497,10 +497,10 @@ } { /* holes_after: draw holes after copper, silk and mask, to make sure it punches through everything. */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); draw_everything_holes(info, side_copper_grp); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } gid = pcb_layergrp_get_top_paste(); @@ -508,7 +508,7 @@ paste_empty = pcb_layergrp_is_empty(PCB, gid); if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, paste_empty, &info->xform_exporter))) { pcb_draw_paste(info, PCB_COMPONENT_SIDE); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } gid = pcb_layergrp_get_bottom_paste(); @@ -516,13 +516,13 @@ paste_empty = pcb_layergrp_is_empty(PCB, gid); if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, paste_empty, &info->xform_exporter))) { pcb_draw_paste(info, PCB_SOLDER_SIDE); - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } pcb_draw_boundary_mech(info); draw_virtual_layers(info, &lvly); - if ((pcb_render->gui) || (!info->xform_caller->omit_overlay)) { + if ((rnd_render->gui) || (!info->xform_caller->omit_overlay)) { rnd_xform_t tmp; xform_setup(info, &tmp, NULL); draw_rats(info, info->drawn_area); @@ -530,7 +530,7 @@ } draw_ui_layers(info); - if (pcb_render->gui) { + if (rnd_render->gui) { rnd_xform_t tmp; xform_setup(info, &tmp, NULL); draw_xor_marks(info); @@ -614,10 +614,10 @@ static void pcb_draw_ppv(pcb_draw_info_t *info, rnd_layergrp_id_t group) { /* draw padstack holes - copper is drawn with each group */ - if (PCB->pstk_on || !pcb_render->gui) { + if (PCB->pstk_on || !rnd_render->gui) { pcb_draw_pstk_holes(info, group, PCB_PHOLE_PLATED | PCB_PHOLE_UNPLATED | PCB_PHOLE_BB); if ( - !pcb_render->gui /* on the gui padstacks can be turned off separately so we shouldn't enforce drawing the slot in it; on export, copper is copper, no matter if it is coming from a padstack: slot always needs to be drawn */ + !rnd_render->gui /* on the gui padstacks can be turned off separately so we shouldn't enforce drawing the slot in it; on export, copper is copper, no matter if it is coming from a padstack: slot always needs to be drawn */ && !info->xform_caller->no_slot_in_nonmech /* keep the output cleaner in some exporters, like gerber, where solid copper is drawn anyway */ ) pcb_draw_pstk_slots(info, group, PCB_PHOLE_PLATED | PCB_PHOLE_UNPLATED | PCB_PHOLE_BB); @@ -630,7 +630,7 @@ */ void pcb_draw_pstk_names(pcb_draw_info_t *info, rnd_layergrp_id_t group, const rnd_rnd_box_t *drawn_area) { - if (PCB->pstk_on || !pcb_render->gui) { + if (PCB->pstk_on || !rnd_render->gui) { size_t n; for(n = 0; n < delayed_labels.used; n++) pcb_draw_obj_label(info, group, delayed_labels.array[n]); @@ -661,7 +661,7 @@ { size_t n; - if ((pcb_render != NULL) && (pcb_render->gui)) { + if ((rnd_render != NULL) && (rnd_render->gui)) { for(n = 0; n < annot_objs.used; n++) { pcb_any_obj_t *o = annot_objs.array[n]; switch(o->type) { @@ -788,8 +788,8 @@ static void pcb_draw_info_setup(pcb_draw_info_t *info, pcb_board_t *pcb) { info->pcb = pcb; - info->exporting = (pcb_render->exporter || pcb_render->printer); - info->export_name = pcb_render->name; + info->exporting = (rnd_render->exporter || rnd_render->printer); + info->export_name = rnd_render->name; if (info->exporting) { strcpy(info->noexport_name, "noexport:"); strncpy(info->noexport_name+9, info->export_name, sizeof(info->noexport_name)-10); @@ -929,8 +929,8 @@ pcb_layergrp_t *grp = pcb_get_layergrp(PCB, group); unsigned int gflg = grp->ltype; - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); for (i = n_entries - 1; i >= 0; i--) { layernum = layers[i]; @@ -953,11 +953,11 @@ } /* this draws the holes - must be the last, so holes are drawn over everything else */ - if (!pcb_render->gui) + if (!rnd_render->gui) pcb_draw_ppv(info, group); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } void pcb_erase_obj(int type, void *lptr, void *ptr) @@ -1069,13 +1069,13 @@ static void expose_begin(pcb_output_t *save, rnd_hid_t *hid) { memcpy(save, &pcb_draw_out, sizeof(pcb_output_t)); - save->hid = pcb_render; + save->hid = rnd_render; delayed_labels_enabled = pcb_true; vtp0_truncate(&delayed_labels, 0); vtp0_truncate(&delayed_objs, 0); - pcb_render = pcb_draw_out.hid = hid; + rnd_render = pcb_draw_out.hid = hid; pcb_draw_out.fgGC = pcb_hid_make_gc(); pcb_draw_out.padGC = pcb_hid_make_gc(); pcb_draw_out.backpadGC = pcb_hid_make_gc(); @@ -1117,7 +1117,7 @@ vtp0_truncate(&delayed_objs, 0); memcpy(&pcb_draw_out, save, sizeof(pcb_output_t)); - pcb_render = pcb_draw_out.hid; + rnd_render = pcb_draw_out.hid; } void pcb_draw_setup_default_gui_xform(rnd_xform_t *dst) @@ -1180,11 +1180,11 @@ pcb_output_t save; expose_begin(&save, hid); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, 1, &e->view); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, 1, &e->view); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, 1, &e->view); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, 1, &e->view); e->expose_cb(pcb_draw_out.fgGC, e); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, 1, &e->view); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, 1, &e->view); + rnd_render->end_layer(rnd_render); expose_end(&save); } @@ -1246,12 +1246,12 @@ mirror = (flip_x ^ flip_y); direction = (vert ? 1 : 0) + (flip_x ? 2 : 0); - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name); - if (pcb_render->gui) + if (rnd_render->gui) pcb_draw_force_termlab++; pcb_text_draw_string(info, font, (unsigned const char *)label, x, y, scale, direction*90.0, mirror, 1, 0, 0, 0, 0, PCB_TXT_TINY_HIDE); - if (pcb_render->gui) + if (rnd_render->gui) pcb_draw_force_termlab--; } Index: trunk/src/draw.h =================================================================== --- trunk/src/draw.h (revision 30979) +++ trunk/src/draw.h (revision 30980) @@ -150,7 +150,7 @@ #define PCB_DRAW_BBOX(obj) \ do { \ pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); \ - pcb_render->draw_rect(pcb_draw_out.fgGC, obj->BoundingBox.X1, obj->BoundingBox.Y1, obj->BoundingBox.X2, obj->BoundingBox.Y2); \ + rnd_render->draw_rect(pcb_draw_out.fgGC, obj->BoundingBox.X1, obj->BoundingBox.Y1, obj->BoundingBox.X2, obj->BoundingBox.Y2); \ } while(0) #else #define PCB_DRAW_BBOX(obj) @@ -182,7 +182,7 @@ #define pcb_draw_term_need_gfx(obj) \ (((obj)->term != NULL) && !PCB_FLAG_TEST(PCB_FLAG_FOUND, (obj)) && !PCB_FLAG_TEST(PCB_FLAG_WARN, (obj)) && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (obj))) -#define pcb_draw_term_hid_permission() (pcb_gui->heavy_term_layer_ind) +#define pcb_draw_term_hid_permission() (rnd_gui->heavy_term_layer_ind) #define PCB_DRAW_TERM_GFX_WIDTH (-3) Index: trunk/src/draw_composite.c =================================================================== --- trunk/src/draw_composite.c (revision 30979) +++ trunk/src/draw_composite.c (revision 30980) @@ -41,28 +41,28 @@ static void comp_fill_board(comp_ctx_t *ctx) { - pcb_render->set_color(pcb_draw_out.fgGC, ctx->color); + rnd_render->set_color(pcb_draw_out.fgGC, ctx->color); if (ctx->info->drawn_area == NULL) - pcb_render->fill_rect(pcb_draw_out.fgGC, 0, 0, ctx->info->pcb->hidlib.size_x, ctx->info->pcb->hidlib.size_y); + rnd_render->fill_rect(pcb_draw_out.fgGC, 0, 0, ctx->info->pcb->hidlib.size_x, ctx->info->pcb->hidlib.size_y); else - pcb_render->fill_rect(pcb_draw_out.fgGC, ctx->info->drawn_area->X1, ctx->info->drawn_area->Y1, ctx->info->drawn_area->X2, ctx->info->drawn_area->Y2); + rnd_render->fill_rect(pcb_draw_out.fgGC, ctx->info->drawn_area->X1, ctx->info->drawn_area->Y1, ctx->info->drawn_area->X2, ctx->info->drawn_area->Y2); } static void comp_start_sub_(comp_ctx_t *ctx) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_NEGATIVE, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_NEGATIVE, pcb_draw_out.direct, ctx->info->drawn_area); } static void comp_start_add_(comp_ctx_t *ctx) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); } static void comp_start_sub(comp_ctx_t *ctx) { if (ctx->thin) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); - pcb_render->set_color(pcb_draw_out.pmGC, ctx->color); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_color(pcb_draw_out.pmGC, ctx->color); return; } @@ -75,7 +75,7 @@ static void comp_start_add(comp_ctx_t *ctx) { if (ctx->thin) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); return; } @@ -87,12 +87,12 @@ static void comp_finish(comp_ctx_t *ctx) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, ctx->info->drawn_area); } static void comp_init(comp_ctx_t *ctx, int negative) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, ctx->info->drawn_area); if (ctx->thin) return; @@ -102,7 +102,7 @@ if ((!ctx->thin) && (negative)) { /* drawing the big poly for the negative */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); comp_fill_board(ctx); } } Index: trunk/src/draw_ly_spec.c =================================================================== --- trunk/src/draw_ly_spec.c (revision 30979) +++ trunk/src/draw_ly_spec.c (revision 30980) @@ -63,9 +63,9 @@ cctx.invert = 0; if ((cctx.grp == NULL) || (cctx.grp->len == 0)) { /* fallback: no layers -> original code: draw a single auto-add */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } else { comp_draw_layer(&cctx, pcb_draw_paste_auto_, &side); @@ -102,7 +102,7 @@ cctx.gid = gid; cctx.color = ly != NULL ? &ly->meta.real.color : &conf_core.appearance.color.mask; cctx.thin = (info->xform != NULL) && (info->xform->thin_draw || info->xform->thin_draw_poly || info->xform->wireframe); - cctx.invert = pcb_render->mask_invert; + cctx.invert = rnd_render->mask_invert; if (!cctx.invert) pcb_draw_out.direct = 0; @@ -186,11 +186,11 @@ if ((lyt_type & PCB_LYT_SILK) && (pcb_is_silk_old_style(&cctx, lid))) { /* fallback: implicit layer -> original code: draw auto+manual */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_draw_layer(info, pcb_get_layer(info->pcb->Data, lid)); pcb_draw_silk_auto(&cctx, &lyt_side); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } else { comp_draw_layer(&cctx, pcb_draw_silk_auto, &lyt_side); @@ -197,7 +197,7 @@ comp_finish(&cctx); } if (setgrp) - pcb_render->end_layer(pcb_render); + rnd_render->end_layer(rnd_render); } } @@ -271,32 +271,32 @@ if (pcb_layer_gui_set_layer(gid, g, (numobj == 0), &info->xform_exporter)) { /* boundary does NOT support compisiting, everything is drawn in positive */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); for(n = 0; n < g->len; n++) { pcb_layer_t *ly = pcb_get_layer(info->pcb->Data, g->lid[n]); pcb_draw_layer(info, ly); } - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->end_layer(rnd_render); } } if ((count == 0) && (goutl != NULL) && (pcb_layer_gui_set_layer(goutid, goutl, 0, &info->xform))) { /* The implicit outline rectangle (or automatic outline rectanlge). - We should check for pcb_render->gui here, but it's kinda cool seeing the + We should check for rnd_render->gui here, but it's kinda cool seeing the auto-outline magically disappear when you first add something to the outline layer. */ - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color); + rnd_render->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid); - pcb_render->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_render->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->end_layer(rnd_render); } /* draw slots */ @@ -307,20 +307,20 @@ if ((uslot != NULL) && (uslot->meta.real.vis)) { if (pcb_layer_gui_set_glayer(PCB, uslot->meta.real.grp, unplated <= 0, &info->xform)) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_draw_pstk_slots(info, uslot->meta.real.grp, PCB_PHOLE_UNPLATED | PCB_PHOLE_BB); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->end_layer(rnd_render); } } if ((pslot != NULL) && (pslot->meta.real.vis)) { if (pcb_layer_gui_set_glayer(PCB, pslot->meta.real.grp, plated <= 0, &info->xform)) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_draw_pstk_slots(info, pslot->meta.real.grp, PCB_PHOLE_PLATED | PCB_PHOLE_BB); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); - pcb_render->end_layer(pcb_render); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + rnd_render->end_layer(rnd_render); } } } @@ -330,10 +330,10 @@ static void pcb_draw_rats(pcb_draw_info_t *info, const rnd_rnd_box_t *drawn_area) { - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, info, NULL); - pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); + rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); } static void pcb_draw_assembly(pcb_draw_info_t *info, pcb_layer_type_t lyt_side) Index: trunk/src/draw_wireframe.h =================================================================== --- trunk/src/draw_wireframe.h (revision 30979) +++ trunk/src/draw_wireframe.h (revision 30980) @@ -40,7 +40,7 @@ rnd_coord_t x1, y1, x2, y2; if ((arc->Width == 0) && (arc->Height == 0)) { - pcb_render->draw_arc(gc, arc->X, arc->Y, wid, wid, 0, 360); + rnd_render->draw_arc(gc, arc->X, arc->Y, wid, wid, 0, 360); return; } @@ -47,11 +47,11 @@ pcb_arc_get_end(arc, 0, &x1, &y1); pcb_arc_get_end(arc, 1, &x2, &y2); - pcb_render->draw_arc(gc, arc->X, arc->Y, arc->Width + wid, arc->Height + wid, arc->StartAngle, arc->Delta); - if (wid > pcb_pixel_slop) { - pcb_render->draw_arc(gc, arc->X, arc->Y, arc->Width - wid, arc->Height - wid, arc->StartAngle, arc->Delta); - pcb_render->draw_arc(gc, x1, y1, wid, wid, arc->StartAngle, -180 * SGN(arc->Delta)); - pcb_render->draw_arc(gc, x2, y2, wid, wid, arc->StartAngle + arc->Delta, 180 * SGN(arc->Delta)); + rnd_render->draw_arc(gc, arc->X, arc->Y, arc->Width + wid, arc->Height + wid, arc->StartAngle, arc->Delta); + if (wid > rnd_pixel_slop) { + rnd_render->draw_arc(gc, arc->X, arc->Y, arc->Width - wid, arc->Height - wid, arc->StartAngle, arc->Delta); + rnd_render->draw_arc(gc, x1, y1, wid, wid, arc->StartAngle, -180 * SGN(arc->Delta)); + rnd_render->draw_arc(gc, x2, y2, wid, wid, arc->StartAngle + arc->Delta, 180 * SGN(arc->Delta)); } } @@ -73,35 +73,35 @@ y1 -= dy * h; y2 += dy * h; } - if ((coord_abs(ox) >= pcb_pixel_slop) || (coord_abs(oy) >= pcb_pixel_slop)) { - pcb_render->draw_line(gc, x1 + ox, y1 + oy, x2 + ox, y2 + oy); - pcb_render->draw_line(gc, x1 - ox, y1 - oy, x2 - ox, y2 - oy); + if ((coord_abs(ox) >= rnd_pixel_slop) || (coord_abs(oy) >= rnd_pixel_slop)) { + rnd_render->draw_line(gc, x1 + ox, y1 + oy, x2 + ox, y2 + oy); + rnd_render->draw_line(gc, x1 - ox, y1 - oy, x2 - ox, y2 - oy); /* draw caps */ if (!square) { rnd_angle_t angle = atan2(dx, dy) * 57.295779; - pcb_render->draw_arc(gc, x1, y1, thick / 2, thick / 2, angle - 180, 180); - pcb_render->draw_arc(gc, x2, y2, thick / 2, thick / 2, angle, 180); + rnd_render->draw_arc(gc, x1, y1, thick / 2, thick / 2, angle - 180, 180); + rnd_render->draw_arc(gc, x2, y2, thick / 2, thick / 2, angle, 180); } else { - pcb_render->draw_line(gc, x1 + ox, y1 + oy, x1 - ox, y1 - oy); - pcb_render->draw_line(gc, x2 + ox, y2 + oy, x2 - ox, y2 - oy); + rnd_render->draw_line(gc, x1 + ox, y1 + oy, x1 - ox, y1 - oy); + rnd_render->draw_line(gc, x2 + ox, y2 + oy, x2 - ox, y2 - oy); } } else - pcb_render->draw_line(gc, x1, y1, x2, y2); + rnd_render->draw_line(gc, x1, y1, x2, y2); } else { if (square) { /* square cap 0 long line does not have an angle -> always draw it axis aligned */ rnd_coord_t cx1 = x1 - thick/2, cx2 = x1 + thick/2, cy1 = y1 - thick/2, cy2 = y1 + thick/2; - pcb_render->draw_line(gc, cx1, cy1, cx2, cy1); - pcb_render->draw_line(gc, cx2, cy1, cx2, cy2); - pcb_render->draw_line(gc, cx2, cy2, cx1, cy2); - pcb_render->draw_line(gc, cx1, cy2, cx1, cy1); + rnd_render->draw_line(gc, cx1, cy1, cx2, cy1); + rnd_render->draw_line(gc, cx2, cy1, cx2, cy2); + rnd_render->draw_line(gc, cx2, cy2, cx1, cy2); + rnd_render->draw_line(gc, cx1, cy2, cx1, cy1); } else - pcb_render->draw_arc(gc, x1, y1, thick/2, thick/2, 0, 360); + rnd_render->draw_arc(gc, x1, y1, thick/2, thick/2, 0, 360); } } Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 30979) +++ trunk/src/extobj_helper.h (revision 30980) @@ -135,12 +135,12 @@ if (pcb_subc_get_origin(subc, &x, &y) != 0) return; - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.extobj); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.extobj); pcb_hid_set_line_width(pcb_draw_out.fgGC, -2); - pcb_render->draw_line(pcb_draw_out.fgGC, x, y, x, y + unit); - pcb_render->draw_line(pcb_draw_out.fgGC, x, y, x + unit/2, y); - pcb_render->draw_line(pcb_draw_out.fgGC, x, y + unit, x + unit/2, y + unit); - pcb_render->draw_line(pcb_draw_out.fgGC, x, y + unit/2, x + unit/3, y + unit/2); + rnd_render->draw_line(pcb_draw_out.fgGC, x, y, x, y + unit); + rnd_render->draw_line(pcb_draw_out.fgGC, x, y, x + unit/2, y); + rnd_render->draw_line(pcb_draw_out.fgGC, x, y + unit, x + unit/2, y + unit); + rnd_render->draw_line(pcb_draw_out.fgGC, x, y + unit/2, x + unit/3, y + unit/2); } /*** dialog box build ***/ @@ -159,7 +159,7 @@ pcb_uchg_attr(pcb, (pcb_any_obj_t *)subc, (char *)attr->user_data, newval); rnd_trace("chg: %s\n", (char *)attr->user_data); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } RND_INLINE void pcb_exto_dlg_coord_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30979) +++ trunk/src/file_act.c (revision 30980) @@ -154,15 +154,15 @@ */ if (PCB->Changed && conf_core.editor.save_in_tmp) pcb_save_in_tmp(); - if (pcb_gui->set_hidlib != NULL) - pcb_gui->set_hidlib(pcb_gui, NULL); + if (rnd_gui->set_hidlib != NULL) + rnd_gui->set_hidlib(rnd_gui, NULL); pcb_draw_inhibit_inc(); pcb_board_remove(PCB); PCB = pcb_board_new(1); pcb_board_new_postproc(PCB, 1); - if (pcb_gui->set_hidlib != NULL) - pcb_gui->set_hidlib(pcb_gui, &PCB->hidlib); + if (rnd_gui->set_hidlib != NULL) + rnd_gui->set_hidlib(rnd_gui, &PCB->hidlib); pcb_draw_inhibit_dec(); pcb_set_design_dir(NULL); @@ -334,7 +334,7 @@ printf("RES2: '%s' '%s'\n", *name_out, *fmt_out); } else { /* fallback to simpler fileselect */ - char *name = pcb_gui->fileselect(pcb_gui, title, descr, *default_file, "", NULL, history_tag, flags, NULL); + char *name = rnd_gui->fileselect(rnd_gui, title, descr, *default_file, "", NULL, history_tag, flags, NULL); *name_out = name; if (name == NULL) @@ -501,8 +501,8 @@ for(n = 1; n < argc; n++) RND_PCB_ACT_CONVARG(n, FGW_STR, Export, args[n-1] = argv[n].val.str); - pcb_exporter = pcb_hid_find_exporter(args[0]); - if (pcb_exporter == NULL) { + rnd_exporter = pcb_hid_find_exporter(args[0]); + if (rnd_exporter == NULL) { rnd_message(RND_MSG_ERROR, "Export plugin %s not found. Was it enabled in ./configure?\n", args[0]); return 1; } @@ -514,11 +514,11 @@ rnd_event(RND_ACT_HIDLIB, RND_EVENT_EXPORT_SESSION_BEGIN, NULL); a = args; a++; - pcb_exporter->parse_arguments(pcb_exporter, &argc, &a); - pcb_exporter->do_export(pcb_exporter, NULL); + rnd_exporter->parse_arguments(rnd_exporter, &argc, &a); + rnd_exporter->do_export(rnd_exporter, NULL); rnd_event(RND_ACT_HIDLIB, RND_EVENT_EXPORT_SESSION_END, NULL); - pcb_exporter = NULL; + rnd_exporter = NULL; RND_ACT_IRES(0); return 0; } Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 30979) +++ trunk/src/find.c (revision 30980) @@ -366,9 +366,9 @@ pcb_any_obj_t *obj; int type; - type = pcb_search_obj_by_location(PCB_LOOKUP_FIRST, &ptr1, &ptr2, &ptr3, x, y, PCB_SLOP * pcb_pixel_slop); + type = pcb_search_obj_by_location(PCB_LOOKUP_FIRST, &ptr1, &ptr2, &ptr3, x, y, PCB_SLOP * rnd_pixel_slop); if (type == PCB_OBJ_VOID) - type = pcb_search_obj_by_location(PCB_LOOKUP_MORE, &ptr1, &ptr2, &ptr3, x, y, PCB_SLOP * pcb_pixel_slop); + type = pcb_search_obj_by_location(PCB_LOOKUP_MORE, &ptr1, &ptr2, &ptr3, x, y, PCB_SLOP * rnd_pixel_slop); if (type == PCB_OBJ_VOID) return -1; Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 30979) +++ trunk/src/font_act.c (revision 30980) @@ -76,7 +76,7 @@ {"all", NULL, flt_any}, {NULL, NULL,NULL} }; - fname = pcb_gui->fileselect(pcb_gui, + fname = rnd_gui->fileselect(rnd_gui, "Load PCB font file...", "Picks a PCB font file to load.\n", default_file, ".font", flt, "pcbfont", RND_HID_FSD_READ, NULL); if (fname == NULL) @@ -148,7 +148,7 @@ } if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Save PCB font file...", + fname = rnd_gui->fileselect(rnd_gui, "Save PCB font file...", "Picks a PCB font file to save.\n", default_file, ".font", NULL, "pcbfont", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (fname == NULL) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30979) +++ trunk/src/gui_act.c (revision 30980) @@ -116,7 +116,7 @@ else rnd_conf_set(RND_CFR_DESIGN, "editor/subc_id", -1, "", RND_POL_OVERWRITE); - pcb_gui->invalidate_all(pcb_gui); /* doesn't change too often, isn't worth anything more complicated */ + rnd_gui->invalidate_all(rnd_gui); /* doesn't change too often, isn't worth anything more complicated */ pcb_draw(); return 0; } @@ -127,7 +127,7 @@ else rnd_conf_set(RND_CFR_DESIGN, "editor/term_id", -1, "", RND_POL_OVERWRITE); - pcb_gui->invalidate_all(pcb_gui); /* doesn't change too often, isn't worth anything more complicated */ + rnd_gui->invalidate_all(rnd_gui); /* doesn't change too often, isn't worth anything more complicated */ pcb_draw(); return 0; } @@ -386,7 +386,7 @@ static const char pcb_acts_CycleDrag[] = "CycleDrag()\n"; static const char pcb_acth_CycleDrag[] = "Cycle through which object is being dragged"; /* DOC: cycledrag.html */ -#define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (PCB_SLOP * pcb_pixel_slop)) : ((a)-(b) > -(PCB_SLOP * pcb_pixel_slop))) +#define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (PCB_SLOP * rnd_pixel_slop)) : ((a)-(b) > -(PCB_SLOP * rnd_pixel_slop))) static fgw_error_t pcb_act_CycleDrag(fgw_arg_t *res, int argc, fgw_arg_t *argv) { rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; @@ -967,8 +967,8 @@ pcb_layergrp_inhibit_dec(); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); - if ((pcb_gui != NULL) && (pcb_exporter == NULL)) - pcb_gui->invalidate_all(pcb_gui); + if ((rnd_gui != NULL) && (rnd_exporter == NULL)) + rnd_gui->invalidate_all(rnd_gui); return 0; } @@ -1023,8 +1023,8 @@ pcb_layergrp_inhibit_dec(); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); - if ((pcb_gui != NULL) && (pcb_exporter == NULL)) - pcb_gui->invalidate_all(pcb_gui); + if ((rnd_gui != NULL) && (rnd_exporter == NULL)) + rnd_gui->invalidate_all(rnd_gui); return 0; } @@ -1068,7 +1068,7 @@ PCB->RatDraw = 0; pcb_layervis_change_group_vis(RND_ACT_HIDLIB, atoi(name)-1, 1, 1); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } @@ -1149,7 +1149,7 @@ else RND_ACT_FAIL(toggleview); pcb_layer_vis_change_all(PCB, open, vis); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } @@ -1161,12 +1161,12 @@ } else if ((rnd_strcasecmp(name, "padstacks") == 0) || (rnd_strcasecmp(name, "vias") == 0) || (rnd_strcasecmp(name, "pins") == 0) || (rnd_strcasecmp(name, "pads") == 0)) { PCB->pstk_on = !PCB->pstk_on; - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else if (rnd_strcasecmp(name, "BackSide") == 0) { PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn; - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else if (strncmp(name, "ui:", 3) == 0) { @@ -1177,7 +1177,7 @@ return 0; } ly->meta.real.vis = !ly->meta.real.vis; - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else { @@ -1185,7 +1185,7 @@ int id = strtol(name, &end, 10) - 1; if (*end == '\0') { /* integer layer */ pcb_layervis_change_group_vis(RND_ACT_HIDLIB, id, -1, 0); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } @@ -1194,7 +1194,7 @@ if (ml != NULL) { rnd_bool *v = (rnd_bool *)((char *)PCB + ml->vis_offs); *v = !(*v); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } @@ -1325,7 +1325,7 @@ pcb->RatDraw = 0; pcb_layervis_change_group_vis(&pcb->hidlib, lid, 1, 1); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); rnd_event(&pcb->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 30979) +++ trunk/src/insert.c (revision 30980) @@ -96,7 +96,7 @@ if (pcb_crosshair.AttachedObject.State == PCB_CH_STATE_FIRST) return NULL; pcb_crosshair.AttachedObject.Ptr3 = &InsertedPoint; - if (pcb_gui->shift_is_pressed(pcb_gui)) { + if (rnd_gui->shift_is_pressed(rnd_gui)) { pcb_attached_line_t myline; /* only force 45 degree for nearest point */ if (rnd_distance(pcb_crosshair.X, pcb_crosshair.Y, line->Point1.X, line->Point1.Y) < Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 30979) +++ trunk/src/layer.c (revision 30980) @@ -1451,7 +1451,7 @@ assert((vid >= 0) && (vid < PCB_VLY_end)); /* if there's no renderer, that means no draw should be done */ - if (pcb_render == NULL) + if (rnd_render == NULL) return 0; if (xform != NULL) @@ -1458,11 +1458,11 @@ *xform = NULL; TODO("layer: need to pass the flags of the group, not the flags of the layer once we have a group for each layer") - if (pcb_render->set_layer_group != NULL) { + if (rnd_render->set_layer_group != NULL) { rnd_layergrp_id_t grp; rnd_layer_id_t lid = v->new_id; grp = pcb_layer_get_group(pcb, lid); - return pcb_render->set_layer_group(pcb_render, grp, v->purpose, v->purpi, lid, v->type, is_empty, xform); + return rnd_render->set_layer_group(rnd_render, grp, v->purpose, v->purpi, lid, v->type, is_empty, xform); } /* if the GUI doesn't have a set_layer, assume it wants to draw all layers */ @@ -1472,14 +1472,14 @@ int pcb_layer_gui_set_g_ui(pcb_layer_t *first, int is_empty, rnd_xform_t **xform) { /* if there's no renderer, that means no draw should be done */ - if (pcb_render == NULL) + if (rnd_render == NULL) return 0; if (xform != NULL) *xform = NULL; - if (pcb_render->set_layer_group != NULL) - return pcb_render->set_layer_group(pcb_render, -1, NULL, -1, pcb_layer_id(first->parent.data, first), PCB_LYT_VIRTUAL | PCB_LYT_UI, is_empty, xform); + if (rnd_render->set_layer_group != NULL) + return rnd_render->set_layer_group(rnd_render, -1, NULL, -1, pcb_layer_id(first->parent.data, first), PCB_LYT_VIRTUAL | PCB_LYT_UI, is_empty, xform); /* if the GUI doesn't have a set_layer, assume it wants to draw all layers */ return 1; @@ -1488,7 +1488,7 @@ void pcb_layer_edit_attrib(pcb_layer_t *layer) { char *buf = pcb_strdup_printf("Layer %s Attributes", layer->name); - pcb_gui->edit_attributes(pcb_gui, buf, &(layer->Attributes)); + rnd_gui->edit_attributes(rnd_gui, buf, &(layer->Attributes)); free(buf); } Index: trunk/src/layer_grp.c =================================================================== --- trunk/src/layer_grp.c (revision 30979) +++ trunk/src/layer_grp.c (revision 30980) @@ -48,8 +48,8 @@ pcb->LayerGroups.cache.copper_valid = 0; \ if (!inhibit_notify) { \ rnd_event(&pcb->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); \ - if ((pcb_gui != NULL) && (pcb_exporter == NULL)) \ - pcb_gui->invalidate_all(pcb_gui); \ + if ((rnd_gui != NULL) && (rnd_exporter == NULL)) \ + rnd_gui->invalidate_all(rnd_gui); \ pcb_board_set_changed_flag(pcb_true); \ } \ } while(0) @@ -870,14 +870,14 @@ int pcb_layer_gui_set_layer(rnd_layergrp_id_t gid, const pcb_layergrp_t *grp, int is_empty, rnd_xform_t **xform) { /* if there's no GUI, that means no draw should be done */ - if (pcb_gui == NULL) + if (rnd_gui == NULL) return 0; if (xform != NULL) *xform = NULL; - if (pcb_render->set_layer_group != NULL) - return pcb_render->set_layer_group(pcb_gui, gid, grp->purpose, grp->purpi, grp->lid[0], grp->ltype, is_empty, xform); + if (rnd_render->set_layer_group != NULL) + return rnd_render->set_layer_group(rnd_gui, gid, grp->purpose, grp->purpi, grp->lid[0], grp->ltype, is_empty, xform); /* if the GUI doesn't have a set_layer, assume it wants to draw all layers */ return 1; Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 30979) +++ trunk/src/librnd/core/actions.c (revision 30980) @@ -43,7 +43,7 @@ #include #include -const rnd_action_t *pcb_current_action = NULL; +const rnd_action_t *rnd_current_action = NULL; const char *RND_PTR_DOMAIN_IDPATH = "pcb_fgw_ptr_domain_idpath"; const char *RND_PTR_DOMAIN_IDPATH_LIST = "pcb_fgw_ptr_domain_idpath_list"; @@ -296,10 +296,10 @@ if (ca != NULL) { /* pcb-rnd action with a lot of metadata */ - old_action = pcb_current_action; - pcb_current_action = ca->action; - ret = pcb_current_action->trigger_cb(res, argc, argv); - pcb_current_action = old_action; + old_action = rnd_current_action; + rnd_current_action = ca->action; + ret = rnd_current_action->trigger_cb(res, argc, argv); + rnd_current_action = old_action; } else { /* direct call, no metadata */ @@ -367,13 +367,13 @@ void rnd_hid_get_coords(const char *msg, rnd_coord_t *x, rnd_coord_t *y, int force) { - if (pcb_gui == NULL) { + if (rnd_gui == NULL) { fprintf(stderr, "pcb_hid_get_coords: can not get coordinates (no gui) for '%s'\n", msg); *x = 0; *y = 0; } else - pcb_gui->get_coords(pcb_gui, msg, x, y, force); + rnd_gui->get_coords(rnd_gui, msg, x, y, force); } static int hid_parse_actionstring(rnd_hidlib_t *hl, const char *rstr, char require_parens) Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 30979) +++ trunk/src/librnd/core/error.c (revision 30980) @@ -57,7 +57,7 @@ gds_t tmp; rnd_logline_t *line; - if ((pcb_gui == NULL) || (pcbhl_conf.rc.dup_log_to_stderr)) { + if ((rnd_gui == NULL) || (pcbhl_conf.rc.dup_log_to_stderr)) { if (pcbhl_conf.rc.quiet) min_level = RND_MSG_ERROR; @@ -226,7 +226,7 @@ memset(&fmtsub, 0, sizeof(fmtsub)); PCB_DAD_ENUM(fmtsub.dlg, fmts); wfmt = PCB_DAD_CURRENT(fmtsub.dlg); - fn = pcb_gui->fileselect(pcb_gui, "Export log", NULL, "log.txt", NULL, NULL, "log", RND_HID_FSD_MAY_NOT_EXIST, &fmtsub); + fn = rnd_gui->fileselect(rnd_gui, "Export log", NULL, "log.txt", NULL, NULL, "log", RND_HID_FSD_MAY_NOT_EXIST, &fmtsub); if (fn != NULL) { ret = rnd_log_export(NULL, fn, (fmtsub.dlg[wfmt].val.lng == 1)); if (ret != 0) Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30979) +++ trunk/src/librnd/core/gui_act.c (revision 30980) @@ -49,7 +49,7 @@ static const char pcb_acth_CreateMenu[] = "Creates a new menu, popup (only path specified) or submenu (at least path and action are specified)"; static fgw_error_t pcb_act_CreateMenu(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - if (pcb_gui == NULL) { + if (rnd_gui == NULL) { rnd_message(RND_MSG_ERROR, "Error: can't create menu, there's no GUI hid loaded\n"); RND_ACT_IRES(-1); return 0; @@ -68,7 +68,7 @@ props.tip = (argc > 3) ? argv[3].val.str : NULL; props.cookie = (argc > 4) ? argv[4].val.str : NULL; - pcb_gui->create_menu(pcb_gui, argv[1].val.str, &props); + rnd_gui->create_menu(rnd_gui, argv[1].val.str, &props); RND_ACT_IRES(0); return 0; @@ -83,13 +83,13 @@ static const char pcb_acth_RemoveMenu[] = "Recursively removes a new menu, popup (only path specified) or submenu. "; static fgw_error_t pcb_act_RemoveMenu(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - if (pcb_gui == NULL) { + if (rnd_gui == NULL) { rnd_message(RND_MSG_ERROR, "can't remove menu, there's no GUI hid loaded\n"); RND_ACT_IRES(-1); return 0; } - if (pcb_gui->remove_menu == NULL) { + if (rnd_gui->remove_menu == NULL) { rnd_message(RND_MSG_ERROR, "can't remove menu, the GUI doesn't support it\n"); RND_ACT_IRES(-1); return 0; @@ -96,7 +96,7 @@ } RND_PCB_ACT_CONVARG(1, FGW_STR, RemoveMenu, ;); - if (pcb_gui->remove_menu(pcb_gui, argv[1].val.str) != 0) { + if (rnd_gui->remove_menu(rnd_gui, argv[1].val.str) != 0) { rnd_message(RND_MSG_ERROR, "failed to remove some of the menu items\n"); RND_ACT_IRES(-1); } @@ -157,7 +157,7 @@ extra_units_y[0].scale = RND_ACT_HIDLIB->grid; extra_units_y[2].scale = RND_ACT_HIDLIB->size_y; - pcb_gui->view_get(pcb_gui, &vbx); + rnd_gui->view_get(rnd_gui, &vbx); view_width = vbx.X2 - vbx.X1; view_height = vbx.Y2 - vbx.Y1; @@ -191,9 +191,9 @@ } if (rnd_strcasecmp(a3, "view") == 0) { - if ((pcb_gui != NULL) && (pcb_gui->view_get != NULL)) { + if ((rnd_gui != NULL) && (rnd_gui->view_get != NULL)) { rnd_rnd_box_t viewbox; - pcb_gui->view_get(pcb_gui, &viewbox); + rnd_gui->view_get(rnd_gui, &viewbox); if (pcbhl_conf.editor.view.flip_x) dx = viewbox.X2 - dx; else @@ -220,7 +220,7 @@ } pcb_hidcore_crosshair_move_to(hidlib, dx, dy, 1); - pcb_gui->set_crosshair(pcb_gui, hidlib->ch_x, hidlib->ch_y, pan_warp); + rnd_gui->set_crosshair(rnd_gui, hidlib->ch_x, hidlib->ch_y, pan_warp); RND_ACT_IRES(0); return 0; @@ -237,7 +237,7 @@ RND_PCB_ACT_CONVARG(2, FGW_COORD, Cursor, y = fgw_coord(&argv[2])); pcb_hidcore_crosshair_move_to(RND_ACT_HIDLIB, x, y, 0); - pcb_gui->set_crosshair(pcb_gui, hidlib->ch_x, hidlib->ch_y, HID_SC_PAN_VIEWPORT); + rnd_gui->set_crosshair(rnd_gui, hidlib->ch_x, hidlib->ch_y, HID_SC_PAN_VIEWPORT); RND_ACT_IRES(0); return 0; @@ -317,8 +317,8 @@ { double fps = 0; - if ((pcb_gui != NULL) && (pcb_gui->benchmark != NULL)) { - fps = pcb_gui->benchmark(pcb_gui); + if ((rnd_gui != NULL) && (rnd_gui->benchmark != NULL)) { + fps = rnd_gui->benchmark(rnd_gui); rnd_message(RND_MSG_INFO, "%f redraws per second\n", fps); } else @@ -341,7 +341,7 @@ static const char pcb_acth_Redraw[] = "Redraw the entire screen"; static fgw_error_t pcb_act_Redraw(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); RND_ACT_IRES(0); return 0; } Index: trunk/src/librnd/core/hid.c =================================================================== --- trunk/src/librnd/core/hid.c (revision 30979) +++ trunk/src/librnd/core/hid.c (revision 30980) @@ -33,7 +33,7 @@ void pcb_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete) { - if (pcb_gui->notify_crosshair_change) - pcb_gui->notify_crosshair_change(pcb_gui, changes_complete); + if (rnd_gui->notify_crosshair_change) + rnd_gui->notify_crosshair_change(rnd_gui, changes_complete); rnd_event(hl, RND_EVENT_CROSSHAIR_MOVE, "i", (int)changes_complete, NULL); } Index: trunk/src/librnd/core/hid.h =================================================================== --- trunk/src/librnd/core/hid.h (revision 30979) +++ trunk/src/librnd/core/hid.h (revision 30980) @@ -559,38 +559,38 @@ rnd_hidlib_t *(*get_dad_hidlib)(void *hid_ctx); }; -typedef void (*pcb_hid_expose_cb_t)(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e); +typedef void (*rnd_hid_expose_cb_t)(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e); struct rnd_hid_expose_ctx_s { rnd_rnd_box_t view; - pcb_hid_expose_cb_t expose_cb; /* function that is called on expose to get things drawn */ + rnd_hid_expose_cb_t expose_cb; /* function that is called on expose to get things drawn */ void *draw_data; /* user data for the expose function */ }; -typedef void (*pcb_hid_expose_t)(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *ctx); +typedef void (*rnd_hid_expose_t)(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *ctx); /* This is initially set to a "no-gui" GUI, and later reset by main. It is used for on-screen GUI calls, such as dialog boxes */ -extern rnd_hid_t *pcb_gui; +extern rnd_hid_t *rnd_gui; /* This is initially set to a "no-gui" GUI, and later reset by main. hid_expose_callback also temporarily set it for drawing. Normally - matches pcb_gui, but is temporarily changed while exporting. It is used + matches rnd_gui, but is temporarily changed while exporting. It is used for drawing calls, mainly by draw*.c */ -extern rnd_hid_t *pcb_render; +extern rnd_hid_t *rnd_render; /* This is either NULL or points to the current HID that is being called to do the exporting. The GUI HIDs set and unset this var.*/ -extern rnd_hid_t *pcb_exporter; +extern rnd_hid_t *rnd_exporter; /* This is either NULL or points to the current rnd_action_t that is being called. The action launcher sets and unsets this variable. */ -extern const rnd_action_t *pcb_current_action; +extern const rnd_action_t *rnd_current_action; /* The GUI may set this to be approximately the PCB size of a pixel, to allow for near-misses in selection and changes in drawing items smaller than a screen pixel. */ -extern int pcb_pixel_slop; +extern int rnd_pixel_slop; /*** Glue for GUI/CLI dialogs: wrappers around actions */ @@ -614,19 +614,19 @@ /* non-zero if DAD dialogs are available currently */ #define PCB_HAVE_GUI_ATTR_DLG \ - ((pcb_gui != NULL) && (pcb_gui->gui) && (pcb_gui->attr_dlg_new != NULL) && (pcb_gui->attr_dlg_new != pcb_nogui_attr_dlg_new)) + ((rnd_gui != NULL) && (rnd_gui->gui) && (rnd_gui->attr_dlg_new != NULL) && (rnd_gui->attr_dlg_new != pcb_nogui_attr_dlg_new)) void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id); void pcb_hid_dock_leave(rnd_hid_dad_subdialog_t *sub); -#define pcb_hid_redraw(pcb) pcb_gui->invalidate_all(pcb_gui) +#define pcb_hid_redraw(pcb) rnd_gui->invalidate_all(rnd_gui) #define pcb_hid_busy(pcb, is_busy) \ do { \ rnd_event(&pcb->hidlib, RND_EVENT_BUSY, "i", is_busy, NULL); \ - if ((pcb_gui != NULL) && (pcb_gui->busy != NULL)) \ - pcb_gui->busy(pcb_gui, is_busy); \ + if ((rnd_gui != NULL) && (rnd_gui->busy != NULL)) \ + rnd_gui->busy(rnd_gui, is_busy); \ } while(0) Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 30979) +++ trunk/src/librnd/core/hid_cfg.c (revision 30980) @@ -402,7 +402,7 @@ { vtp0_t anchors; - if ((pcb_gui == NULL) || (pcb_gui->hid_cfg == NULL) || (pcb_gui->hid_cfg->doc == NULL) || (pcb_gui->hid_cfg->doc->root == NULL)) + if ((rnd_gui == NULL) || (rnd_gui->hid_cfg == NULL) || (rnd_gui->hid_cfg->doc == NULL) || (rnd_gui->hid_cfg->doc->root == NULL)) return; /* extract anchors; don't do the callbacks from there because the tree @@ -409,7 +409,7 @@ is going to be changed from the callbacks. It is however guaranteed that anchors are not removed. */ vtp0_init(&anchors); - map_anchor_menus(&anchors, pcb_gui->hid_cfg->doc->root, name); + map_anchor_menus(&anchors, rnd_gui->hid_cfg->doc->root, name); /* iterate over all anchors extracted and call the callback */ { @@ -436,7 +436,7 @@ } memcpy(path+used, name, l0+1); /* rnd_trace("path='%s' used=%d\n", path, used);*/ - cb(ctx, pcb_gui->hid_cfg, node, path); + cb(ctx, rnd_gui->hid_cfg, node, path); used = 0; } free(path); @@ -464,7 +464,7 @@ break; nxt = node->next; - pcb_gui->remove_menu_node(pcb_gui, node); + rnd_gui->remove_menu_node(rnd_gui, node); } return 0; } Index: trunk/src/librnd/core/hid_dad.c =================================================================== --- trunk/src/librnd/core/hid_dad.c (revision 30979) +++ trunk/src/librnd/core/hid_dad.c (revision 30980) @@ -69,7 +69,7 @@ { retovr->valid = 1; retovr->value = retval; - pcb_gui->attr_dlg_close(hid_ctx); + rnd_gui->attr_dlg_close(hid_ctx); } void pcb_hid_dad_close_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -84,7 +84,7 @@ retovr->valid = 0; retovr->dont_free++; - ret = pcb_gui->attr_dlg_run(hid_ctx); + ret = rnd_gui->attr_dlg_run(hid_ctx); if (retovr->valid) ret = retovr->value; retovr->dont_free--; @@ -122,15 +122,15 @@ int rv; void *hid_ctx; - if ((pcb_gui == NULL) || (pcb_gui->attr_dlg_new == NULL)) + if ((rnd_gui == NULL) || (rnd_gui->attr_dlg_new == NULL)) return -1; - hid_ctx = pcb_gui->attr_dlg_new(pcb_gui, id, attrs, n_attrs, title, caller_data, pcb_true, NULL, defx, defy, minx, miny); + hid_ctx = rnd_gui->attr_dlg_new(rnd_gui, id, attrs, n_attrs, title, caller_data, pcb_true, NULL, defx, defy, minx, miny); if (hid_ctx_out != NULL) *hid_ctx_out = hid_ctx; - rv = pcb_gui->attr_dlg_run(hid_ctx); + rv = rnd_gui->attr_dlg_run(hid_ctx); if ((retovr == NULL) || (*retovr != 0)) - pcb_gui->attr_dlg_close(hid_ctx); + rnd_gui->attr_dlg_close(hid_ctx); return rv ? 0 : 1; } @@ -142,15 +142,15 @@ int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id) { - if ((pcb_gui == NULL) || (pcb_gui->dock_enter == NULL)) + if ((rnd_gui == NULL) || (rnd_gui->dock_enter == NULL)) return -1; - return pcb_gui->dock_enter(pcb_gui, sub, where, id); + return rnd_gui->dock_enter(rnd_gui, sub, where, id); } void pcb_hid_dock_leave(rnd_hid_dad_subdialog_t *sub) { - if ((pcb_gui == NULL) || (pcb_gui->dock_leave == NULL)) + if ((rnd_gui == NULL) || (rnd_gui->dock_leave == NULL)) return; - pcb_gui->dock_leave(pcb_gui, sub); + rnd_gui->dock_leave(rnd_gui, sub); } Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 30979) +++ trunk/src/librnd/core/hid_dad.h (revision 30980) @@ -174,7 +174,7 @@ do { \ int __n__; \ if ((table ## _hid_ctx != NULL) && (table ## _ret_override != NULL)) \ - pcb_gui->attr_dlg_free(table ## _hid_ctx); \ + rnd_gui->attr_dlg_free(table ## _hid_ctx); \ for(__n__ = 0; __n__ < table ## _len; __n__++) { \ PCB_DAD_FREE_FIELD(table, __n__); \ } \ @@ -194,7 +194,7 @@ do { \ table ## _ret_override = calloc(sizeof(pcb_dad_retovr_t), 1); \ table ## _append_lock = 1; \ - table ## _hid_ctx = pcb_gui->attr_dlg_new(pcb_gui, id, table, table ## _len, title, caller_data, modal, ev_cb, table ## _defx, table ## _defy, table ## _minx, table ## _miny); \ + table ## _hid_ctx = rnd_gui->attr_dlg_new(rnd_gui, id, table, table ## _len, title, caller_data, modal, ev_cb, table ## _defx, table ## _defy, table ## _minx, table ## _miny); \ } while(0) /* Sets the default window size (that is only a hint) - NOTE: must be called @@ -526,7 +526,7 @@ rnd_hid_attr_val_t __val__; \ memset(&__val__, 0, sizeof(__val__)); \ __val__.field = val_; \ - pcb_gui->attr_dlg_set_value(hid_ctx, wid, &__val__); \ + rnd_gui->attr_dlg_set_value(hid_ctx, wid, &__val__); \ } while(0) /*** DAD internals (do not use directly) ***/ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 30979) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 30980) @@ -103,9 +103,9 @@ static void spin_warn(void *hid_ctx, pcb_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, const char *msg) { - pcb_gui->attr_dlg_widget_hide(hid_ctx, spin->wwarn, (msg == NULL)); - if (pcb_gui->attr_dlg_set_help != NULL) - pcb_gui->attr_dlg_set_help(hid_ctx, spin->wwarn, msg); + rnd_gui->attr_dlg_widget_hide(hid_ctx, spin->wwarn, (msg == NULL)); + if (rnd_gui->attr_dlg_set_help != NULL) + rnd_gui->attr_dlg_set_help(hid_ctx, spin->wwarn, msg); } static char *gen_str_coord(pcb_hid_dad_spin_t *spin, rnd_coord_t c, char *buf, int buflen) @@ -149,16 +149,16 @@ /* global ticked in: also set the unit by force */ unum = pcbhl_conf.editor.grid_unit - pcb_units; hv.lng = unum; - pcb_gui->attr_dlg_set_value(hid_ctx, su->wunit, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, su->wunit, &hv); } pcb_snprintf(su->buf, sizeof(su->buf), "%$m*", unit->suffix, su->end->val.crd); hv.str = su->buf; - pcb_gui->attr_dlg_set_value(hid_ctx, su->wout, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, su->wout, &hv); if (!is_globbing && can_glob) { /* unit changed: disable global, accept the user wants to use this unit */ hv.lng = 0; - pcb_gui->attr_dlg_set_value(hid_ctx, su->wglob, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, su->wglob, &hv); } su->valid = 1; } @@ -245,7 +245,7 @@ spin->no_unit_chg = 1; hv.str = rnd_strdup(ctx.buf); - pcb_gui->attr_dlg_set_value(spin_hid_ctx, spin->wstr, &hv); + rnd_gui->attr_dlg_set_value(spin_hid_ctx, spin->wstr, &hv); } PCB_DAD_FREE(ctx.dlg); @@ -332,7 +332,7 @@ spin_warn(hid_ctx, spin, end, warn); hv.str = rnd_strdup(buf); spin->set_writeback_lock++; - pcb_gui->attr_dlg_set_value(hid_ctx, spin->wstr, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, spin->wstr, &hv); spin->set_writeback_lock--; } @@ -445,7 +445,7 @@ changed = 1; hv.str = tmp; spin->set_writeback_lock++; - pcb_gui->attr_dlg_set_value(hid_ctx, spin->wstr, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, spin->wstr, &hv); spin->set_writeback_lock--; succ = pcb_get_value_unit(str->val.str, &absolute, 0, &d, &unit); if (succ) { @@ -534,13 +534,13 @@ int pcb_dad_spin_widget_state(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled) { pcb_hid_dad_spin_t *spin = end->wdata; - return pcb_gui->attr_dlg_widget_state(hid_ctx, spin->wall, enabled); + return rnd_gui->attr_dlg_widget_state(hid_ctx, spin->wall, enabled); } int pcb_dad_spin_widget_hide(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool hide) { pcb_hid_dad_spin_t *spin = end->wdata; - return pcb_gui->attr_dlg_widget_hide(hid_ctx, spin->wall, hide); + return rnd_gui->attr_dlg_widget_hide(hid_ctx, spin->wall, hide); } int pcb_dad_spin_set_value(rnd_hid_attribute_t *end, void *hid_ctx, int idx, const rnd_hid_attr_val_t *val) @@ -579,8 +579,8 @@ if ((spin->hid_ctx == NULL) || (*spin->hid_ctx == NULL)) /* while building */ str->help_text = help; - else if (pcb_gui->attr_dlg_set_help != NULL) /* when the dialog is already running */ - pcb_gui->attr_dlg_set_help(*spin->hid_ctx, spin->wstr, help); + else if (rnd_gui->attr_dlg_set_help != NULL) /* when the dialog is already running */ + rnd_gui->attr_dlg_set_help(*spin->hid_ctx, spin->wstr, help); } void pcb_dad_spin_update_global_coords(void) Index: trunk/src/librnd/core/hid_dad_unit.c =================================================================== --- trunk/src/librnd/core/hid_dad_unit.c (revision 30979) +++ trunk/src/librnd/core/hid_dad_unit.c (revision 30980) @@ -81,19 +81,19 @@ int pcb_dad_unit_widget_state(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled) { pcb_hid_dad_unit_t *unit = end->wdata; - return pcb_gui->attr_dlg_widget_state(hid_ctx, unit->wenum, enabled); + return rnd_gui->attr_dlg_widget_state(hid_ctx, unit->wenum, enabled); } int pcb_dad_unit_widget_hide(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool hide) { pcb_hid_dad_unit_t *unit = end->wdata; - return pcb_gui->attr_dlg_widget_hide(hid_ctx, unit->wenum, hide); + return rnd_gui->attr_dlg_widget_hide(hid_ctx, unit->wenum, hide); } int pcb_dad_unit_set_value(rnd_hid_attribute_t *end, void *hid_ctx, int idx, const rnd_hid_attr_val_t *val) { pcb_hid_dad_unit_t *unit = end->wdata; - if (pcb_gui->attr_dlg_set_value(hid_ctx, unit->wenum, val) != 0) + if (rnd_gui->attr_dlg_set_value(hid_ctx, unit->wenum, val) != 0) return -1; end->val.lng = val->lng; return 0; @@ -106,8 +106,8 @@ if ((unit->hid_ctx == NULL) || (*unit->hid_ctx == NULL)) /* while building */ enu->help_text = help; - else if (pcb_gui->attr_dlg_set_help != NULL) /* when the dialog is already running */ - pcb_gui->attr_dlg_set_help(*unit->hid_ctx, unit->wenum, help); + else if (rnd_gui->attr_dlg_set_help != NULL) /* when the dialog is already running */ + rnd_gui->attr_dlg_set_help(*unit->hid_ctx, unit->wenum, help); } const char **pcb_dad_unit_enum = NULL; Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 30979) +++ trunk/src/librnd/core/hid_dlg.c (revision 30980) @@ -170,12 +170,12 @@ have_timer = 0; refresh_now:; if (active) { - pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, wp, &val); + rnd_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, wp, &val); if (!have_timer) { - timer = pcb_gui->add_timer(pcb_gui, progress_refresh_cb, REFRESH_RATE, timer); + timer = rnd_gui->add_timer(rnd_gui, progress_refresh_cb, REFRESH_RATE, timer); have_timer = 1; } - pcb_hid_iterate(pcb_gui); + pcb_hid_iterate(rnd_gui); } return 0; } @@ -191,7 +191,7 @@ if (so_far == 0 && total == 0 && message == NULL) { if (active) { if (have_timer) { - pcb_gui->stop_timer(pcb_gui, timer); + rnd_gui->stop_timer(rnd_gui, timer); have_timer = 0; } if (!closing) { @@ -228,7 +228,7 @@ active = 1; cancelled = 0; - timer = pcb_gui->add_timer(pcb_gui, progress_refresh_cb, REFRESH_RATE, timer); + timer = rnd_gui->add_timer(rnd_gui, progress_refresh_cb, REFRESH_RATE, timer); have_timer = 1; closing = 0; } @@ -246,9 +246,9 @@ int pcb_hid_progress(long so_far, long total, const char *message) { - if (pcb_gui == NULL) + if (rnd_gui == NULL) return 0; - if ((pcb_gui->gui) && (PCB_HAVE_GUI_ATTR_DLG) && (hid_dlg_gui_inited || pcb_gui->allow_dad_before_init)) + if ((rnd_gui->gui) && (PCB_HAVE_GUI_ATTR_DLG) && (hid_dlg_gui_inited || rnd_gui->allow_dad_before_init)) return pcb_gui_progress(so_far, total, message); return pcb_nogui_progress(so_far, total, message); Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30979) +++ trunk/src/librnd/core/hid_init.c (revision 30980) @@ -74,11 +74,11 @@ rnd_hid_t **pcb_hid_list = 0; int pcb_hid_num_hids = 0; -rnd_hid_t *pcb_gui = NULL; -rnd_hid_t *pcb_render = NULL; -rnd_hid_t *pcb_exporter = NULL; +rnd_hid_t *rnd_gui = NULL; +rnd_hid_t *rnd_render = NULL; +rnd_hid_t *rnd_exporter = NULL; -int pcb_pixel_slop = 1; +int rnd_pixel_slop = 1; pcb_plugin_dir_t *pcb_plugin_dir_first = NULL, *pcb_plugin_dir_last = NULL; @@ -87,7 +87,7 @@ char *tmp; /* Setup a "nogui" default HID */ - pcb_render = pcb_gui = pcb_hid_nogui_get_hid(); + rnd_render = rnd_gui = pcb_hid_nogui_get_hid(); TODO("make this configurable - add to conf_board_ignores avoid plugin injection") tmp = pcb_concat(pcbhl_conf.rc.path.exec_prefix, RND_DIR_SEPARATOR_S, "lib", RND_DIR_SEPARATOR_S, "pcb-rnd", RND_DIR_SEPARATOR_S, "plugins", RND_DIR_SEPARATOR_S, HOST, NULL); @@ -411,16 +411,16 @@ for(;;) { int res; - if (pcb_gui->get_export_options != NULL) - pcb_gui->get_export_options(pcb_gui, NULL); - res = pcb_gui->parse_arguments(pcb_gui, hid_argc, hid_argv); + if (rnd_gui->get_export_options != NULL) + rnd_gui->get_export_options(rnd_gui, NULL); + res = rnd_gui->parse_arguments(rnd_gui, hid_argc, hid_argv); if (res == 0) break; /* HID accepted, don't try anything else */ if (res < 0) { - rnd_message(RND_MSG_ERROR, "Failed to initialize HID %s (unrecoverable, have to give up)\n", pcb_gui->name); + rnd_message(RND_MSG_ERROR, "Failed to initialize HID %s (unrecoverable, have to give up)\n", rnd_gui->name); return -1; } - fprintf(stderr, "Failed to initialize HID %s (recoverable)\n", pcb_gui->name); + fprintf(stderr, "Failed to initialize HID %s (recoverable)\n", rnd_gui->name); if (apg == NULL) { if (pcbhl_conf.rc.hid_fallback) { ran_out_of_hids:; @@ -439,8 +439,8 @@ apg = rnd_conf_list_next_str(apg, &g, &n); if (apg == NULL) goto ran_out_of_hids; - pcb_render = pcb_gui = pcb_hid_find_gui(g); - } while(pcb_gui == NULL); + rnd_render = rnd_gui = pcb_hid_find_gui(g); + } while(rnd_gui == NULL); } return 0; } @@ -619,11 +619,11 @@ /* Export pcb from command line if requested. */ switch(ga->do_what) { - case DO_PRINT: pcb_render = pcb_exporter = pcb_gui = pcb_hid_find_printer(); break; - case DO_EXPORT: pcb_render = pcb_exporter = pcb_gui = pcb_hid_find_exporter(ga->hid_name); break; + case DO_PRINT: rnd_render = rnd_exporter = rnd_gui = pcb_hid_find_printer(); break; + case DO_EXPORT: rnd_render = rnd_exporter = rnd_gui = pcb_hid_find_exporter(ga->hid_name); break; case DO_GUI: - pcb_render = pcb_gui = pcb_hid_find_gui(ga->hid_name); - if (pcb_gui == NULL) { + rnd_render = rnd_gui = pcb_hid_find_gui(ga->hid_name); + if (rnd_gui == NULL) { rnd_message(RND_MSG_ERROR, "Can't find the gui (%s) requested.\n", ga->hid_name); return 1; } @@ -632,23 +632,23 @@ const char *g; rnd_conf_listitem_t *i; - pcb_render = pcb_gui = NULL; + rnd_render = rnd_gui = NULL; rnd_conf_loop_list_str(&pcbhl_conf.rc.preferred_gui, i, g, ga->autopick_gui) { - pcb_render = pcb_gui = pcb_hid_find_gui(g); - if (pcb_gui != NULL) + rnd_render = rnd_gui = pcb_hid_find_gui(g); + if (rnd_gui != NULL) break; } /* try anything */ - if (pcb_gui == NULL) { + if (rnd_gui == NULL) { rnd_message(RND_MSG_WARNING, "Warning: can't find any of the preferred GUIs, falling back to anything available...\nYou may want to check if the plugin is loaded, try --dump-plugins and --dump-plugindirs\n"); - pcb_render = pcb_gui = pcb_hid_find_gui(NULL); + rnd_render = rnd_gui = pcb_hid_find_gui(NULL); } } } /* Exit with error if GUI failed to start. */ - if (!pcb_gui) + if (!rnd_gui) return 1; return 0; @@ -687,10 +687,10 @@ if (is_empty) rnd_message(RND_MSG_WARNING, "Exporting empty board (nothing loaded or drawn).\n"); - if (pcb_gui->set_hidlib != NULL) - pcb_gui->set_hidlib(pcb_gui, hidlib); + if (rnd_gui->set_hidlib != NULL) + rnd_gui->set_hidlib(rnd_gui, hidlib); rnd_event(hidlib, RND_EVENT_EXPORT_SESSION_BEGIN, NULL); - pcb_gui->do_export(pcb_gui, 0); + rnd_gui->do_export(rnd_gui, 0); rnd_event(hidlib, RND_EVENT_EXPORT_SESSION_END, NULL); pcbhl_log_print_uninit_errs("Exporting"); return 1; @@ -698,8 +698,8 @@ void pcbhl_mainloop_interactive(pcbhl_main_args_t *ga, rnd_hidlib_t *hidlib) { - if (pcb_gui->set_hidlib != NULL) - pcb_gui->set_hidlib(pcb_gui, hidlib); - pcb_gui->do_export(pcb_gui, 0); + if (rnd_gui->set_hidlib != NULL) + rnd_gui->set_hidlib(rnd_gui, hidlib); + rnd_gui->do_export(rnd_gui, 0); } Index: trunk/src/librnd/core/hid_init.h =================================================================== --- trunk/src/librnd/core/hid_init.h (revision 30979) +++ trunk/src/librnd/core/hid_init.h (revision 30980) @@ -141,7 +141,7 @@ exit); else return 0 */ int pcbhl_main_exported(pcbhl_main_args_t *ga, rnd_hidlib_t *hidlib, rnd_bool is_empty); -/* launches the GUI or CLI; after it returns, if pcb_gui is not NULL, the user +/* launches the GUI or CLI; after it returns, if rnd_gui is not NULL, the user has selected another GUI to switch to. */ void pcbhl_mainloop_interactive(pcbhl_main_args_t *ga, rnd_hidlib_t *hidlib); @@ -150,7 +150,7 @@ /* true if main() is called for printing or exporting (no interactive HID shall be invoked) */ -#define pcbhl_main_exporting (pcb_gui->printer || pcb_gui->exporter) +#define pcbhl_main_exporting (rnd_gui->printer || rnd_gui->exporter) #ifdef __WIN32__ extern char *pcb_w32_root; /* installation prefix; what would be $PREFIX on FHS, e.g. /usr/local */ Index: trunk/src/librnd/core/hid_inlines.h =================================================================== --- trunk/src/librnd/core/hid_inlines.h (revision 30979) +++ trunk/src/librnd/core/hid_inlines.h (revision 30980) @@ -34,19 +34,19 @@ { rnd_hid_gc_t res; rnd_core_gc_t *hc; - res = pcb_render->make_gc(pcb_gui); + res = rnd_render->make_gc(rnd_gui); hc = (rnd_core_gc_t *)res; /* assumes first field is rnd_core_gc_t */ hc->width = RND_MAX_COORD; hc->cap = rnd_cap_invalid; hc->xor = 0; hc->faded = 0; - hc->hid = pcb_gui; + hc->hid = rnd_gui; return res; } RND_INLINE void pcb_hid_destroy_gc(rnd_hid_gc_t gc) { - pcb_render->destroy_gc(gc); + rnd_render->destroy_gc(gc); } RND_INLINE void pcb_hid_set_line_cap(rnd_hid_gc_t gc, rnd_cap_style_t style) @@ -54,7 +54,7 @@ rnd_core_gc_t *hc = (rnd_core_gc_t *)gc; if (hc->cap != style) { hc->cap = style; - pcb_render->set_line_cap(gc, style); + rnd_render->set_line_cap(gc, style); } } @@ -63,7 +63,7 @@ rnd_core_gc_t *hc = (rnd_core_gc_t *)gc; if (hc->width != width) { hc->width = width; - pcb_render->set_line_width(gc, width); + rnd_render->set_line_width(gc, width); } } @@ -72,7 +72,7 @@ rnd_core_gc_t *hc = (rnd_core_gc_t *)gc; if (hc->xor != xor) { hc->xor = xor; - pcb_render->set_draw_xor(gc, xor); + rnd_render->set_draw_xor(gc, xor); } } @@ -81,18 +81,18 @@ rnd_core_gc_t *hc = (rnd_core_gc_t *)gc; if (hc->faded != faded) { hc->faded = faded; - pcb_render->set_draw_faded(gc, faded); + rnd_render->set_draw_faded(gc, faded); } } RND_INLINE const char *pcb_hid_command_entry(const char *ovr, int *cursor) { - if ((pcb_gui == NULL) || (pcb_gui->command_entry == NULL)) { + if ((rnd_gui == NULL) || (rnd_gui->command_entry == NULL)) { if (cursor != NULL) *cursor = -1; return NULL; } - return pcb_gui->command_entry(pcb_gui, ovr, cursor); + return rnd_gui->command_entry(rnd_gui, ovr, cursor); } Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 30979) +++ trunk/src/librnd/core/hid_nogui.c (revision 30980) @@ -400,7 +400,7 @@ on = 0; } else { - if ((pcbhl_conf.rc.verbose >= RND_MSG_INFO) || (pcb_gui != &nogui_hid)) { + if ((pcbhl_conf.rc.verbose >= RND_MSG_INFO) || (rnd_gui != &nogui_hid)) { now = rnd_dtime(); if (now >= nextt) { fprintf(stderr, "progress: %ld/%ld %s\n", so_far, total, message); Index: trunk/src/librnd/core/hidlib.c =================================================================== --- trunk/src/librnd/core/hidlib.c (revision 30979) +++ trunk/src/librnd/core/hidlib.c (revision 30980) @@ -44,7 +44,7 @@ static void hidlib_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_tool_gui_init(); - pcb_gui->set_mouse_cursor(pcb_gui, pcbhl_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */ + rnd_gui->set_mouse_cursor(rnd_gui, pcbhl_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */ } void pcbhl_log_print_uninit_errs(const char *title) Index: trunk/src/librnd/core/hidlib_conf.c =================================================================== --- trunk/src/librnd/core/hidlib_conf.c (revision 30979) +++ trunk/src/librnd/core/hidlib_conf.c (revision 30980) @@ -60,7 +60,7 @@ hidlib->grid = Grid; rnd_conf_set_design("editor/grid", "%$mS", Grid); if (pcbhl_conf.editor.draw_grid) - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 30979) +++ trunk/src/librnd/core/tool.c (revision 30980) @@ -81,8 +81,8 @@ tool->cookie = cookie; id = pcb_tools.used; vtp0_append(&pcb_tools, (void *)tool); - if (pcb_gui != NULL) - pcb_gui->reg_mouse_cursor(pcb_gui, id, tool->cursor.name, tool->cursor.pixel, tool->cursor.mask); + if (rnd_gui != NULL) + rnd_gui->reg_mouse_cursor(rnd_gui, id, tool->cursor.name, tool->cursor.pixel, tool->cursor.mask); rnd_event(NULL, RND_EVENT_TOOL_REG, "p", tool); return id; } @@ -152,8 +152,8 @@ recursing = pcb_false; - if (pcb_gui != NULL) - pcb_gui->set_mouse_cursor(pcb_gui, id); + if (rnd_gui != NULL) + rnd_gui->set_mouse_cursor(rnd_gui, id); return 0; } @@ -197,12 +197,12 @@ pcb_toolid_t n; pcb_tool_t **tool; - if (pcb_gui == NULL) + if (rnd_gui == NULL) return; for(n = 0, tool = (pcb_tool_t **)pcb_tools.array; n < pcb_tools.used; n++,tool++) if (*tool != NULL) - pcb_gui->reg_mouse_cursor(pcb_gui, n, (*tool)->cursor.name, (*tool)->cursor.pixel, (*tool)->cursor.mask); + rnd_gui->reg_mouse_cursor(rnd_gui, n, (*tool)->cursor.name, (*tool)->cursor.pixel, (*tool)->cursor.mask); } /**** current tool function wrappers ****/ Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30979) +++ trunk/src/librnd/pcb_compat.h (revision 30980) @@ -598,3 +598,10 @@ #define PCB_HID_DOCK_max RND_HID_DOCK_max #define pcb_dock_is_vert rnd_dock_is_vert #define pcb_dock_has_frame rnd_dock_has_frame +#define pcb_hid_expose_cb_t rnd_hid_expose_cb_t +#define pcb_hid_expose_t rnd_hid_expose_t +#define pcb_gui rnd_gui +#define pcb_render rnd_render +#define pcb_exporter rnd_exporter +#define pcb_current_action rnd_current_action +#define pcb_pixel_slop rnd_pixel_slop Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 30979) +++ trunk/src/main.c (revision 30980) @@ -330,7 +330,7 @@ pcb_strflg_uninit_layerlist(); gui_support_plugins(0); - pcb_render = pcb_gui = NULL; + rnd_render = rnd_gui = NULL; pcb_crosshair_uninit(); pcb_tool_logic_uninit(); @@ -509,7 +509,7 @@ pcb_layervis_reset_stack(&PCB->hidlib); - if (pcb_gui->gui) + if (rnd_gui->gui) pcb_crosshair_init(); main_sighand_init(); pcb_init_buffers(PCB); Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 30979) +++ trunk/src/netlist.c (revision 30980) @@ -500,7 +500,7 @@ free(e->key); htsp_uninit(&sctx->found); if (sctx->changed) { - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); conf_core.temp.rat_warn = pcb_true; } } Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 30979) +++ trunk/src/netlist_act.c (revision 30980) @@ -268,8 +268,8 @@ free(refdes); } - if (pcb_gui != NULL) - pcb_gui->invalidate_all(pcb_gui); + if (rnd_gui != NULL) + rnd_gui->invalidate_all(rnd_gui); } else if (argc > 2) { pin_found = 1; @@ -277,13 +277,13 @@ for(term = pcb_termlist_first(&net->conns); term != NULL; term = pcb_termlist_next(term)) func(net, term); } - if (pcb_gui != NULL) - pcb_gui->invalidate_all(pcb_gui); + if (rnd_gui != NULL) + rnd_gui->invalidate_all(rnd_gui); } else { func(net, NULL); - if (pcb_gui != NULL) - pcb_gui->invalidate_all(pcb_gui); + if (rnd_gui != NULL) + rnd_gui->invalidate_all(rnd_gui); } return pin_found; Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 30979) +++ trunk/src/obj_arc.c (revision 30980) @@ -1068,13 +1068,13 @@ if ((allow_term_gfx) && pcb_draw_term_need_gfx(arc) && pcb_draw_term_hid_permission()) { pcb_hid_set_line_cap(pcb_draw_out.active_padGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.active_padGC, thickness); - pcb_render->draw_arc(pcb_draw_out.active_padGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); + rnd_render->draw_arc(pcb_draw_out.active_padGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH); } else pcb_hid_set_line_width(pcb_draw_out.fgGC, thickness); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); - pcb_render->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); + rnd_render->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); } else { @@ -1082,7 +1082,7 @@ pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); if(info->xform->thin_draw) - pcb_render->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); + rnd_render->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); if(info->xform->wireframe) pcb_draw_wireframe_arc(pcb_draw_out.fgGC, arc, thickness); @@ -1128,7 +1128,7 @@ pcb_lighten_color(color, &buf, 1.75); color = &buf; } - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); pcb_arc_draw_(info, arc, allow_term_gfx); } Index: trunk/src/obj_arc_ui.c =================================================================== --- trunk/src/obj_arc_ui.c (revision 30979) +++ trunk/src/obj_arc_ui.c (revision 30980) @@ -38,8 +38,8 @@ static void draw_mark(rnd_hid_gc_t gc, const pcb_arc_t *arc) { const rnd_coord_t mark = PCB_MM_TO_COORD(0.2); - pcb_render->draw_line(gc, arc->X-mark, arc->Y, arc->X+mark, arc->Y); - pcb_render->draw_line(gc, arc->X, arc->Y-mark, arc->X, arc->Y+mark); + rnd_render->draw_line(gc, arc->X-mark, arc->Y, arc->X+mark, arc->Y); + rnd_render->draw_line(gc, arc->X, arc->Y-mark, arc->X, arc->Y+mark); } static void pcb_arc_ui_move_or_copy_angle(pcb_crosshair_t *ch) @@ -99,7 +99,7 @@ ch->AttachedObject.delta_angle = delta; ch->AttachedObject.radius = 0; - pcb_render->draw_arc(ch->GC, arc->X, arc->Y, arc->Width, arc->Height, start, delta); + rnd_render->draw_arc(ch->GC, arc->X, arc->Y, arc->Width, arc->Height, start, delta); draw_mark(ch->GC, arc); } @@ -118,7 +118,7 @@ ch->AttachedObject.radius = d; - pcb_render->draw_arc(ch->GC, arc->X, arc->Y, ch->AttachedObject.radius, ch->AttachedObject.radius, arc->StartAngle, arc->Delta); + rnd_render->draw_arc(ch->GC, arc->X, arc->Y, ch->AttachedObject.radius, ch->AttachedObject.radius, arc->StartAngle, arc->Delta); draw_mark(ch->GC, &arc2); } @@ -126,7 +126,7 @@ void pcb_arc_ui_move_or_copy(pcb_crosshair_t *ch) { - if (pcb_gui->shift_is_pressed(pcb_gui) || (ch->AttachedObject.radius != 0)) + if (rnd_gui->shift_is_pressed(rnd_gui) || (ch->AttachedObject.radius != 0)) pcb_arc_ui_move_or_copy_endp(ch); else pcb_arc_ui_move_or_copy_angle(ch); Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 30979) +++ trunk/src/obj_common.h (revision 30980) @@ -320,11 +320,11 @@ do { \ rnd_coord_t radius = PCB_MM_TO_COORD(0.2); \ int selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj); \ - pcb_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc); \ + rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc); \ pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); \ pcb_hid_set_line_width(pcb_draw_out.fgGC, -2); \ - pcb_render->draw_line(pcb_draw_out.fgGC, cx-radius, cy-radius, cx+radius, cy+radius); \ - pcb_render->draw_line(pcb_draw_out.fgGC, cx+radius, cy-radius, cx-radius, cy+radius); \ + rnd_render->draw_line(pcb_draw_out.fgGC, cx-radius, cy-radius, cx+radius, cy+radius); \ + rnd_render->draw_line(pcb_draw_out.fgGC, cx+radius, cy-radius, cx-radius, cy+radius); \ } while(0) #define pcb_hidden_floater(obj,info) ((info)->xform->hide_floaters && PCB_FLAG_TEST(PCB_FLAG_FLOATER, (obj))) Index: trunk/src/obj_gfx.c =================================================================== --- trunk/src/obj_gfx.c (revision 30979) +++ trunk/src/obj_gfx.c (revision 30980) @@ -634,25 +634,25 @@ else color = &conf_core.appearance.color.selected; - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.fgGC, -2); - pcb_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[1], gfx->coy[1]); - pcb_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[2], gfx->coy[2]); - pcb_render->draw_line(pcb_draw_out.fgGC, gfx->cox[2], gfx->coy[2], gfx->cox[3], gfx->coy[3]); - pcb_render->draw_line(pcb_draw_out.fgGC, gfx->cox[3], gfx->coy[3], gfx->cox[0], gfx->coy[0]); + rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[1], gfx->coy[1]); + rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[2], gfx->coy[2]); + rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[2], gfx->coy[2], gfx->cox[3], gfx->coy[3]); + rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[3], gfx->coy[3], gfx->cox[0], gfx->coy[0]); } - if ((gfx->pxm_neutral == NULL) || (pcb_render->draw_pixmap == NULL)) { - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.warn); + if ((gfx->pxm_neutral == NULL) || (rnd_render->draw_pixmap == NULL)) { + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.warn); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_MM_TO_COORD(0.1)); - pcb_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[2], gfx->coy[2]); - pcb_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[3], gfx->coy[3]); + rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[2], gfx->coy[2]); + rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[3], gfx->coy[3]); } else { - pcb_render->draw_pixmap(pcb_render, gfx->cx, gfx->cy, gfx->sx, gfx->sy, gfx->pxm_xformed); + rnd_render->draw_pixmap(rnd_render, gfx->cx, gfx->cy, gfx->sx, gfx->sy, gfx->pxm_xformed); } } @@ -697,8 +697,8 @@ void pcb_gfx_draw_xor(pcb_gfx_t *gfx, rnd_coord_t dx, rnd_coord_t dy) { - pcb_render->draw_line(pcb_crosshair.GC, gfx->cox[0]+dx, gfx->coy[0]+dy, gfx->cox[1]+dx, gfx->coy[1]+dy); - pcb_render->draw_line(pcb_crosshair.GC, gfx->cox[1]+dx, gfx->coy[1]+dy, gfx->cox[2]+dx, gfx->coy[2]+dy); - pcb_render->draw_line(pcb_crosshair.GC, gfx->cox[2]+dx, gfx->coy[2]+dy, gfx->cox[3]+dx, gfx->coy[3]+dy); - pcb_render->draw_line(pcb_crosshair.GC, gfx->cox[3]+dx, gfx->coy[3]+dy, gfx->cox[0]+dx, gfx->coy[0]+dy); + rnd_render->draw_line(pcb_crosshair.GC, gfx->cox[0]+dx, gfx->coy[0]+dy, gfx->cox[1]+dx, gfx->coy[1]+dy); + rnd_render->draw_line(pcb_crosshair.GC, gfx->cox[1]+dx, gfx->coy[1]+dy, gfx->cox[2]+dx, gfx->coy[2]+dy); + rnd_render->draw_line(pcb_crosshair.GC, gfx->cox[2]+dx, gfx->coy[2]+dy, gfx->cox[3]+dx, gfx->coy[3]+dy); + rnd_render->draw_line(pcb_crosshair.GC, gfx->cox[3]+dx, gfx->coy[3]+dy, gfx->cox[0]+dx, gfx->coy[0]+dy); } Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 30979) +++ trunk/src/obj_line.c (revision 30980) @@ -717,7 +717,7 @@ point2.Y += ctx->move.dy; } - mod1 = pcb_gui->shift_is_pressed(pcb_gui); + mod1 = rnd_gui->shift_is_pressed(rnd_gui); if (is_first) mod1 = !mod1; @@ -732,7 +732,7 @@ Line->Clearance, Line->Flags, mod1, - pcb_gui->control_is_pressed(pcb_gui) ); + rnd_gui->control_is_pressed(rnd_gui) ); pcb_route_apply_to_line(&route,Layer,Line); pcb_route_destroy(&route); return Line; /* first line is preserved */ @@ -1183,17 +1183,17 @@ if ((allow_term_gfx) && pcb_draw_term_need_gfx(line) && pcb_draw_term_hid_permission()) { pcb_hid_set_line_cap(pcb_draw_out.active_padGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.active_padGC, thickness); - pcb_render->draw_line(pcb_draw_out.active_padGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); + rnd_render->draw_line(pcb_draw_out.active_padGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH); } else pcb_hid_set_line_width(pcb_draw_out.fgGC, thickness); - pcb_render->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); + rnd_render->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); } else { if(info->xform->thin_draw) { pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); - pcb_render->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); + rnd_render->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); } if (info->xform->wireframe) { @@ -1244,7 +1244,7 @@ color = &buf; } - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); pcb_line_draw_(info, line, allow_term_gfx); } Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 30979) +++ trunk/src/obj_line_drcenf.c (revision 30980) @@ -58,8 +58,8 @@ &pcb_crosshair.Route, &line->Point1, &line->Point2, pcb_layer_id(PCB->Data, PCB_CURRLAYER(PCB)), conf_core.design.line_thickness, conf_core.design.clearance * 2, - pcb_flag_make(flags), pcb_gui->shift_is_pressed(pcb_gui), - pcb_gui->control_is_pressed(pcb_gui)); + pcb_flag_make(flags), rnd_gui->shift_is_pressed(rnd_gui), + rnd_gui->control_is_pressed(rnd_gui)); } /* directions: @@ -147,7 +147,7 @@ return; /* don't draw outline when ctrl key is pressed */ - if (pcb_gui->control_is_pressed(pcb_gui)) { + if (rnd_gui->control_is_pressed(rnd_gui)) { line->draw = pcb_false; return; } @@ -161,7 +161,7 @@ } /* swap the modes if shift is held down */ - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) way = !way; dx = pcb_crosshair.X - line->Point1.X; @@ -467,7 +467,7 @@ /* Silence a bogus compiler warning by storing this in a variable */ rnd_layer_id_t layer_idx = PCB_CURRLID(pcb); - if (pcb_gui->mod1_is_pressed(pcb_gui) || pcb_gui->control_is_pressed(pcb_gui) || PCB->RatDraw) + if (rnd_gui->mod1_is_pressed(rnd_gui) || rnd_gui->control_is_pressed(rnd_gui) || PCB->RatDraw) return; if (!(pcb_layer_flags(PCB, layer_idx) & PCB_LYT_COPPER)) @@ -492,7 +492,7 @@ #undef sqr } /* shift forces the line lookahead path to refract the alternate way */ - shift = pcb_gui->shift_is_pressed(pcb_gui); + shift = rnd_gui->shift_is_pressed(rnd_gui); if (PCB_XOR(r1 > r2, shift)) { if (conf_core.editor.line_refraction != 0) { Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 30979) +++ trunk/src/obj_poly.c (revision 30980) @@ -1239,9 +1239,9 @@ return; if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, poly)) - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected); else - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name); pcb_hid_set_line_width(pcb_draw_out.fgGC, -1); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); @@ -1252,8 +1252,8 @@ np = poly->PointN; for(n = 1; n < np; n++) - pcb_render->draw_line(pcb_draw_out.fgGC, poly->Points[n-1].X, poly->Points[n-1].Y, poly->Points[n].X, poly->Points[n].Y); - pcb_render->draw_line(pcb_draw_out.fgGC, poly->Points[n-1].X, poly->Points[n-1].Y, poly->Points[0].X, poly->Points[0].Y); + rnd_render->draw_line(pcb_draw_out.fgGC, poly->Points[n-1].X, poly->Points[n-1].Y, poly->Points[n].X, poly->Points[n].Y); + rnd_render->draw_line(pcb_draw_out.fgGC, poly->Points[n-1].X, poly->Points[n-1].Y, poly->Points[0].X, poly->Points[0].Y); } static void pcb_poly_draw_tr_offs(pcb_poly_it_t *it, rnd_coord_t offs) @@ -1358,7 +1358,7 @@ r = PCB_DRAW_TERM_GFX_WIDTH; pcb_hid_set_line_width(pcb_draw_out.fgGC, r); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square); - pcb_render->draw_line(pcb_draw_out.fgGC, x, y, x, y); + rnd_render->draw_line(pcb_draw_out.fgGC, x, y, x, y); } } else @@ -1414,7 +1414,7 @@ PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0); else color = &layer->meta.real.color; - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); pcb_poly_draw_(info, polygon, allow_term_gfx); } Index: trunk/src/obj_poly_draw_helper.c =================================================================== --- trunk/src/obj_poly_draw_helper.c (revision 30979) +++ trunk/src/obj_poly_draw_helper.c (revision 30980) @@ -45,7 +45,7 @@ last_x = pl->head->point[0]; \ last_y = pl->head->point[1]; \ v = pl->head->next; \ - mindist = pcb_render->coord_per_pix * 2; \ + mindist = rnd_render->coord_per_pix * 2; \ /* call this before drawing the next vertex */ #define vert_opt_loop1(v, force, skip_stmt) \ @@ -88,7 +88,7 @@ vert_opt_begin(); do { vert_opt_loop1(v, first, continue); - if (pcb_render->gui) + if (rnd_render->gui) first = 0; /* if gui, turn on optimization and start to omit vertices */ fc_x[i] = this_x; fc_y[i++] = this_y; @@ -99,10 +99,10 @@ if (i < 3) { pcb_hid_set_line_width(gc, PCB_MM_TO_COORD(0.01)); pcb_hid_set_line_cap(gc, rnd_cap_round); - pcb_render->draw_line(gc, last_x, last_y, this_x, this_y); + rnd_render->draw_line(gc, last_x, last_y, this_x, this_y); } else - pcb_render->fill_polygon(gc, i, fc_x, fc_y); + rnd_render->fill_polygon(gc, i, fc_x, fc_y); vert_opt_end(); } @@ -118,7 +118,7 @@ /* If the contour is round, use an arc drawing routine. */ if (pl->is_round) { - pcb_render->draw_arc(gc, pl->cx, pl->cy, pl->radius, pl->radius, 0, 360); + rnd_render->draw_arc(gc, pl->cx, pl->cy, pl->radius, pl->radius, 0, 360); return; } @@ -129,7 +129,7 @@ vert_opt_begin(); do { vert_opt_loop1(v, 0, continue); - pcb_render->draw_line(gc, last_x, last_y, this_x, this_y); + rnd_render->draw_line(gc, last_x, last_y, this_x, this_y); vert_opt_loop2(); } while ((v = v->next) != pl->head->next); Index: trunk/src/obj_pstk.c =================================================================== --- trunk/src/obj_pstk.c (revision 30979) +++ trunk/src/obj_pstk.c (revision 30980) @@ -408,12 +408,12 @@ } - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); } static void set_ps_annot_color(rnd_hid_gc_t gc, pcb_pstk_t *ps) { - pcb_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? + rnd_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? &conf_core.appearance.color.selected : &conf_core.appearance.color.padstackmark); } @@ -459,11 +459,11 @@ if (!fill) { for(n = 1; n < shape->data.poly.len; n++) - pcb_render->draw_line(gc, ps->x + x[n-1], ps->y + y[n-1], ps->x + x[n], ps->y + y[n]); - pcb_render->draw_line(gc, ps->x + x[n-1], ps->y + y[n-1], ps->x + x[0], ps->y + y[0]); + rnd_render->draw_line(gc, ps->x + x[n-1], ps->y + y[n-1], ps->x + x[n], ps->y + y[n]); + rnd_render->draw_line(gc, ps->x + x[n-1], ps->y + y[n-1], ps->x + x[0], ps->y + y[0]); } else - pcb_render->fill_polygon_offs(gc, shape->data.poly.len, x, y, ps->x, ps->y); + rnd_render->fill_polygon_offs(gc, shape->data.poly.len, x, y, ps->x, ps->y); if (p != p_st) { free(p); free(x); @@ -472,11 +472,11 @@ else { if (!fill) { for(n = 1; n < shape->data.poly.len; n++) - pcb_render->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[n], ps->y + shape->data.poly.y[n]); - pcb_render->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[0], ps->y + shape->data.poly.y[0]); + rnd_render->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[n], ps->y + shape->data.poly.y[n]); + rnd_render->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[0], ps->y + shape->data.poly.y[0]); } else - pcb_render->fill_polygon_offs(gc, shape->data.poly.len, shape->data.poly.x, shape->data.poly.y, ps->x, ps->y); + rnd_render->fill_polygon_offs(gc, shape->data.poly.len, shape->data.poly.x, shape->data.poly.y, ps->x, ps->y); } } @@ -493,12 +493,12 @@ case PCB_PSSH_LINE: pcb_hid_set_line_cap(gc, shape->data.line.square ? rnd_cap_square : rnd_cap_round); pcb_hid_set_line_width(gc, MAX(shape->data.line.thickness + dthick, 1)); - pcb_render->draw_line(gc, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2); + rnd_render->draw_line(gc, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2); break; case PCB_PSSH_CIRC: r = MAX(shape->data.circ.dia/2 + dthick/2, 1); pcb_hid_set_line_cap(gc, rnd_cap_round); - pcb_render->fill_circle(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, r); + rnd_render->fill_circle(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, r); break; case PCB_PSSH_HSHADOW: break; @@ -522,7 +522,7 @@ break; case PCB_PSSH_CIRC: r = MAX(shape->data.circ.dia/2 + dthick/2, 1); - pcb_render->draw_arc(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, r, r, 0, 360); + rnd_render->draw_arc(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, r, r, 0, 360); break; case PCB_PSSH_HSHADOW: break; @@ -593,18 +593,18 @@ mark += proto->hdia/2; mark2 = mark*2; - if (mark2 < pcb_render->coord_per_pix) + if (mark2 < rnd_render->coord_per_pix) return PCB_R_DIR_FOUND_CONTINUE; /* draw the cross using xor */ set_ps_annot_color(pcb_draw_out.fgGC, ps); pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); - if (mark2 > pcb_render->coord_per_pix*3) { - pcb_render->draw_line(pcb_draw_out.fgGC, ps->x-mark, ps->y, ps->x+mark, ps->y); - pcb_render->draw_line(pcb_draw_out.fgGC, ps->x, ps->y-mark, ps->x, ps->y+mark); + if (mark2 > rnd_render->coord_per_pix*3) { + rnd_render->draw_line(pcb_draw_out.fgGC, ps->x-mark, ps->y, ps->x+mark, ps->y); + rnd_render->draw_line(pcb_draw_out.fgGC, ps->x, ps->y-mark, ps->x, ps->y+mark); } else - pcb_render->draw_line(pcb_draw_out.fgGC, ps->x-pcb_render->coord_per_pix, ps->y, ps->x+pcb_render->coord_per_pix, ps->y); + rnd_render->draw_line(pcb_draw_out.fgGC, ps->x-rnd_render->coord_per_pix, ps->y, ps->x+rnd_render->coord_per_pix, ps->y); return PCB_R_DIR_FOUND_CONTINUE; } @@ -668,7 +668,7 @@ /* actual hole */ pcb_hid_set_line_width(pcb_draw_out.drillGC, 0); pcb_hid_set_line_cap(pcb_draw_out.drillGC, rnd_cap_round); - pcb_render->fill_circle(pcb_draw_out.drillGC, ps->x, ps->y, proto->hdia / 2); + rnd_render->fill_circle(pcb_draw_out.drillGC, ps->x, ps->y, proto->hdia / 2); /* indicate unplated holes with an arc; unplated holes are more rare than plated holes, thus unplated holes are indicated */ @@ -675,9 +675,9 @@ if (!proto->hplated && !pcb_xform_omit_overlay(info)) { rnd_coord_t r = proto->hdia / 2; r -= r/8; /* +12.5% */ - pcb_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc); + rnd_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc); pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); - pcb_render->draw_arc(pcb_draw_out.fgGC, ps->x, ps->y, r, r, 20, 290); + rnd_render->draw_arc(pcb_draw_out.fgGC, ps->x, ps->y, r, r, 20, 290); } return PCB_R_DIR_FOUND_CONTINUE; Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 30979) +++ trunk/src/obj_rat.c (revision 30980) @@ -449,18 +449,18 @@ if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, rat)) - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected); else - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.connected); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.connected); } else if (PCB_HAS_COLOROVERRIDE(rat)) { - pcb_render->set_color(pcb_draw_out.fgGC, rat->override_color); + rnd_render->set_color(pcb_draw_out.fgGC, rat->override_color); } else - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.rat); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.rat); if (conf_core.appearance.rat_thickness < 20) - rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness; + rat->Thickness = rnd_pixel_slop * conf_core.appearance.rat_thickness; /* PCB_FLAG_VIA is set if this rat goes to a containing poly: draw a donut */ if (PCB_FLAG_TEST(PCB_FLAG_VIA, rat)) { int w = rat->Thickness; @@ -469,7 +469,7 @@ pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); else pcb_hid_set_line_width(pcb_draw_out.fgGC, w); - pcb_render->draw_arc(pcb_draw_out.fgGC, rat->Point1.X, rat->Point1.Y, w * 2, w * 2, 0, 360); + rnd_render->draw_arc(pcb_draw_out.fgGC, rat->Point1.X, rat->Point1.Y, w * 2, w * 2, 0, 360); } else pcb_line_draw_(info, (pcb_line_t *) rat, 0); @@ -497,7 +497,7 @@ void pcb_rat_invalidate_draw(pcb_rat_t *Rat) { if (conf_core.appearance.rat_thickness < 20) - Rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness; + Rat->Thickness = rnd_pixel_slop * conf_core.appearance.rat_thickness; /* rats.c set PCB_FLAG_VIA if this rat goes to a containing poly: draw a donut */ if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) { rnd_coord_t w = Rat->Thickness; Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 30979) +++ trunk/src/obj_subc.c (revision 30980) @@ -697,15 +697,15 @@ DX += (origin->Point1.X + origin->Point2.X) / 2; DY += (origin->Point1.Y + origin->Point2.Y) / 2; - pcb_render->draw_line(GC, DX - PCB_EMARK_SIZE, DY, DX, DY - PCB_EMARK_SIZE); - pcb_render->draw_line(GC, DX + PCB_EMARK_SIZE, DY, DX, DY - PCB_EMARK_SIZE); - pcb_render->draw_line(GC, DX - PCB_EMARK_SIZE, DY, DX, DY + PCB_EMARK_SIZE); - pcb_render->draw_line(GC, DX + PCB_EMARK_SIZE, DY, DX, DY + PCB_EMARK_SIZE); + rnd_render->draw_line(GC, DX - PCB_EMARK_SIZE, DY, DX, DY - PCB_EMARK_SIZE); + rnd_render->draw_line(GC, DX + PCB_EMARK_SIZE, DY, DX, DY - PCB_EMARK_SIZE); + rnd_render->draw_line(GC, DX - PCB_EMARK_SIZE, DY, DX, DY + PCB_EMARK_SIZE); + rnd_render->draw_line(GC, DX + PCB_EMARK_SIZE, DY, DX, DY + PCB_EMARK_SIZE); if (sc->auto_termname_display) { #define OFX (PCB_EMARK_SIZE/5) - pcb_render->draw_line(GC, DX-OFX, DY-PCB_EMARK_SIZE/3, DX-OFX, DY+PCB_EMARK_SIZE/3); - pcb_render->draw_line(GC, DX-OFX, DY+PCB_EMARK_SIZE/3, DX-OFX+PCB_EMARK_SIZE/3, DY+PCB_EMARK_SIZE/3); + rnd_render->draw_line(GC, DX-OFX, DY-PCB_EMARK_SIZE/3, DX-OFX, DY+PCB_EMARK_SIZE/3); + rnd_render->draw_line(GC, DX-OFX, DY+PCB_EMARK_SIZE/3, DX-OFX+PCB_EMARK_SIZE/3, DY+PCB_EMARK_SIZE/3); #undef OFX } } @@ -725,13 +725,13 @@ else ly -= PCB_EMARK_SIZE*1.5; - pcb_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE, lx+PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE); - pcb_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE, lx+PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE); - pcb_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE, lx-PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE); - pcb_render->draw_line(GC, lx+PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE, lx+PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE); - pcb_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE*1/3, lx+PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE*1/3); - pcb_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE*1/3, lx+PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE*1/3); - pcb_render->draw_arc(GC, lx, ly-s, PCB_EMARK_SIZE*2/3, PCB_EMARK_SIZE*2/3, 180, on_bottom ? -180 : 180); + rnd_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE, lx+PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE); + rnd_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE, lx+PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE); + rnd_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE, lx-PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE); + rnd_render->draw_line(GC, lx+PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE, lx+PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE); + rnd_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE*1/3, lx+PCB_EMARK_SIZE, ly+PCB_EMARK_SIZE*1/3); + rnd_render->draw_line(GC, lx-PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE*1/3, lx+PCB_EMARK_SIZE, ly-PCB_EMARK_SIZE*1/3); + rnd_render->draw_arc(GC, lx, ly-s, PCB_EMARK_SIZE*2/3, PCB_EMARK_SIZE*2/3, 180, on_bottom ? -180 : 180); } void pcb_xordraw_subc(pcb_subc_t *sc, rnd_coord_t DX, rnd_coord_t DY, int use_curr_side) @@ -771,7 +771,7 @@ TODO(": The wireframe arc drawing code cannot draw ellipses yet so draw the elliptical arc with a thin line ") double sa = mirr ? PCB_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle; double da = mirr ? PCB_SWAP_DELTA(arc->Delta) : arc->Delta; - pcb_render->draw_arc(pcb_crosshair.GC, DX + PCB_CSWAP_X(arc->X, w, mirr), DY + PCB_CSWAP_Y(arc->Y, h, mirr), arc->Width, arc->Height, sa, da); + rnd_render->draw_arc(pcb_crosshair.GC, DX + PCB_CSWAP_X(arc->X, w, mirr), DY + PCB_CSWAP_Y(arc->Y, h, mirr), arc->Width, arc->Height, sa, da); } else { pcb_arc_t temp_arc; @@ -1983,7 +1983,7 @@ freq = 32; nnclr = (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc)) ? &conf_core.appearance.color.subc_nonetlist : &conf_core.appearance.color.subc; - pcb_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : nnclr); + rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : nnclr); pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); pcb_subc_draw_origin(pcb_draw_out.fgGC, subc, 0, 0); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 30979) +++ trunk/src/obj_text.c (revision 30980) @@ -1066,11 +1066,11 @@ if (xordraw || thindraw) { rnd_hid_gc_t gc = xordraw ? pcb_crosshair.GC : pcb_draw_out.fgGC; for(n = 1, p = poly->Points+1; n < max; n++,p++) - pcb_render->draw_line(gc, xordx + x[n-1], xordy + y[n-1], xordx + x[n], xordy + y[n]); - pcb_render->draw_line(gc, xordx + x[0], xordy + y[0], xordx + x[max-1], xordy + y[max-1]); + rnd_render->draw_line(gc, xordx + x[n-1], xordy + y[n-1], xordx + x[n], xordy + y[n]); + rnd_render->draw_line(gc, xordx + x[0], xordy + y[0], xordx + x[max-1], xordy + y[max-1]); } else - pcb_render->fill_polygon(pcb_draw_out.fgGC, poly->PointN, x, y); + rnd_render->fill_polygon(pcb_draw_out.fgGC, poly->PointN, x, y); } /* Very rough estimation on the full width of the text */ @@ -1121,7 +1121,7 @@ tx2 += xordx; ty2 += xordy; - pcb_render->draw_line(gc, tx1, ty1, tx2, ty2); + rnd_render->draw_line(gc, tx1, ty1, tx2, ty2); } @@ -1130,11 +1130,11 @@ { rnd_coord_t w, h = PCB_SCALE_TEXT(font->MaxHeight, scale); if (tiny == PCB_TXT_TINY_HIDE) { - if (h <= pcb_render->coord_per_pix*6) /* <= 6 pixel high: unreadable */ + if (h <= rnd_render->coord_per_pix*6) /* <= 6 pixel high: unreadable */ return 1; } else if (tiny == PCB_TXT_TINY_CHEAP) { - if (h <= pcb_render->coord_per_pix*2) { /* <= 1 pixel high: draw a single line in the middle */ + if (h <= rnd_render->coord_per_pix*2) { /* <= 1 pixel high: draw a single line in the middle */ w = pcb_text_width(font, scale, string); if (xordraw) { cheap_text_line(pcb_crosshair.GC, mx, 0, h/2, w, h/2, xordx, xordy); @@ -1146,7 +1146,7 @@ } return 1; } - else if (h <= pcb_render->coord_per_pix*4) { /* <= 4 pixel high: draw a mirrored Z-shape */ + else if (h <= rnd_render->coord_per_pix*4) { /* <= 4 pixel high: draw a mirrored Z-shape */ w = pcb_text_width(font, scale, string); if (xordraw) { h /= 4; @@ -1215,7 +1215,7 @@ cb(cb_ctx, (pcb_any_obj_t *)&newline); } else if (xordraw) - pcb_render->draw_line(pcb_crosshair.GC, xordx + newline.Point1.X, xordy + newline.Point1.Y, xordx + newline.Point2.X, xordy + newline.Point2.Y); + rnd_render->draw_line(pcb_crosshair.GC, xordx + newline.Point1.X, xordy + newline.Point1.Y, xordx + newline.Point2.X, xordy + newline.Point2.Y); else pcb_line_draw_(info, &newline, 0); } @@ -1242,7 +1242,7 @@ cb(cb_ctx, (pcb_any_obj_t *)&newarc); } else if (xordraw) - pcb_render->draw_arc(pcb_crosshair.GC, xordx + newarc.X, xordy + newarc.Y, newarc.Width, newarc.Height, newarc.StartAngle, newarc.Delta); + rnd_render->draw_arc(pcb_crosshair.GC, xordx + newarc.X, xordy + newarc.Y, newarc.Width, newarc.Height, newarc.StartAngle, newarc.Delta); else pcb_arc_draw_(info, &newarc, 0); } @@ -1272,16 +1272,16 @@ /* draw move on to next cursor position */ if ((cb == NULL) && (xordraw || (info->xform->thin_draw || info->xform->wireframe))) { if (xordraw) { - pcb_render->draw_line(pcb_crosshair.GC, px[0] + xordx, py[0] + xordy, px[1] + xordx, py[1] + xordy); - pcb_render->draw_line(pcb_crosshair.GC, px[1] + xordx, py[1] + xordy, px[2] + xordx, py[2] + xordy); - pcb_render->draw_line(pcb_crosshair.GC, px[2] + xordx, py[2] + xordy, px[3] + xordx, py[3] + xordy); - pcb_render->draw_line(pcb_crosshair.GC, px[3] + xordx, py[3] + xordy, px[0] + xordx, py[0] + xordy); + rnd_render->draw_line(pcb_crosshair.GC, px[0] + xordx, py[0] + xordy, px[1] + xordx, py[1] + xordy); + rnd_render->draw_line(pcb_crosshair.GC, px[1] + xordx, py[1] + xordy, px[2] + xordx, py[2] + xordy); + rnd_render->draw_line(pcb_crosshair.GC, px[2] + xordx, py[2] + xordy, px[3] + xordx, py[3] + xordy); + rnd_render->draw_line(pcb_crosshair.GC, px[3] + xordx, py[3] + xordy, px[0] + xordx, py[0] + xordy); } else { - pcb_render->draw_line(pcb_draw_out.fgGC, px[0], py[0], px[1], py[1]); - pcb_render->draw_line(pcb_draw_out.fgGC, px[1], py[1], px[2], py[2]); - pcb_render->draw_line(pcb_draw_out.fgGC, px[2], py[2], px[3], py[3]); - pcb_render->draw_line(pcb_draw_out.fgGC, px[3], py[3], px[0], py[0]); + rnd_render->draw_line(pcb_draw_out.fgGC, px[0], py[0], px[1], py[1]); + rnd_render->draw_line(pcb_draw_out.fgGC, px[1], py[1], px[2], py[2]); + rnd_render->draw_line(pcb_draw_out.fgGC, px[2], py[2], px[3], py[3]); + rnd_render->draw_line(pcb_draw_out.fgGC, px[3], py[3], px[0], py[0]); } } else { @@ -1300,7 +1300,7 @@ cb(cb_ctx, (pcb_any_obj_t *)&po); } else - pcb_render->fill_polygon(pcb_draw_out.fgGC, 4, px, py); + rnd_render->fill_polygon(pcb_draw_out.fgGC, 4, px, py); } x += size; } @@ -1406,21 +1406,21 @@ if (layer->is_bound) { const rnd_color_t *color; PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1); - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); } else - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.selected); } else if (info->xform->flag_color && PCB_HAS_COLOROVERRIDE(text)) { - pcb_render->set_color(pcb_draw_out.fgGC, text->override_color); + rnd_render->set_color(pcb_draw_out.fgGC, text->override_color); } else if (layer->is_bound) { const rnd_color_t *color; PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0); - pcb_render->set_color(pcb_draw_out.fgGC, color); + rnd_render->set_color(pcb_draw_out.fgGC, color); } else - pcb_render->set_color(pcb_draw_out.fgGC, &layer->meta.real.color); + rnd_render->set_color(pcb_draw_out.fgGC, &layer->meta.real.color); if ((!layer->is_bound) && (layer->meta.real.grp >= 0)) flg = pcb_layergrp_flags(PCB, layer->meta.real.grp); @@ -1482,10 +1482,10 @@ txor_info.xform = &txor_xform; DrawTextLowLevel_(&txor_info, text, 0, 1, x, y, PCB_TXT_TINY_CHEAP); if ((conf_core.appearance.text_host_bbox) && (text->BoundingBox.X1 != text->BoundingBox.X2)) { - pcb_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X1, y + text->BoundingBox.Y1, x + text->BoundingBox.X1, y + text->BoundingBox.Y2); - pcb_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X1, y + text->BoundingBox.Y1, x + text->BoundingBox.X2, y + text->BoundingBox.Y1); - pcb_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X2, y + text->BoundingBox.Y2, x + text->BoundingBox.X1, y + text->BoundingBox.Y2); - pcb_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X2, y + text->BoundingBox.Y2, x + text->BoundingBox.X2, y + text->BoundingBox.Y1); + rnd_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X1, y + text->BoundingBox.Y1, x + text->BoundingBox.X1, y + text->BoundingBox.Y2); + rnd_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X1, y + text->BoundingBox.Y1, x + text->BoundingBox.X2, y + text->BoundingBox.Y1); + rnd_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X2, y + text->BoundingBox.Y2, x + text->BoundingBox.X1, y + text->BoundingBox.Y2); + rnd_render->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X2, y + text->BoundingBox.Y2, x + text->BoundingBox.X2, y + text->BoundingBox.Y1); } } @@ -1527,7 +1527,7 @@ return; if (pcb_text_font_chg_data(PCB->Data, argv[1].d.i)) - pcb_gui->invalidate_all(pcb_gui); /* can't just redraw the text, as the old text may have been bigger, before the change! */ + rnd_gui->invalidate_all(rnd_gui); /* can't just redraw the text, as the old text may have been bigger, before the change! */ rnd_trace("font change %d\n", argv[1].d.i); } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 30979) +++ trunk/src/object_act.c (revision 30980) @@ -76,7 +76,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Attributes, layername = argv[1].val.str); RND_ACT_IRES(0); - if (!pcb_gui->edit_attributes) { + if (!rnd_gui->edit_attributes) { rnd_message(RND_MSG_ERROR, "This GUI doesn't support Attribute Editing\n"); return FGW_ERR_UNKNOWN; } @@ -84,7 +84,7 @@ switch(id) { case F_Layout: { - pcb_gui->edit_attributes(pcb_gui, "Layout Attributes", &(pcb->Attributes)); + rnd_gui->edit_attributes(rnd_gui, "Layout Attributes", &(pcb->Attributes)); return 0; } @@ -143,7 +143,7 @@ else buf = rnd_strdup("Unnamed Subcircuit's Attributes"); - pcb_gui->edit_attributes(pcb_gui, buf, &(s->Attributes)); + rnd_gui->edit_attributes(rnd_gui, buf, &(s->Attributes)); free(buf); break; } @@ -1099,8 +1099,8 @@ default: RND_ACT_FAIL(subc); return 1; } /* have to manually trigger the update as it is not a conf item */ - if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL)) - pcb_gui->update_menu_checkbox(pcb_gui, NULL); + if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL)) + rnd_gui->update_menu_checkbox(rnd_gui, NULL); return 0; case F_Hash: { Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30979) +++ trunk/src/plug_io.c (revision 30980) @@ -849,8 +849,8 @@ { backup_timer.ptr = NULL; pcb_backup(); - if (conf_core.rc.backup_interval > 0 && pcb_gui->add_timer) - backup_timer = pcb_gui->add_timer(pcb_gui, backup_cb, 1000 * conf_core.rc.backup_interval, data); + if (conf_core.rc.backup_interval > 0 && rnd_gui->add_timer) + backup_timer = rnd_gui->add_timer(rnd_gui, backup_cb, 1000 * conf_core.rc.backup_interval, data); } void pcb_enable_autosave(void) @@ -860,13 +860,13 @@ x.ptr = NULL; /* If we already have a timer going, then cancel it out */ - if (backup_timer.ptr != NULL && pcb_gui->stop_timer) - pcb_gui->stop_timer(pcb_gui, backup_timer); + if (backup_timer.ptr != NULL && rnd_gui->stop_timer) + rnd_gui->stop_timer(rnd_gui, backup_timer); backup_timer.ptr = NULL; /* Start up a new timer */ - if (conf_core.rc.backup_interval > 0 && pcb_gui->add_timer) - backup_timer = pcb_gui->add_timer(pcb_gui, backup_cb, 1000 * conf_core.rc.backup_interval, x); + if (conf_core.rc.backup_interval > 0 && rnd_gui->add_timer) + backup_timer = rnd_gui->add_timer(rnd_gui, backup_cb, 1000 * conf_core.rc.backup_interval, x); } /* Saves the board in a backup file using the name configured in Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 30979) +++ trunk/src/rats_patch.c (revision 30980) @@ -547,7 +547,7 @@ pcb_undo_restore_serial(); if (changed) { pcb_undo_inc_serial(); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } return 0; } @@ -610,7 +610,7 @@ else default_file = rnd_strdup("unnamed.bap"); - fn = pcb_gui->fileselect(pcb_gui, "Save netlist patch as ...", + fn = rnd_gui->fileselect(rnd_gui, "Save netlist patch as ...", "Choose a file to save netlist patch to\n" "for back annotation\n", default_file, ".bap", NULL, "patch", 0, NULL); Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 30979) +++ trunk/src/route.c (revision 30980) @@ -712,11 +712,11 @@ x2 = x - (cos(PCB_M180 * (start_angle + delta)) * radius); y2 = y + (sin(PCB_M180 * (start_angle + delta)) * radius); - pcb_render->draw_arc(GC, x, y, radius + wid, radius + wid, start_angle, delta); - if (wid > pcb_pixel_slop) { - pcb_render->draw_arc(GC, x, y, radius - wid, radius - wid, start_angle, delta); - pcb_render->draw_arc(GC, x1, y1, wid, wid, start_angle, -180 * SGN(delta)); - pcb_render->draw_arc(GC, x2, y2, wid, wid, start_angle + delta, 180 * SGN(delta)); + rnd_render->draw_arc(GC, x, y, radius + wid, radius + wid, start_angle, delta); + if (wid > rnd_pixel_slop) { + rnd_render->draw_arc(GC, x, y, radius - wid, radius - wid, start_angle, delta); + rnd_render->draw_arc(GC, x1, y1, wid, wid, start_angle, -180 * SGN(delta)); + rnd_render->draw_arc(GC, x2, y2, wid, wid, start_angle + delta, 180 * SGN(delta)); } } @@ -732,7 +732,7 @@ pcb_layer_t *layer = pcb_get_layer(PCB->Data, p_obj->layer); if (layer) - pcb_render->set_color(GC, &layer->meta.real.color); + rnd_render->set_color(GC, &layer->meta.real.color); switch (p_obj->type) { case PCB_OBJ_LINE: @@ -757,7 +757,7 @@ rnd_coord_t thickness = p_route->thickness + 2 * conf_core.design.bloat; int i; - pcb_render->set_color(GC, &conf_core.appearance.color.drc); + rnd_render->set_color(GC, &conf_core.appearance.color.drc); for(i = 0; i < p_route->size; ++i) { const pcb_route_object_t *p_obj = &p_route->objects[i]; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 30979) +++ trunk/src/search.c (revision 30980) @@ -1644,7 +1644,7 @@ */ int pcb_search_screen(rnd_coord_t X, rnd_coord_t Y, int Type, void **Result1, void **Result2, void **Result3) { - return pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, PCB_SLOP * pcb_pixel_slop); + return pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, PCB_SLOP * rnd_pixel_slop); } /* --------------------------------------------------------------------------- Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 30979) +++ trunk/src/select_act.c (revision 30980) @@ -88,7 +88,7 @@ case F_ToggleObject: if (pcb_select_object(PCB)) { pcb_board_set_changed_flag(pcb_true); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } break; @@ -109,7 +109,7 @@ pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); break; } @@ -124,7 +124,7 @@ box.Y2 = RND_MAX_COORD; if (pcb_select_block(PCB, &box, pcb_true, pcb_true, pcb_false)) { pcb_board_set_changed_flag(pcb_true); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } break; } @@ -139,7 +139,7 @@ box.Y2 = RND_MAX_COORD; if (pcb_select_block(PCB, &box, pcb_true, pcb_true, pcb_true)) { pcb_board_set_changed_flag(pcb_true); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } break; } Index: trunk/src/stub_draw.c =================================================================== --- trunk/src/stub_draw.c (revision 30979) +++ trunk/src/stub_draw.c (revision 30980) @@ -35,7 +35,7 @@ { pcb_text_t t; - pcb_render->set_color(gc, rnd_color_red); + rnd_render->set_color(gc, rnd_color_red); memset(&t, 0, sizeof(t)); t.TextString = (char *)str; Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30979) +++ trunk/src_plugins/asm/asm.c (revision 30980) @@ -345,9 +345,9 @@ pcb_subc_select(PCB, sc, PCB_CHGFLG_SET, 1); /* if the part is out of the screen, pan there */ - pcb_gui->view_get(pcb_gui, &view); + rnd_gui->view_get(rnd_gui, &view); if ((view.X2 < sc->BoundingBox.X1) || (view.X1 > sc->BoundingBox.X2) || (view.Y2 < sc->BoundingBox.Y1) || (view.Y1 > sc->BoundingBox.Y2)) - pcb_gui->pan(pcb_gui, (sc->BoundingBox.X1+sc->BoundingBox.X2)/2, (sc->BoundingBox.Y1+sc->BoundingBox.Y2)/2, 0); + rnd_gui->pan(rnd_gui, (sc->BoundingBox.X1+sc->BoundingBox.X2)/2, (sc->BoundingBox.Y1+sc->BoundingBox.Y2)/2, 0); } static void asm_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) @@ -381,10 +381,10 @@ } skip:; - pcb_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wskipg, isgrp | ispart); - pcb_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wdoneg, isgrp | ispart); - pcb_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wskipp, ispart); - pcb_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wdonep, ispart); + rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wskipg, isgrp | ispart); + rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wdoneg, isgrp | ispart); + rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wskipp, ispart); + rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wdonep, ispart); pcb_hid_redraw(PCB); /* for displaying the new selection */ } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 30979) +++ trunk/src_plugins/autoroute/autoroute.c (revision 30980) @@ -4603,7 +4603,7 @@ total_via_count = 0; #ifdef ROUTE_DEBUG - ddraw = pcb_gui->request_debug_draw(); + ddraw = rnd_gui->request_debug_draw(); if (ddraw != NULL) { ar_gc = ddraw->make_gc(); ddraw->set_line_cap(ar_gc, rnd_cap_round); Index: trunk/src_plugins/cam/cam_compile.c =================================================================== --- trunk/src_plugins/cam/cam_compile.c (revision 30979) +++ trunk/src_plugins/cam/cam_compile.c (revision 30980) @@ -150,7 +150,7 @@ if (ctx->has_partial) pcb_data_clear_flag(PCB->Data, PCB_FLAG_EXPORTSEL, 0, 0); - have_gui = (pcb_gui != NULL) && pcb_gui->gui; + have_gui = (rnd_gui != NULL) && rnd_gui->gui; if (have_gui) { pcb_hid_save_and_show_layer_ons(save_l_ons); pcb_hid_save_and_show_layergrp_ons(save_g_ons); Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30979) +++ trunk/src_plugins/cam/cam_gui.c (revision 30980) @@ -75,7 +75,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wjobs, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wjobs, &hv); } } @@ -139,7 +139,7 @@ cam_parse_opt_outfile(&ctx->cam, ctx->dlg[ctx->woutfile].val.str); hv.str = ctx->cam.prefix == NULL ? "" : ctx->cam.prefix; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprefix, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprefix, &hv); attr = &ctx->dlg[ctx->wopts]; tree = attr->wdata; @@ -164,7 +164,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wopts, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wopts, &hv); } } @@ -342,7 +342,7 @@ { /* set default outfile */ rnd_hid_attr_val_t hv; hv.str = pcb_derive_default_filename_(PCB->hidlib.filename, ""); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->woutfile, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->woutfile, &hv); free((char *)hv.str); cam_gui_opts2dlg(ctx); } Index: trunk/src_plugins/ddraft/cli_line.c =================================================================== --- trunk/src_plugins/ddraft/cli_line.c (revision 30979) +++ trunk/src_plugins/ddraft/cli_line.c (revision 30980) @@ -74,7 +74,7 @@ pcb_ddraft_attached.line.Point1.Y = box.Y1; pcb_ddraft_attached.line.Point2.X = box.X2; pcb_ddraft_attached.line.Point2.Y = box.Y2; - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } return res; } Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 30979) +++ trunk/src_plugins/ddraft/ddraft.c (revision 30980) @@ -107,7 +107,7 @@ continue; } res += pcb_trim_split(edges, NULL, (pcb_any_obj_t *)ptr2, REMO_INVALID, x, y, trim); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } break; default: @@ -444,16 +444,16 @@ void ddraft_tool_draw_attached(rnd_hidlib_t *hl) { int n; - pcb_render->set_line_cap(pcb_crosshair.GC, rnd_cap_round); - pcb_render->set_line_width(pcb_crosshair.GC, 1); - pcb_render->set_color(pcb_crosshair.GC, rnd_color_grey33); + rnd_render->set_line_cap(pcb_crosshair.GC, rnd_cap_round); + rnd_render->set_line_width(pcb_crosshair.GC, 1); + rnd_render->set_color(pcb_crosshair.GC, rnd_color_grey33); for(n = 0; n < vtc0_len(&pcb_ddraft_attached.annot_lines); n += 4) { rnd_coord_t *c = &pcb_ddraft_attached.annot_lines.array[n]; - pcb_render->draw_line(pcb_crosshair.GC, c[0], c[1], c[2], c[3]); + rnd_render->draw_line(pcb_crosshair.GC, c[0], c[1], c[2], c[3]); } if (pcb_ddraft_attached.line_valid) { - pcb_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(PCB)->meta.real.color); + rnd_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(PCB)->meta.real.color); pcb_draw_wireframe_line(pcb_crosshair.GC, pcb_ddraft_attached.line.Point1.X, pcb_ddraft_attached.line.Point1.Y, pcb_ddraft_attached.line.Point2.X, pcb_ddraft_attached.line.Point2.Y, conf_core.design.line_thickness, 0); @@ -525,7 +525,7 @@ if (!ddraft_tool_selected) { ddraft_tool_selected = 1; rnd_cli_enter("ddraft", "ddraft"); - pcb_gui->open_command(pcb_gui); + rnd_gui->open_command(rnd_gui); } } else if (ddraft_tool_selected) { Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 30980) @@ -75,7 +75,7 @@ int have_gui, currly = PCB_CURRLID(PCB); int save_l_ons[PCB_MAX_LAYER], save_g_ons[PCB_MAX_LAYERGRP]; - have_gui = (pcb_gui != NULL) && pcb_gui->gui; + have_gui = (rnd_gui != NULL) && rnd_gui->gui; if (have_gui) { pcb_hid_save_and_show_layer_ons(save_l_ons); pcb_hid_save_and_show_layergrp_ons(save_g_ons); Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30980) @@ -75,7 +75,7 @@ if (clr != 0) pcb_flag_change(ctx->pcb, PCB_CHGFLG_CLEAR, clr, ctx->obj_type, ctx->ptr1, ctx->obj, ctx->obj); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } @@ -149,7 +149,7 @@ PCB_DAD_NEW("flags", dlg, "Edit flags", &ctx, pcb_true, NULL); val.func = fe_attr_chg; - pcb_gui->attr_dlg_property(dlg_hid_ctx, RND_HATP_GLOBAL_CALLBACK, &val); + rnd_gui->attr_dlg_property(dlg_hid_ctx, RND_HATP_GLOBAL_CALLBACK, &val); PCB_DAD_RUN(dlg); Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30980) @@ -113,7 +113,7 @@ return; hv.str = NULL; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprev, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprev, &hv); } @@ -271,7 +271,7 @@ if ((txt != c->last_fobj) || (txt != NULL && (txt->fid != c->last_fid))) fontsel_preview_update(c); } - fontsel_timer = pcb_gui->add_timer(pcb_gui, fontsel_timer_cb, 500, fontsel_timer); + fontsel_timer = rnd_gui->add_timer(rnd_gui, fontsel_timer_cb, 500, fontsel_timer); } static void fontsel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) @@ -282,8 +282,8 @@ void pcb_dlg_fontsel_uninit(void) { - if ((fontsel_timer_active) && (pcb_gui != NULL) && (pcb_gui->stop_timer != NULL)) - pcb_gui->stop_timer(pcb_gui, fontsel_timer); + if ((fontsel_timer_active) && (rnd_gui != NULL) && (rnd_gui->stop_timer != NULL)) + rnd_gui->stop_timer(rnd_gui, fontsel_timer); rnd_event_unbind_allcookie(fontsel_cookie); } Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 30980) @@ -98,11 +98,11 @@ /* update labels */ hv.str = pcb_strdup_printf("The file %s has changed on disk", PCB->hidlib.filename); - pcb_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[0], &hv); + rnd_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[0], &hv); free((char *)hv.str); hv.str = (PCB->Changed ? "Do you want to drop your changes and reload the file?" : "Do you want to reload the file?"); - pcb_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[1], &hv); + rnd_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[1], &hv); } else if (strcmp(cmd, "close") == 0) { if (active) { Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30980) @@ -147,7 +147,7 @@ /* disable comp for copper and outline */ enable = !(layer->meta.bound.type & PCB_LYT_COPPER) && !(layer->meta.bound.type & PCB_LYT_BOUNDARY); - pcb_gui->attr_dlg_widget_state(hid_ctx, w->comp, enable); + rnd_gui->attr_dlg_widget_state(hid_ctx, w->comp, enable); if (!enable) layer->comb = 0; /* copper and outline must be +manual */ @@ -170,10 +170,10 @@ if (PCB_LAYER_SIDED(layer->meta.bound.type)) { /* side & offset */ PCB_DAD_SET_VALUE(hid_ctx, w->side, lng, side2int(layer->meta.bound.type)); - pcb_gui->attr_dlg_widget_state(hid_ctx, w->side, 1); + rnd_gui->attr_dlg_widget_state(hid_ctx, w->side, 1); } else - pcb_gui->attr_dlg_widget_state(hid_ctx, w->side, 0); + rnd_gui->attr_dlg_widget_state(hid_ctx, w->side, 0); ofs = layer->meta.bound.stack_offs; if (ofs < 0) { @@ -184,8 +184,8 @@ /* enable offset only for copper */ enable = (layer->meta.bound.type & PCB_LYT_COPPER); - pcb_gui->attr_dlg_widget_state(hid_ctx, w->offs, enable); - pcb_gui->attr_dlg_widget_state(hid_ctx, w->from, enable); + rnd_gui->attr_dlg_widget_state(hid_ctx, w->offs, enable); + rnd_gui->attr_dlg_widget_state(hid_ctx, w->from, enable); /* real layer */ if (layer->meta.bound.real != NULL) @@ -193,7 +193,7 @@ else lid = ctx->no_layer; PCB_DAD_SET_VALUE(hid_ctx, w->layer, lng, lid); - pcb_gui->attr_dlg_widget_state(hid_ctx, w->layer, 0); + rnd_gui->attr_dlg_widget_state(hid_ctx, w->layer, 0); } } @@ -242,11 +242,11 @@ lb_dialog2data(hid_ctx, ctx); if (ctx->subc != NULL) { if (pcb_subc_rebind(ctx->pcb, ctx->subc) > 0) - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } else { /* buffer */ pcb_data_binding_update(ctx->pcb, ctx->data); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } lb_data2dialog(hid_ctx, ctx); /* update disables */ } @@ -371,7 +371,7 @@ PCB_DAD_DEFSIZE(dlg, 500, 500); PCB_DAD_NEW("layer_binding", dlg, "Layer bindings", &ctx, pcb_true, NULL); val.func = lb_attr_chg; - pcb_gui->attr_dlg_property(dlg_hid_ctx, RND_HATP_GLOBAL_CALLBACK, &val); + rnd_gui->attr_dlg_property(dlg_hid_ctx, RND_HATP_GLOBAL_CALLBACK, &val); lb_data2dialog(dlg_hid_ctx, &ctx); PCB_DAD_RUN(dlg); Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30980) @@ -123,7 +123,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); free(cursor_path); } return 0; @@ -173,7 +173,7 @@ pcb_pstk_draw_preview(PCB, &ps, layers, 0, 0, &e->view); - pcb_render->set_color(gc, rnd_color_black); + rnd_render->set_color(gc, rnd_color_black); pcb_hid_set_line_cap(gc, rnd_cap_round); pcb_hid_set_line_width(gc, -1); @@ -184,13 +184,13 @@ grid = ctx->dlg[ctx->wgrid].val.crd; for(x = 0; x < x2; x += grid) - pcb_render->draw_line(gc, x, y1, x, y2); + rnd_render->draw_line(gc, x, y1, x, y2); for(x = -grid; x > x1; x -= grid) - pcb_render->draw_line(gc, x, y1, x, y2); + rnd_render->draw_line(gc, x, y1, x, y2); for(y = 0; y < y2; y += grid) - pcb_render->draw_line(gc, x1, y, x2, y); + rnd_render->draw_line(gc, x1, y, x2, y); for(y = -grid; y > y1; y -= grid) - pcb_render->draw_line(gc, x1, y, x2, y); + rnd_render->draw_line(gc, x1, y, x2, y); /* draw the mark only */ for(n = 0; n < pcb_proto_num_layers; n++) @@ -231,7 +231,7 @@ ctx->proto_id = PCB_PADSTACK_INVALID; hv.str = NULL; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprev, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprev, &hv); } static void pstklib_update_prv(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -250,11 +250,11 @@ if (ctx->wlayerc[n] == widx) { hv.lng = 1; idx = n; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlayerv[n], &hv); /* current must be visible as well */ + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlayerv[n], &hv); /* current must be visible as well */ } else hv.lng = 0; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlayerc[n], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlayerc[n], &hv); } if (idx < 0) return; @@ -360,7 +360,7 @@ pstklib_data2dlg(ctx); sprintf(tmp, "%u", ctx->proto_id); hv.str = tmp; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); pstklib_proto_edit_common(ctx, data, ctx->proto_id, tab); } @@ -402,7 +402,7 @@ pcb_pstk_change_instance(ps, &to_pid, NULL, NULL, NULL, NULL); } - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } @@ -445,7 +445,7 @@ if (changed) { pcb_board_set_changed_flag(pcb_true); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } @@ -638,7 +638,7 @@ pcb_subc_t *sc; int type; rnd_hid_get_coords("Pick a subcircuit for padstack lib editing", &x, &y, 0); - type = pcb_search_obj_by_location(PCB_OBJ_SUBC, &r1, &r2, &r3, x, y, PCB_SLOP * pcb_pixel_slop); + type = pcb_search_obj_by_location(PCB_OBJ_SUBC, &r1, &r2, &r3, x, y, PCB_SLOP * rnd_pixel_slop); if (type != PCB_OBJ_SUBC) { RND_ACT_IRES(-1); return 0; Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30980) @@ -176,7 +176,7 @@ else hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtags, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtags, &hv); gds_uninit(&tmp); } @@ -186,11 +186,11 @@ pcb_tool_select_by_name(&PCB->hidlib, "buffer"); if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) != 0) library_update_preview(ctx, pcb_subclist_first(&PCB_PASTEBUFFER->Data->subc), NULL); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } ctx->timer_active = 0; - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 1); - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnopend, 0); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 1); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnopend, 0); } static void timed_update_preview_cb(rnd_hidval_t user_data) @@ -203,19 +203,19 @@ static void timed_update_preview(library_ctx_t *ctx, int active) { if (ctx->timer_active) { - pcb_gui->stop_timer(pcb_gui, ctx->timer); + rnd_gui->stop_timer(rnd_gui, ctx->timer); ctx->timer_active = 0; - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 1); - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnopend, 0); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 1); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnopend, 0); } if (active) { rnd_hidval_t user_data; user_data.ptr = ctx; - ctx->timer = pcb_gui->add_timer(pcb_gui, timed_update_preview_cb, 500, user_data); + ctx->timer = rnd_gui->add_timer(rnd_gui, timed_update_preview_cb, 500, user_data); ctx->timer_active = 1; - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 0); - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnopend, 1); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wpend, 0); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnopend, 1); } } @@ -232,7 +232,7 @@ param_entered = !ctx->pactive && (otext != NULL) && (strchr(otext, '(') != NULL); - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wedit, param_selected || param_entered); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wedit, param_selected || param_entered); } #include "dlg_library_param.c" @@ -296,7 +296,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtree, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtree, &hv); free(cursor_path); } } @@ -361,7 +361,7 @@ if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) != 0) library_update_preview(ctx, pcb_subclist_first(&PCB_PASTEBUFFER->Data->subc), l); update_edit_button(ctx); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } } @@ -372,7 +372,7 @@ library_param_dialog(ctx, NULL); hv.str = NULL; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wpreview, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wpreview, &hv); } @@ -578,7 +578,7 @@ if (name != NULL) { rnd_hid_attr_val_t hv; hv.str = name; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); } } @@ -712,7 +712,7 @@ PCB_DAD_NEW("library", library_ctx.dlg, "pcb-rnd Footprint Library", &library_ctx, pcb_false, library_close_cb); library_lib2dlg(&library_ctx); - pcb_gui->attr_dlg_widget_state(library_ctx.dlg_hid_ctx, library_ctx.wedit, 0); + rnd_gui->attr_dlg_widget_state(library_ctx.dlg_hid_ctx, library_ctx.wedit, 0); } const char pcb_acts_LibraryDialog[] = "libraryDialog()\n"; @@ -719,7 +719,7 @@ const char pcb_acth_LibraryDialog[] = "Open the library dialog."; fgw_error_t pcb_act_LibraryDialog(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { - if (strcmp(pcb_gui->name, "lesstif") == 0) + if (strcmp(rnd_gui->name, "lesstif") == 0) rnd_actionva(oargv[0].val.argv0.user_call_ctx, "DoWindows", "library"); else pcb_dlg_library(); Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 30980) @@ -99,7 +99,7 @@ assert(!"set_attr() can't set non-data field!\n"); return; } - pcb_gui->attr_dlg_set_value(ctx->pdlg_hid_ctx, ctx->pwid[pidx], &hv); + rnd_gui->attr_dlg_set_value(ctx->pdlg_hid_ctx, ctx->pwid[pidx], &hv); } static void library_param_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp); @@ -363,7 +363,7 @@ rnd_hid_attr_val_t hv; hv.str = cmd; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); free(cmd); timed_update_preview(ctx, 1); } @@ -497,7 +497,7 @@ filter_txt = ctx->example; hv.str = filter_txt; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); } if (filter_txt != NULL) { @@ -508,7 +508,7 @@ if (ctx->example != NULL) { filter_txt = ctx->example; hv.str = filter_txt; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wfilt, &hv); prm = strchr(filter_txt, '('); } } @@ -520,7 +520,7 @@ hv.str = ctx->descr.array; if (hv.str == NULL) hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->pdlg_hid_ctx, ctx->pwdesc, &hv); + rnd_gui->attr_dlg_set_value(ctx->pdlg_hid_ctx, ctx->pwdesc, &hv); timed_update_preview(ctx, 1); } Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30980) @@ -71,13 +71,13 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); if (rnd_strcasecmp(function, "Netlist") == 0) - name = pcb_gui->fileselect(pcb_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", RND_HID_FSD_READ, NULL); + name = rnd_gui->fileselect(rnd_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", RND_HID_FSD_READ, NULL); else if ((rnd_strcasecmp(function, "FootprintToBuffer") == 0) || (rnd_strcasecmp(function, "ElementToBuffer") == 0)) - name = pcb_gui->fileselect(pcb_gui, "Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", RND_HID_FSD_READ, NULL); + name = rnd_gui->fileselect(rnd_gui, "Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", RND_HID_FSD_READ, NULL); else if (rnd_strcasecmp(function, "LayoutToBuffer") == 0) - name = pcb_gui->fileselect(pcb_gui, "Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", RND_HID_FSD_READ, NULL); + name = rnd_gui->fileselect(rnd_gui, "Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", RND_HID_FSD_READ, NULL); else if (rnd_strcasecmp(function, "Layout") == 0) - name = pcb_gui->fileselect(pcb_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", RND_HID_FSD_READ, NULL); + name = rnd_gui->fileselect(rnd_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", RND_HID_FSD_READ, NULL); else { rnd_message(RND_MSG_ERROR, "Invalid subcommand for Load(): '%s'\n", function); RND_ACT_IRES(1); @@ -119,7 +119,7 @@ int selection = save->fmtsub->dlg[save->wfmt].val.lng; hv.lng = save->opt_tab[selection]; - pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wopts, &hv); + rnd_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wopts, &hv); } static void fmt_chg(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -140,7 +140,7 @@ /* turn off guessing becuase the user explicitly selected a format */ hv.lng = 0; - pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wguess, &hv); + rnd_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wguess, &hv); fn = (char *)res.d.s; @@ -208,18 +208,18 @@ rnd_hid_attr_val_t hv; save->fmt_chg_lock = 1; hv.lng = n; - pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wfmt, &hv); + rnd_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wfmt, &hv); save->fmt_chg_lock = 0; update_opts(save); - pcb_gui->attr_dlg_widget_hide(save->fmtsub->dlg_hid_ctx, save->wguess_err, 1); + rnd_gui->attr_dlg_widget_hide(save->fmtsub->dlg_hid_ctx, save->wguess_err, 1); fmt_chg(save->fmtsub->dlg_hid_ctx, save->fmtsub, save->fmtsub->dlg+save->wfmt); /* turn on guessing - was turned off by the call above */ hv.lng = 1; - pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wguess, &hv); + rnd_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wguess, &hv); return; } } - pcb_gui->attr_dlg_widget_hide(save->fmtsub->dlg_hid_ctx, save->wguess_err, 0); + rnd_gui->attr_dlg_widget_hide(save->fmtsub->dlg_hid_ctx, save->wguess_err, 0); } static void save_timer(rnd_hidval_t user_data) @@ -236,7 +236,7 @@ save->inited = 1; } - save->timer = pcb_gui->add_timer(pcb_gui, save_timer, 300, user_data); + save->timer = rnd_gui->add_timer(rnd_gui, save_timer, 300, user_data); if ((save->fmtsub->parent_poke != NULL) && (save->fmtsub->dlg_hid_ctx != NULL) && (save->fmtsub->dlg[save->wguess].val.lng)) { rnd_event_arg_t res; @@ -556,10 +556,10 @@ timer_ctx.ptr = &save; save.timer_active = 1; - save.timer = pcb_gui->add_timer(pcb_gui, save_timer, 300, timer_ctx); /* the timer needs to run at least once, to get some initialization done that can be done only after fmtsub got created */ - final_name = pcb_gui->fileselect(pcb_gui, prompt, NULL, name_in, NULL, NULL, "board", RND_HID_FSD_MAY_NOT_EXIST, fmtsub); + save.timer = rnd_gui->add_timer(rnd_gui, save_timer, 300, timer_ctx); /* the timer needs to run at least once, to get some initialization done that can be done only after fmtsub got created */ + final_name = rnd_gui->fileselect(rnd_gui, prompt, NULL, name_in, NULL, NULL, "board", RND_HID_FSD_MAY_NOT_EXIST, fmtsub); if (save.timer_active) - pcb_gui->stop_timer(pcb_gui, save.timer); + rnd_gui->stop_timer(rnd_gui, save.timer); free(name_in); free(save.fmt_tab_names); free(save.fmt_plug_data); Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30980) @@ -83,7 +83,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnetlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnetlist, &hv); } } return cursor_path; @@ -123,7 +123,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtermlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtermlist, &hv); free(cursor_path); } } @@ -232,7 +232,7 @@ rnd_message(RND_MSG_ERROR, "Internal error: netlist_button_cb() called from an invalid widget\n"); return; } - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void netlist_claim_obj_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -290,7 +290,7 @@ /* draw the board */ memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - pcbhl_expose_main(pcb_gui, e, &xform); + pcbhl_expose_main(rnd_gui, e, &xform); if (net != NULL) {/* restore object color */ for(n = 0, p = netlist_color_save.array; n < netlist_color_save.used; n+=2,p+=2) { @@ -435,7 +435,7 @@ { rnd_hid_attr_val_t hv; hv.dbl = 0.33; - pcb_gui->attr_dlg_set_value(netlist_ctx.dlg_hid_ctx, wvpan, &hv); + rnd_gui->attr_dlg_set_value(netlist_ctx.dlg_hid_ctx, wvpan, &hv); } netlist_data2dlg(&netlist_ctx); @@ -445,7 +445,7 @@ static const char pcb_acth_NetlistDialog[] = "Open the netlist dialog."; static fgw_error_t pcb_act_NetlistDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - if (strcmp(pcb_gui->name, "lesstif") == 0) + if (strcmp(rnd_gui->name, "lesstif") == 0) rnd_actionva(RND_ACT_HIDLIB, "DoWindows", "netlist"); else pcb_dlg_netlist(PCB); Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 30980) @@ -75,7 +75,7 @@ if (ts == NULL) return; - pcb_gui->attr_dlg_widget_hide(hid_ctx, pse->prsmirror, !pse->ps->smirror); + rnd_gui->attr_dlg_widget_hide(hid_ctx, pse->prsmirror, !pse->ps->smirror); htype = pcb_pstk_bbspan(pse->pcb, pse->ps, &top_gid, &bottom_gid, &proto); top_grp = pcb_get_layergrp(pse->pcb, top_gid); @@ -155,7 +155,7 @@ case PCB_BB_BB: s = "Slot geometry (blind and/or buried slot):"; break; case PCB_BB_INVALID: s = "Slot geometry (INVALID SLOT):"; break; } - pcb_gui->attr_dlg_widget_state(hid_ctx, pse->hdia, 0); + rnd_gui->attr_dlg_widget_state(hid_ctx, pse->hdia, 0); } else { s = "Hole geometry ():"; @@ -165,7 +165,7 @@ case PCB_BB_BB: s = "Hole geometry (blind and/or buried hole):"; break; case PCB_BB_INVALID: s = "Hole geometry (INVALID HOLE):"; break; } - pcb_gui->attr_dlg_widget_state(hid_ctx, pse->hdia, 1); + rnd_gui->attr_dlg_widget_state(hid_ctx, pse->hdia, 1); } PCB_DAD_SET_VALUE(hid_ctx, pse->hole_header, str, s); @@ -232,7 +232,7 @@ lock--; pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_chg_protodup(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -250,7 +250,7 @@ pcb_pstk_change_instance(pse->ps, &proto_id, NULL, NULL, NULL, NULL); pse_ps2dlg(hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_chg_instance(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -277,7 +277,7 @@ lock--; pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_chg_prname(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -306,7 +306,7 @@ lock--; pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_chg_hole(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -331,7 +331,7 @@ lock--; pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_chg_proto_clr(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -378,7 +378,7 @@ lock--; pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_shape_del(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -390,7 +390,7 @@ pse_ps2dlg(pse->parent_hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_shape_hshadow(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -402,7 +402,7 @@ pse_ps2dlg(pse->parent_hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_shape_auto(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -448,7 +448,7 @@ pse_ps2dlg(pse->parent_hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_shape_copy(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -482,7 +482,7 @@ pse_ps2dlg(pse->parent_hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_shape_swap(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -516,7 +516,7 @@ pse_ps2dlg(pse->parent_hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } @@ -544,7 +544,7 @@ pse_ps2dlg(pse->parent_hid_ctx, pse); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pse_shape_shrink(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -639,7 +639,7 @@ pse->shape_chg = NULL; PCB_DAD_FREE(dlg); pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } /* Auto gen shape on a single layer */ @@ -742,7 +742,7 @@ pse_ps2dlg(hid_ctx, pse); PCB_DAD_SET_VALUE(hid_ctx, pse->tab, lng, 1); /* switch to the prototype view where the new attributes are visible */ pse_changed(pse); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } #define spring(dlg) \ Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 30980) @@ -76,7 +76,7 @@ bbox.X1 = bbox.Y1 = 0; bbox.X2 = bbox.Y2 = PCB_MM_TO_COORD(10); pcb_dad_preview_zoomto(attrib, &bbox); - pcb_render->set_color(gc, rnd_color_red); + rnd_render->set_color(gc, rnd_color_red); pcb_text_draw_string_simple(NULL, tmp, PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 100, 0, 0, 0, 0, 0, 0); } } @@ -88,16 +88,16 @@ if ((obj->term != NULL) && (pcb_obj_parent_subc(obj) == ctx->tempsc) && (obj->term != NULL)) { val.str = obj->term; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_num, &val); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_num, &val); val.str = rnd_attribute_get(&obj->Attributes, "name"); if (val.str != NULL) - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_name, &val); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_name, &val); if (ctx->pcb != NULL) { { pcb_net_term_t *term = pcb_net_find_by_obj(&ctx->pcb->netlist[PCB_NETLIST_EDITED], obj); if (term != NULL) { val.str = term->parent.net->name; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_net, &val); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_net, &val); } } } @@ -115,9 +115,9 @@ rnd_hid_attr_val_t val; val.str = "n/a"; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_num, &val); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_name, &val); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_net, &val); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_num, &val); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_name, &val); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->w_lab_net, &val); type = pcb_search_obj_by_id_(ctx->data, &r1, &r2, &r3, ctx->subc_id, PCB_OBJ_SUBC); if (type != PCB_OBJ_SUBC) Index: trunk/src_plugins/dialogs/dlg_pref_color.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30980) @@ -74,7 +74,7 @@ pref_ctx_t *ctx = caller_data; const char *path = attr->user_data; rnd_conf_setf(ctx->role, path, -1, "%s", attr->val.clr.str); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pref_color_layer_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30980) @@ -204,23 +204,23 @@ if (nat == NULL) { hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wname, &hv); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wdesc, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wname, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wdesc, &hv); setup_intree(ctx, NULL, 0); hv.lng = RND_CFN_max; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnattype, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnattype, &hv); return; } hv.str = path == NULL ? "" : path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wname, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wname, &hv); tmp = rnd_strdup(nat->description); pcb_text_wrap(tmp, DESC_WRAP_WIDTH, '\n', ' '); hv.str = tmp; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wdesc, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wdesc, &hv); free(tmp); /* display lht value */ @@ -228,7 +228,7 @@ /* display native value */ hv.lng = nat->type; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnattype, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnattype, &hv); if ((nat->type == RND_CFN_LIST) || (nat->type == RND_CFN_HLIST)) { /* non-default: lists are manually loaded */ @@ -257,7 +257,7 @@ /* default: set the value of the given node from hv loaded above */ hv.str = print_conf_val(nat->type, &nat->val, buf, sizeof(buf)); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnatval[nat->type], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnatval[nat->type], &hv); src = nat->prop[idx].src; if (src != NULL) { @@ -266,7 +266,7 @@ } else hv.str = tmp = pcb_strdup_printf("prio: %d\nsource: ", nat->prop[idx].prio); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wsrc[nat->type], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wsrc[nat->type], &hv); free(tmp); return; @@ -483,12 +483,12 @@ { rnd_hid_attr_val_t hv; hv.dbl = 0.25; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wmainp, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wmainp, &hv); if (tabarg != NULL) { rnd_hid_attr_val_t hv; hv.str = rnd_strdup(tabarg); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wfilter, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wfilter, &hv); pcb_pref_dlg_conf_filter_cb(ctx->dlg_hid_ctx, ctx, &ctx->dlg[ctx->conf.wfilter]); pcb_dad_tree_expcoll(&ctx->dlg[ctx->conf.wtree], NULL, 1, 1); } Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30980) @@ -67,20 +67,20 @@ switch(ctx->nat->type) { case RND_CFN_STRING: hv.str = val; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case RND_CFN_BOOLEAN: case RND_CFN_INTEGER: hv.lng = atoi(val); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case RND_CFN_REAL: hv.dbl = strtod(val, NULL); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case RND_CFN_COORD: hv.crd = pcb_get_value(val, NULL, NULL, NULL); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case RND_CFN_UNIT: { @@ -89,13 +89,13 @@ hv.lng = u - pcb_units; else hv.lng = -1; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); } break; case RND_CFN_COLOR: hv.clr = ctx->nat->val.color[ctx->idx]; rnd_color_load_str(&hv.clr, val); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case RND_CFN_LIST: { @@ -191,7 +191,7 @@ else if (ctx->role == RND_CFR_DESIGN) pcb_board_set_changed_flag(1); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } static void pref_conf_editval_del_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *trigger_attr) @@ -397,10 +397,10 @@ if (is_read_only(ctx)) { int n; - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wnewval, 0); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wnewval, 0); for(n = 0; n < sizeof(b) / sizeof(b[0]); n++) if (b[n] != 0) - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, b[n], 0); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, b[n], 0); } Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30980) @@ -42,10 +42,10 @@ pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); int en = (r != NULL); - pcb_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wedit, en); - pcb_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wremove, en); - pcb_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wmoveup, en); - pcb_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wmovedown, en); + rnd_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wedit, en); + rnd_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wremove, en); + rnd_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wmoveup, en); + rnd_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wmovedown, en); } static void pref_lib_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) @@ -122,7 +122,7 @@ } hv.str = pref_ctx.lib.cursor_path; - if (pcb_gui->attr_dlg_set_value(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wlist, &hv) == 0) { + if (rnd_gui->attr_dlg_set_value(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wlist, &hv) == 0) { free(pref_ctx.lib.cursor_path); pref_ctx.lib.cursor_path = NULL; } @@ -220,7 +220,7 @@ pcb_dad_tree_insert(attr, prev, cell); pref_lib_dlg2conf(hid_ctx, caller_data, attr); hv.str = cell[0]; - pcb_gui->attr_dlg_set_value(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wlist, &hv); + rnd_gui->attr_dlg_set_value(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wlist, &hv); } } @@ -247,7 +247,7 @@ pcb_dad_tree_append(attr, next, cell); pref_lib_dlg2conf(hid_ctx, caller_data, attr); hv.str = cell[0]; - pcb_gui->attr_dlg_set_value(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wlist, &hv); + rnd_gui->attr_dlg_set_value(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wlist, &hv); } } Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30980) @@ -101,7 +101,7 @@ { char *fname; - fname = pcb_gui->fileselect(pcb_gui, "Save window geometry to...", + fname = rnd_gui->fileselect(rnd_gui, "Save window geometry to...", "Pick a file for saving window geometry to.\n", "win_geo.lht", ".lht", NULL, "wingeo", RND_HID_FSD_MAY_NOT_EXIST, NULL); Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 30980) @@ -109,21 +109,21 @@ wen = WIZ(ctx); for(r = 0; r < MAX_ROW; r++) { - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wrowbox[r],!ctx->visible[r][0]); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wrowbox[r],!ctx->visible[r][0]); for(c = 0; c < MAX_COL; c++) { - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wexpr[r][c], !ctx->visible[r][c]); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wexpr[r][c], !ctx->visible[r][c]); if (c > 0) - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wor[r][c], !((ctx->visible[r][c-1] && ctx->visible[r][c]))); - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wexpr_del[r][c], wen); - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wexpr_edit[r][c], wen); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wor[r][c], !((ctx->visible[r][c-1] && ctx->visible[r][c]))); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wexpr_del[r][c], wen); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wexpr_edit[r][c], wen); } - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnew_or[r], !ctx->visible[r][0]); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wnew_or[r], !ctx->visible[r][0]); if (r > 0) - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wand[r], !((ctx->visible[r-1][0] && ctx->visible[r][0]))); - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wnew_or[r], wen); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wand[r], !((ctx->visible[r-1][0] && ctx->visible[r][0]))); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wnew_or[r], wen); } - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wnew_and, wen); - pcb_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wexpr_str, !wen); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wnew_and, wen); + rnd_gui->attr_dlg_widget_state(ctx->dlg_hid_ctx, ctx->wexpr_str, !wen); } /* look up row and col for a widget attr in a [row][col] widget idx array; returns 0 on success */ @@ -174,12 +174,12 @@ gds_init(&buf); append_expr(&buf, e, '\n'); hv.str = buf.array; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wexpr_lab[row][col], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wexpr_lab[row][col], &hv); gds_uninit(&buf); } else { hv.str = NEW_EXPR_LAB; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wexpr_lab[row][col], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wexpr_lab[row][col], &hv); } } @@ -208,7 +208,7 @@ gds_append(&buf, ')'); } hv.str = buf.array; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wexpr_str, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wexpr_str, &hv); gds_uninit(&buf); } Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30980) @@ -105,7 +105,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wop, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wop, &hv); free(cursor_path); } if (cur != NULL) @@ -137,7 +137,7 @@ if ((s != NULL) && (s->right != NULL)) { rnd_hid_attr_val_t hv; hv.str = s->right; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[RIGHT_CONST], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[RIGHT_CONST], &hv); } } @@ -151,7 +151,7 @@ return; for(n = 0; n < RIGHT_max; n++) - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wright[n], 1); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wright[n], 1); hv.str = ctx->se.right; if (hv.str == NULL) { @@ -161,23 +161,23 @@ switch(s->expr->rtype) { case RIGHT_STR: - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); break; case RIGHT_INT: hv.lng = strtol(hv.str, NULL, 10); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); if (empty) set_right(ctx, &ctx->dlg[ctx->wright[s->expr->rtype]]); break; case RIGHT_DOUBLE: hv.dbl = strtod(hv.str, NULL); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); if (empty) set_right(ctx, &ctx->dlg[ctx->wright[s->expr->rtype]]); break; case RIGHT_COORD: hv.crd = pcb_get_value_ex(hv.str, NULL, NULL, NULL, "mm", NULL); - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); if (empty) set_right(ctx, &ctx->dlg[ctx->wright[s->expr->rtype]]); break; @@ -185,7 +185,7 @@ case RIGHT_max: break; } - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], 0); + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], 0); ctx->last_rtype = s->expr->rtype; } @@ -351,7 +351,7 @@ if (fill_in_left(ctx) != 1) { srch_expr_set_ops(ctx, op_tab, 1); /* just to get the initial tree widget width */ - pcb_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wright[RIGHT_CONST], 0); /* just to get something harmless display on the right side after open */ + rnd_gui->attr_dlg_widget_hide(ctx->dlg_hid_ctx, ctx->wright[RIGHT_CONST], 0); /* just to get something harmless display on the right side after open */ } res = PCB_DAD_RUN(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 30980) @@ -293,9 +293,9 @@ st = !st; val.lng = (val.lng + 1) % 3; -/* pcb_gui->attr_dlg_widget_state(hid_ctx, attr_idx, st);*/ +/* rnd_gui->attr_dlg_widget_state(hid_ctx, attr_idx, st);*/ - pcb_gui->attr_dlg_set_value(hid_ctx, attr_idx, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, attr_idx, &val); } static void pcb_act_spin_reset(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -307,9 +307,9 @@ hv.dbl = 42.0; hv.crd = PCB_MM_TO_COORD(42); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_int, &hv); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_double, &hv); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_coord, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_int, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_double, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_coord, &hv); } static void pcb_act_spin_upd(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -321,11 +321,11 @@ hv.str = tmp; sprintf(tmp, "%ld", ctx->dlg[ctx->wspin_int].val.lng); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_int, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_int, &hv); sprintf(tmp, "%f", ctx->dlg[ctx->wspin_double].val.dbl); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_double, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_double, &hv); pcb_snprintf(tmp, sizeof(tmp), "%mm\n%ml", ctx->dlg[ctx->wspin_coord].val.crd, ctx->dlg[ctx->wspin_coord].val.crd); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_coord, &hv); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_coord, &hv); } @@ -342,7 +342,7 @@ printf("Jumping tabs\n"); val.lng = 0; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wtab, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wtab, &val); } static void cb_ttbl_insert(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -358,7 +358,7 @@ new_row->user_data2.lng = 1; val.dbl = (double)ctx->ttctr / 20.0; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wprog, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wprog, &val); } static void cb_ttbl_append(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -374,7 +374,7 @@ new_row->user_data2.lng = 1; val.dbl = (double)ctx->ttctr / 20.0; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wprog, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wprog, &val); } static void cb_ttbl_jump(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -383,7 +383,7 @@ rnd_hid_attr_val_t val; val.str = "two/under_two"; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->tt, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->tt, &val); } static void ttbl_filt(gdl_list_t *list, int hide) @@ -437,8 +437,8 @@ rnd_hid_attr_val_t val; val.dbl = 0.3; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->whpane, &val); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wvpane, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->whpane, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wvpane, &val); } static void cb_text_replace(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -488,7 +488,7 @@ o = txt->hid_get_offs(attr, hid_ctx); sprintf(buf, "cursor after edit: line %ld col %ld offs %ld", y, x, o); val.str = buf; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wtxtpos, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wtxtpos, &val); } static void cb_text_offs(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -510,7 +510,7 @@ static void prv_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { - pcb_render->set_color(gc, rnd_color_red); + rnd_render->set_color(gc, rnd_color_red); pcb_text_draw_string_simple(NULL, "foo", PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 500, 10.0, 0, 0, 0, 0, 0); printf("expose in dlg_test!\n"); @@ -537,6 +537,6 @@ rnd_hid_attr_val_t val; rnd_color_load_str(&val.clr, "#005599"); - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val); } Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30980) @@ -110,7 +110,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); free(cursor_path); } } Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30979) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30980) @@ -125,7 +125,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); free(cursor_path); } } @@ -243,7 +243,7 @@ pcb_draw_force_termlab = 1; memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - pcbhl_expose_main(pcb_gui, e, &xform); + pcbhl_expose_main(rnd_gui, e, &xform); pcb_draw_force_termlab = old_termlab; /* restore object color */ @@ -276,7 +276,7 @@ return; hv.str = NULL; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprev, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprev, &hv); } @@ -382,7 +382,7 @@ } } pcb_view_save_list_end(&tmp, NULL); - pcb_gui->clip_set(pcb_gui, RND_HID_CLIPFMT_TEXT, tmp.array, tmp.used+1); + rnd_gui->clip_set(rnd_gui, RND_HID_CLIPFMT_TEXT, tmp.array, tmp.used+1); gds_uninit(&tmp); if (cut) view2dlg_list(ctx); @@ -408,16 +408,16 @@ vt = pcb_view_by_uid(ctx->lst, r->user_data2.lng); } - if (pcb_gui->clip_get(pcb_gui, &cformat, &cdata, &clen) != 0) + if (rnd_gui->clip_get(rnd_gui, &cformat, &cdata, &clen) != 0) return; if (cformat != RND_HID_CLIPFMT_TEXT) { - pcb_gui->clip_free(pcb_gui, cformat, cdata, clen); + rnd_gui->clip_free(rnd_gui, cformat, cdata, clen); return; } load_ctx = pcb_view_load_start_str(cdata); - pcb_gui->clip_free(pcb_gui, cformat, cdata, clen); + rnd_gui->clip_free(rnd_gui, cformat, cdata, clen); if (load_ctx == NULL) return; @@ -441,7 +441,7 @@ char *fn; FILE *f; - fn = pcb_gui->fileselect(pcb_gui, "Save view list", "Save all views from the list", "view.lht", "lht", NULL, "view", 0, NULL); + fn = rnd_gui->fileselect(rnd_gui, "Save view list", "Save all views from the list", "view.lht", "lht", NULL, "view", 0, NULL); if (fn == NULL) return; @@ -470,7 +470,7 @@ FILE *f; void *load_ctx; - fn = pcb_gui->fileselect(pcb_gui, "Load view list", "Load all views from the list", "view.lht", "lht", NULL, "view", RND_HID_FSD_READ, NULL); + fn = rnd_gui->fileselect(rnd_gui, "Load view list", "Load all views from the list", "view.lht", "lht", NULL, "view", RND_HID_FSD_READ, NULL); if (fn == NULL) return; Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 30979) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 30980) @@ -120,12 +120,12 @@ t.fid = 0; /* use the default font */ t.Flags = pcb_no_flags(); - if (pcb_gui->gui) { /* it is unreadable on black&white and on most exporters */ - pcb_render->set_color(gc, bgcolor); + if (rnd_gui->gui) { /* it is unreadable on black&white and on most exporters */ + rnd_render->set_color(gc, bgcolor); pcb_text_draw_(&def_info, &t, 1000000, 0, PCB_TXT_TINY_ACCURATE); } - pcb_render->set_color(gc, fgcolor); + rnd_render->set_color(gc, fgcolor); pcb_text_draw_(&def_info, &t, 0, 0, PCB_TXT_TINY_ACCURATE); return &t; @@ -432,7 +432,7 @@ static void draw_hover_label(rnd_hid_gc_t gc, const char *str) { int x0 = PCB_MM_TO_COORD(2.5); /* compensate for the mouse cursor (sort of random) */ - pcb_render->set_color(gc, &COLOR_ANNOT); + rnd_render->set_color(gc, &COLOR_ANNOT); dtext_(cx+x0, cy, 250, 0, str, PCB_MM_TO_COORD(0.01)); } @@ -445,7 +445,7 @@ reset_layer_coords(); csect_gc = gc; - pcb_render->set_color(gc, &COLOR_ANNOT); + rnd_render->set_color(gc, &COLOR_ANNOT); dtext(0, 0, 500, 0, "Board cross section"); /* draw physical layers */ @@ -499,7 +499,7 @@ else continue; - pcb_render->set_color(gc, color); + rnd_render->set_color(gc, color); dhrect(0, y, GROUP_WIDTH_MM, y+th, 1, 0.5, stepf, stepb, OMIT_LEFT | OMIT_RIGHT); dtext_bg(gc, 5, y, 200, 0, g->name, &COLOR_BG, &COLOR_ANNOT); reg_group_coords(gid, PCB_MM_TO_COORD(y), PCB_MM_TO_COORD(y+th)); @@ -549,7 +549,7 @@ pcb_text_t *t; if (g->len > 0) { pcb_layer_t *l = &PCB->Data->Layer[g->lid[0]]; - pcb_render->set_color(gc, &l->meta.real.color); + rnd_render->set_color(gc, &l->meta.real.color); t = dtext_bg(gc, 1, y, 200, 0, l->name, &COLOR_BG, &l->meta.real.color); pcb_text_bbox(pcb_font(PCB, 0, 1), t); dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE); @@ -557,7 +557,7 @@ reg_layer_coords(g->lid[0], t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2+PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(y+4)); } else { - pcb_render->set_color(gc, &COLOR_OUTLINE); + rnd_render->set_color(gc, &COLOR_OUTLINE); t = dtext_bg(gc, 1, y, 200, 0, "", &COLOR_BG, &COLOR_OUTLINE); pcb_text_bbox(pcb_font(PCB, 0, 1), t); dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE); @@ -580,7 +580,7 @@ if (DRAGGING) { - pcb_render->set_color(gc, rnd_color_black); + rnd_render->set_color(gc, rnd_color_black); /* draw the actual operation */ if (drag_addgrp) { Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 30979) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 30980) @@ -62,13 +62,13 @@ static void fab_line(rnd_hid_gc_t gc, int x1, int y1, int x2, int y2) { - pcb_render->draw_line(gc, x1, y1, x2, y2); + rnd_render->draw_line(gc, x1, y1, x2, y2); } static void fab_circle(rnd_hid_gc_t gc, int x, int y, int r) { - pcb_render->draw_arc(gc, x, y, r, r, 0, 180); - pcb_render->draw_arc(gc, x, y, r, r, 180, 180); + rnd_render->draw_arc(gc, x, y, r, r, 0, 180); + rnd_render->draw_arc(gc, x, y, r, r, 180, 180); } /* align is 0=left, 1=center, 2=right, add 8 for underline */ @@ -181,12 +181,12 @@ pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10)); PCB_LINE_LOOP(layer); { - pcb_render->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); + rnd_render->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); } PCB_END_LOOP; PCB_ARC_LOOP(layer); { - pcb_render->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); + rnd_render->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); } PCB_END_LOOP; PCB_TEXT_LOOP(layer); @@ -235,7 +235,7 @@ plated_sym = --ds; if (drill->UnplatedCount) unplated_sym = --ds; - pcb_render->set_color(gc, &conf_core.appearance.color.pin); + rnd_render->set_color(gc, &conf_core.appearance.color.pin); for (i = 0; i < drill->PinN; i++) { int unplated = 1; rnd_coord_t x, y; @@ -262,7 +262,7 @@ text_at(info, gc, PCB_MIL_TO_COORD(1400), yoff, PCB_MIL_TO_COORD(2), "NO"); text_at(info, gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->UnplatedCount); } - pcb_render->set_color(gc, &conf_core.appearance.color.element); + rnd_render->set_color(gc, &conf_core.appearance.color.element); if (pcbhl_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL) text_at(info, gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize)); else @@ -278,7 +278,7 @@ total_drills += drill->ViaCount; } - pcb_render->set_color(gc, &conf_core.appearance.color.element); + rnd_render->set_color(gc, &conf_core.appearance.color.element); text_at(info, gc, 0, yoff, PCB_MIL_TO_COORD(9), "Symbol"); if (pcbhl_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL) text_at(info, gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (Inch)"); @@ -308,10 +308,10 @@ } if (!found) { pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10)); - pcb_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0); - pcb_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y); - pcb_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); - pcb_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0); + rnd_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y); + rnd_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); /*FPrintOutline (); */ pcb_hid_set_line_width(gc, FAB_LINE_W); text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0, Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 30979) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 30980) @@ -87,13 +87,13 @@ int w = 2, h = 2; float th = 0.1, th2 = 0.4; - pcb_render->set_color(gc, rnd_color_black); + rnd_render->set_color(gc, rnd_color_black); dline(x0, y0, x0+w, y0, th); dline(x0+w, y0, x0+w, y0+h, th); dline(x0+w, y0+h, x0, y0+h, th); dline(x0, y0+h, x0, y0, th); if (checked) { - pcb_render->set_color(gc, rnd_color_red); + rnd_render->set_color(gc, rnd_color_red); dline(x0, y0, x0+w, y0+h, th2); dline(x0, y0+h, x0+w, y0, th2); } @@ -121,7 +121,7 @@ dchkbox(gc, x-4, *y, (f->id == target_fid)); - pcb_render->set_color(gc, rnd_color_black); + rnd_render->set_color(gc, rnd_color_black); t = dtext(x, *y, 200, f->id, buf); pcb_text_bbox(pcb_font(PCB, f->id, 1), t); @@ -183,7 +183,7 @@ default: break; } - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } return 1; } Index: trunk/src_plugins/drc_orig/drc_orig.c =================================================================== --- trunk/src_plugins/drc_orig/drc_orig.c (revision 30979) +++ trunk/src_plugins/drc_orig/drc_orig.c (revision 30980) @@ -380,7 +380,7 @@ pcb_hid_progress(0, 0, NULL); pcb_layervis_restore_stack(); rnd_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30979) +++ trunk/src_plugins/drc_query/dlg.c (revision 30980) @@ -118,7 +118,7 @@ pcb_hid_text_t *txt = atxt->wdata; char *script = txt->hid_get_text(atxt, hid_ctx); pcb_view_list_t *view = calloc(sizeof(pcb_view_list_t), 1); - pcb_board_t *pcb = (pcb_board_t *)pcb_gui->get_dad_hidlib(hid_ctx); + pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx); drc_qry_exec(NULL, pcb, view, ctx->rule, ctx->dlg[ctx->wtype].val.str, @@ -416,7 +416,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); free(cursor_path); r = pcb_dad_tree_get_selected(attr); @@ -488,7 +488,7 @@ const char *script; rnd_conf_role_t role; pcb_view_list_t *view; - pcb_board_t *pcb = (pcb_board_t *)pcb_gui->get_dad_hidlib(hid_ctx); + pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx); rlist_fetch(); rlist_fetch_nd(); @@ -520,19 +520,19 @@ hv.str = nd->name; if (hv.str == NULL) hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wrule, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wrule, &hv); hv.str = textval(nd, "type"); if (hv.str == NULL) hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); hv.str = textval(nd, "title"); if (hv.str == NULL) hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtitle, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtitle, &hv); hv.str = textval(nd, "desc"); if (hv.str == NULL) hv.str = ""; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wdesc, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wdesc, &hv); gds_init(&tmp); st = pcb_drcq_stat_get(nd->name); @@ -546,7 +546,7 @@ pcb_append_printf(&tmp, "\nAverage violations: %.2f", (double)st->sum_hit_cnt / (double)st->run_cnt); } hv.str = tmp.array; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wstat, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wstat, &hv); gds_uninit(&tmp); } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30979) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30980) @@ -609,10 +609,10 @@ pcb_hid_set_line_width(gc, conf_core.design.min_wid); else pcb_hid_set_line_width(gc, AUTO_OUTLINE_WIDTH); - pcb_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0); - pcb_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y); - pcb_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); - pcb_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0); + rnd_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y); + rnd_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); pcb_hid_destroy_gc(gc); } } Index: trunk/src_plugins/export_oldconn/oldconn.c =================================================================== --- trunk/src_plugins/export_oldconn/oldconn.c (revision 30979) +++ trunk/src_plugins/export_oldconn/oldconn.c (revision 30980) @@ -203,7 +203,7 @@ PCB_END_LOOP; if (conf_core.editor.beep_when_finished) - pcb_gui->beep(pcb_gui); + rnd_gui->beep(rnd_gui); if (do_select) { pcb_undo_inc_serial(); @@ -216,7 +216,7 @@ { pcb_print_subc_conns(f, subc); if (conf_core.editor.beep_when_finished) - pcb_gui->beep(pcb_gui); + rnd_gui->beep(rnd_gui); } /* Find all connections from all terminals of all subcircuits and print in f. */ @@ -230,7 +230,7 @@ PCB_END_LOOP; if (conf_core.editor.beep_when_finished) - pcb_gui->beep(pcb_gui); + rnd_gui->beep(rnd_gui); pcb_hid_redraw(PCB); } Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30979) +++ trunk/src_plugins/export_openems/excitation.c (revision 30980) @@ -93,7 +93,7 @@ else hv.lng = 0; - pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); + rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); } } #endif @@ -123,7 +123,7 @@ else hv.dbl = 0; - pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); + rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); } } @@ -137,7 +137,7 @@ hv.str = ser_load(attrkey); if (hv.str == NULL) hv.str = ""; - pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); + rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); } } @@ -375,8 +375,8 @@ exc_ctx.selected = 0; } - pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wtab, &hv); - pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wselector, &hv); + rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wtab, &hv); + rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wselector, &hv); if (setattr) { const char *orig = rnd_attribute_get(&PCB->Attributes, "openems::excitation::type"); if ((orig == NULL) || (strcmp(orig, excitations[exc_ctx.selected].name) != 0)) { Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 30979) +++ trunk/src_plugins/export_openems/mesh.c (revision 30980) @@ -969,7 +969,7 @@ FILE *f; gds_t tmp; - fname = pcb_gui->fileselect(pcb_gui, "Save mesh settings...", + fname = rnd_gui->fileselect(rnd_gui, "Save mesh settings...", "Picks file for saving mesh settings.\n", default_file, ".lht", NULL, "mesh", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (fname == NULL) @@ -999,7 +999,7 @@ char *fname = NULL; FILE *f; - fname = pcb_gui->fileselect(pcb_gui, "Load mesh settings...", + fname = rnd_gui->fileselect(rnd_gui, "Load mesh settings...", "Picks file for loading mesh settings from.\n", default_file, ".lht", NULL, "mesh", RND_HID_FSD_READ, NULL); if (fname == NULL) @@ -1042,7 +1042,7 @@ mesh.ui_layer_xy->name = rnd_strdup(mesh.ui_name_xy); rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } pcb_mesh_t *pcb_mesh_get(const char *name) Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 30979) +++ trunk/src_plugins/export_ps/ps.c (revision 30980) @@ -569,7 +569,7 @@ global.linewidth = -1; /* reset static vars */ - ps_set_layer_group(pcb_render, -1, NULL, -1, -1, 0, -1, NULL); + ps_set_layer_group(rnd_render, -1, NULL, -1, -1, 0, -1, NULL); use_gc(NULL); global.exps.view.X1 = 0; @@ -592,7 +592,7 @@ global.pagecount = 1; /* Reset 'pagecount' if single file */ global.doing_toc = 0; - ps_set_layer_group(pcb_render, -1, NULL, -1, -1, 0, -1, NULL); /* reset static vars */ + ps_set_layer_group(rnd_render, -1, NULL, -1, -1, 0, -1, NULL); /* reset static vars */ pcbhl_expose_main(&ps_hid, &global.exps, xform); if (the_file) Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 30979) +++ trunk/src_plugins/extedit/extedit.c (revision 30980) @@ -121,7 +121,7 @@ GUI toolkit won't have a chance to handle expose events */ fc = pcb_popen(&PCB->hidlib, cmd, "r"); - if (pcb_gui != NULL) { + if (rnd_gui != NULL) { int fd = rnd_fileno(fc); if (fd > 0) { int n = 0; @@ -131,9 +131,9 @@ ctx.stay = 1; ctx.fc = fc; hd.ptr = &ctx; - ctx.wid = pcb_gui->watch_file(pcb_gui, fd, RND_WATCH_READABLE | RND_WATCH_HANGUP, extedit_fd_watch, hd); + ctx.wid = rnd_gui->watch_file(rnd_gui, fd, RND_WATCH_READABLE | RND_WATCH_HANGUP, extedit_fd_watch, hd); while(ctx.stay) { - if (pcb_gui != NULL) { + if (rnd_gui != NULL) { n++; pcb_hid_progress(50+sin((double)n/10.0)*40, 100, "Invoked external editor. Please edit, save and close there to finish this operation"); } @@ -146,7 +146,7 @@ else { old_wait:; - if (pcb_gui != NULL) { + if (rnd_gui != NULL) { pcb_hid_progress(50, 100, "Invoked external editor. Please edit, save and close there to finish this operation"); rnd_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */ } @@ -157,7 +157,7 @@ } pclose(fc); - if (pcb_gui != NULL) + if (rnd_gui != NULL) pcb_hid_progress(0, 0, NULL); free(cmd); } @@ -322,8 +322,8 @@ case EEF_max: break; } - if (pcb_gui != NULL) - pcb_gui->invalidate_all(pcb_gui); + if (rnd_gui != NULL) + rnd_gui->invalidate_all(rnd_gui); quit1:; if (tmp_fn != NULL) Index: trunk/src_plugins/extedit/extedit_dad.c =================================================================== --- trunk/src_plugins/extedit/extedit_dad.c (revision 30979) +++ trunk/src_plugins/extedit/extedit_dad.c (revision 30980) @@ -42,7 +42,7 @@ PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str, rnd_strdup(methods[ee->mthi].command)); /* we have only one format, so disable the combo box for selecting it */ - pcb_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, pcb_false); + rnd_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, pcb_false); } static void ee_chg_method(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) Index: trunk/src_plugins/exto_std/bus.c =================================================================== --- trunk/src_plugins/exto_std/bus.c (revision 30979) +++ trunk/src_plugins/exto_std/bus.c (revision 30980) @@ -223,7 +223,7 @@ bus_unpack(subc); bus = subc->extobj_data; - pcb_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.extobj); + rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.extobj); pcb_hid_set_line_width(pcb_draw_out.fgGC, -1); for(l = linelist_first(&ly->Line); l != NULL; l = linelist_next(l)) { @@ -237,7 +237,7 @@ x = l->Point1.X; y = l->Point1.Y; for(o = 0; o < len; o += PCB_MM_TO_COORD(5), x += vx*PCB_MM_TO_COORD(5), y += vy*PCB_MM_TO_COORD(5)) - pcb_render->draw_line(pcb_draw_out.fgGC, + rnd_render->draw_line(pcb_draw_out.fgGC, x + nx * bus->vthickness/2, y + ny * bus->vthickness/2, x - nx * bus->vthickness/2, y - ny * bus->vthickness/2); } Index: trunk/src_plugins/exto_std/line_of_vias.c =================================================================== --- trunk/src_plugins/exto_std/line_of_vias.c (revision 30979) +++ trunk/src_plugins/exto_std/line_of_vias.c (revision 30980) @@ -168,10 +168,10 @@ line_geo_calc(line); selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, line); - pcb_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.extobj); + rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.extobj); pcb_hid_set_line_width(pcb_draw_out.fgGC, -1); - pcb_render->draw_line(pcb_draw_out.fgGC, x1 - dy * +disp, y1 + dx * +disp, x2 - dy * +disp, y2 + dx * +disp); - pcb_render->draw_line(pcb_draw_out.fgGC, x1 - dy * -disp, y1 + dx * -disp, x2 - dy * -disp, y2 + dx * -disp); + rnd_render->draw_line(pcb_draw_out.fgGC, x1 - dy * +disp, y1 + dx * +disp, x2 - dy * +disp, y2 + dx * +disp); + rnd_render->draw_line(pcb_draw_out.fgGC, x1 - dy * -disp, y1 + dx * -disp, x2 - dy * -disp, y2 + dx * -disp); pcb_hid_set_line_width(pcb_draw_out.fgGC, -2); ax = x1 + dx * arrow; @@ -180,9 +180,9 @@ ay1 = y1 + dx * +arrow; ax2 = x1 - dy * -arrow; ay2 = y1 + dx * -arrow; - pcb_render->draw_line(pcb_draw_out.fgGC, ax1, ay1, ax2, ay2); - pcb_render->draw_line(pcb_draw_out.fgGC, ax1, ay1, ax, ay); - pcb_render->draw_line(pcb_draw_out.fgGC, ax2, ay2, ax, ay); + rnd_render->draw_line(pcb_draw_out.fgGC, ax1, ay1, ax2, ay2); + rnd_render->draw_line(pcb_draw_out.fgGC, ax1, ay1, ax, ay); + rnd_render->draw_line(pcb_draw_out.fgGC, ax2, ay2, ax, ay); } static void pcb_line_of_vias_draw_mark(pcb_draw_info_t *info, pcb_subc_t *subc) Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30979) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30980) @@ -430,7 +430,7 @@ static void ghid_gdk_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { - pcb_gui->coord_per_pix = ghidgui->port.view.coord_per_px; + rnd_gui->coord_per_pix = ghidgui->port.view.coord_per_px; } typedef struct { @@ -1171,7 +1171,7 @@ is not expected to occur, but we will try to handle it gracefully. As we know the crosshair will have been shown already, we must repaint the entire view to be sure not to leave an artaefact. */ - ghid_gdk_invalidate_all(pcb_gui); + ghid_gdk_invalidate_all(rnd_gui); return; } @@ -1205,7 +1205,7 @@ is not expected to occur, but we will try to handle it gracefully. As we know the mark will have been shown already, we must repaint the entire view to be sure not to leave an artaefact. */ - ghid_gdk_invalidate_all(pcb_gui); + ghid_gdk_invalidate_all(rnd_gui); return; } @@ -1441,7 +1441,7 @@ { } -static gboolean ghid_gdk_preview_expose(GtkWidget *widget, pcb_gtk_expose_t *ev, pcb_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx) +static gboolean ghid_gdk_preview_expose(GtkWidget *widget, pcb_gtk_expose_t *ev, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx) { GdkWindow *window = gtkc_widget_get_window(widget); GdkDrawable *save_drawable; @@ -1461,7 +1461,7 @@ save_view = ghidgui->port.view; save_width = ghidgui->port.view.canvas_width; save_height = ghidgui->port.view.canvas_height; - save_cpp = pcb_gui->coord_per_pix; + save_cpp = rnd_gui->coord_per_pix; gtkc_widget_get_allocation(widget, &allocation); xz = vw / (double)allocation.width; @@ -1485,7 +1485,7 @@ PCB_GTK_PREVIEW_TUNE_EXTENT(ctx, allocation); /* call the drawing routine */ - pcb_gui->coord_per_pix = ghidgui->port.view.coord_per_px; + rnd_gui->coord_per_pix = ghidgui->port.view.coord_per_px; expcall(>k2_gdk_hid, ctx); /* restore the original context and priv */ @@ -1492,7 +1492,7 @@ ctx->view.X1 = ox1; ctx->view.X2 = ox2; ctx->view.Y1 = oy1; ctx->view.Y2 = oy2; priv->out_pixel = priv->base_pixel = save_drawable; - pcb_gui->coord_per_pix = save_cpp; + rnd_gui->coord_per_pix = save_cpp; ghidgui->port.view = save_view; ghidgui->port.view.canvas_width = save_width; ghidgui->port.view.canvas_height = save_height; Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 30979) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 30980) @@ -64,7 +64,7 @@ void ghid_gl_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { - pcb_gui->coord_per_pix = ghidgui->port.view.coord_per_px; + rnd_gui->coord_per_pix = ghidgui->port.view.coord_per_px; } static const gchar *get_color_name(pcb_gtk_color_t *color) @@ -823,7 +823,7 @@ return; } -static gboolean ghid_gl_preview_expose(GtkWidget *widget, pcb_gtk_expose_t *ev, pcb_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx) +static gboolean ghid_gl_preview_expose(GtkWidget *widget, pcb_gtk_expose_t *ev, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx) { GdkGLContext *pGlContext = gtk_widget_get_gl_context(widget); GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable(widget); @@ -842,7 +842,7 @@ save_view = ghidgui->port.view; save_width = ghidgui->port.view.canvas_width; save_height = ghidgui->port.view.canvas_height; - save_cpp = pcb_gui->coord_per_pix; + save_cpp = rnd_gui->coord_per_pix; /* Setup zoom factor for drawing routines */ gtkc_widget_get_allocation(widget, &allocation); @@ -898,7 +898,7 @@ glScalef((pcbhl_conf.editor.view.flip_x ? -1. : 1.) / ghidgui->port.view.coord_per_px, (pcbhl_conf.editor.view.flip_y ? -1. : 1.) / ghidgui->port.view.coord_per_px, 1); glTranslatef(pcbhl_conf.editor.view.flip_x ? ghidgui->port.view.x0 - hidlib->size_x : -ghidgui->port.view.x0, pcbhl_conf.editor.view.flip_y ? ghidgui->port.view.y0 - hidlib->size_y : -ghidgui->port.view.y0, 0); - pcb_gui->coord_per_pix = ghidgui->port.view.coord_per_px; + rnd_gui->coord_per_pix = ghidgui->port.view.coord_per_px; expcall(>k2_gl_hid, ctx); drawgl_flush(); @@ -918,7 +918,7 @@ ctx->view.X2 = ox2; ctx->view.Y1 = oy1; ctx->view.Y2 = oy2; - pcb_gui->coord_per_pix = save_cpp; + rnd_gui->coord_per_pix = save_cpp; ghidgui->port.view = save_view; ghidgui->port.view.canvas_width = save_width; ghidgui->port.view.canvas_height = save_height; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30979) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30980) @@ -846,7 +846,7 @@ set_scroll(hscroll, view_left_x, view_width, ltf_hidlib->size_x); set_scroll(vscroll, view_top_y, view_height, ltf_hidlib->size_y); - lesstif_invalidate_all(pcb_gui); + lesstif_invalidate_all(rnd_gui); } static void zoom_max() @@ -858,7 +858,7 @@ view_left_x = -(view_width * new_zoom - ltf_hidlib->size_x) / 2; view_top_y = -(view_height * new_zoom - ltf_hidlib->size_y) / 2; view_zoom = new_zoom; - pcb_pixel_slop = view_zoom; + rnd_pixel_slop = view_zoom; lesstif_pan_fixup(); } @@ -895,7 +895,7 @@ if (view_zoom != new_zoom) { view_zoom = new_zoom; - pcb_pixel_slop = view_zoom; + rnd_pixel_slop = view_zoom; view_left_x = cx - view_width * xfrac * view_zoom; view_top_y = cy - view_height * yfrac * view_zoom; @@ -915,7 +915,7 @@ if (view_zoom != new_zoom) { view_zoom = new_zoom; - pcb_pixel_slop = view_zoom; + rnd_pixel_slop = view_zoom; } view_left_x = x1; @@ -1239,7 +1239,7 @@ static void scroll_callback(Widget scroll, int *view_dim, XmScrollBarCallbackStruct * cbs) { *view_dim = cbs->value; - lesstif_invalidate_all(pcb_gui); + lesstif_invalidate_all(rnd_gui); } static void work_area_make_pixmaps(Dimension width, Dimension height) @@ -1360,7 +1360,7 @@ XtRemoveCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_first_expose, 0); XtAddCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_expose, 0); - lesstif_invalidate_all(pcb_gui); + lesstif_invalidate_all(rnd_gui); } static unsigned short int lesstif_translate_key(const char *desc, int len) @@ -2177,7 +2177,7 @@ static void lesstif_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { - pcb_gui->coord_per_pix = view_zoom; + rnd_gui->coord_per_pix = view_zoom; } static void lesstif_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) @@ -2712,7 +2712,7 @@ x.ptr = (void *) watch; if (!watch->func(x, watch->fd, pcb_condition, watch->user_data)) - lesstif_unwatch_file(pcb_gui, x); + lesstif_unwatch_file(rnd_gui, x); return; } @@ -2774,7 +2774,7 @@ if (!lesstif_active) return; if (strncmp(cfg->hash_path, "appearance/color/", 17) == 0) - lesstif_invalidate_all(pcb_gui); + lesstif_invalidate_all(rnd_gui); if (strncmp(cfg->hash_path, "rc/cli_", 7) == 0) { stdarg_n = 0; stdarg(XmNlabelString, XmStringCreatePCB(rnd_cli_prompt(":"))); Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 30979) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 30980) @@ -226,7 +226,7 @@ if (strcmp(pad->Number, pname) == 0) { rnd_coord_t x = (pad->Point1.X + pad->Point2.X) / 2; rnd_coord_t y = (pad->Point1.Y + pad->Point2.Y) / 2; - pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT); + rnd_gui->set_crosshair(rnd_gui, x, y, HID_SC_PAN_VIEWPORT); free(ename); return; } Index: trunk/src_plugins/hid_lesstif/wt_preview.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_preview.c (revision 30979) +++ trunk/src_plugins/hid_lesstif/wt_preview.c (revision 30980) @@ -115,7 +115,7 @@ save_main_px = main_pixmap; save_mask_px = mask_pixmap; save_mask_bm = mask_bitmap; - save_cpp = pcb_gui->coord_per_pix; + save_cpp = rnd_gui->coord_per_pix; main_pixmap = XCreatePixmap(XtDisplay(pd->pw), XtWindow(pd->pw), pd->v_width, pd->v_height, widget_depth(pd->pw)); mask_pixmap = XCreatePixmap(XtDisplay(pd->pw), XtWindow(pd->pw), pd->v_width, pd->v_height, widget_depth(pd->pw)); mask_bitmap = XCreatePixmap(XtDisplay(pd->pw), XtWindow(pd->pw), pd->v_width, pd->v_height, 1); @@ -135,7 +135,7 @@ pd->exp_ctx.view.X2 = pd->x2; pd->exp_ctx.view.Y2 = pd->y2; - pcb_gui->coord_per_pix = view_zoom; + rnd_gui->coord_per_pix = view_zoom; pcbhl_expose_preview(&lesstif_hid, &pd->exp_ctx); XCopyArea(lesstif_display, pixmap, XtWindow(pd->pw), gc, 0, 0, pd->v_width, pd->v_height, 0, 0); @@ -153,7 +153,7 @@ mask_pixmap = save_mask_px; mask_bitmap = save_mask_bm; pixmap = save_px; - pcb_gui->coord_per_pix = save_cpp; + rnd_gui->coord_per_pix = save_cpp; rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); Index: trunk/src_plugins/hid_lesstif/wt_preview.h =================================================================== --- trunk/src_plugins/hid_lesstif/wt_preview.h (revision 30979) +++ trunk/src_plugins/hid_lesstif/wt_preview.h (revision 30980) @@ -18,7 +18,7 @@ rnd_hid_expose_ctx_t ctx; rnd_bool (*mouse_ev)(void *widget, void *draw_data, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); void (*pre_close)(struct pcb_ltf_preview_s *pd); - pcb_hid_expose_t overlay_draw; + rnd_hid_expose_t overlay_draw; unsigned resized:1; unsigned pan:1; unsigned expose_lock:1; Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 30979) +++ trunk/src_plugins/import_calay/calay.c (revision 30980) @@ -202,7 +202,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadCalayFrom, fname_net = argv[1].val.str); if (!fname_net || !*fname_net) { - fname_net = pcb_gui->fileselect(pcb_gui, + fname_net = rnd_gui->fileselect(rnd_gui, "Load calay netlist file...", "Picks a calay netlist file to load.\n", default_file, NETEXT, NULL, "calay", RND_HID_FSD_READ, NULL); if (fname_net == NULL) Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 30979) +++ trunk/src_plugins/import_dsn/dsn.c (revision 30980) @@ -219,7 +219,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { - fname = pcb_gui->fileselect(pcb_gui, + fname = rnd_gui->fileselect(rnd_gui, "Load a routed dsn or ses file...", "Select dsn or ses file to load.\nThe file could be generated using the tool downloaded from freeroute.net\n", NULL, /* default file name */ Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30979) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30980) @@ -171,7 +171,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, + fname = rnd_gui->fileselect(rnd_gui, "Load freepcb netlist...", "Picks a freepcb netlist file to load.\n", default_file, ".net", NULL, "freepcb", RND_HID_FSD_READ, NULL); if (fname == NULL) Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 30979) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 30980) @@ -156,7 +156,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load HP-GL file...", + fname = rnd_gui->fileselect(rnd_gui, "Load HP-GL file...", "Picks a HP-GL plot file to load.\n", default_file, ".hpgl", NULL, "hpgl", RND_HID_FSD_READ, NULL); if (fname == NULL) Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30979) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30980) @@ -368,7 +368,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { - fname = pcb_gui->fileselect(pcb_gui, "Load IPC-D-356 netlist...", + fname = rnd_gui->fileselect(rnd_gui, "Load IPC-D-356 netlist...", "Pick an IPC-D-356 netlist file.\n", default_file, ".net", NULL, "ipcd356", RND_HID_FSD_READ, NULL); if (fname == NULL) { Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 30979) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 30980) @@ -297,7 +297,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load ltspice net+asc file pair...", + fname = rnd_gui->fileselect(rnd_gui, "Load ltspice net+asc file pair...", "Picks a ltspice mentor net or asc file to load.\n", default_file, ".asc", NULL, "ltspice", RND_HID_FSD_READ, NULL); if (fname == NULL) Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30979) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30980) @@ -265,7 +265,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load mentor edf netlist file...", + fname = rnd_gui->fileselect(rnd_gui, "Load mentor edf netlist file...", "Picks a mentor edf file to load.\n", default_file, ".edf", NULL, "mentor_sch", RND_HID_FSD_READ, NULL); if (fname == NULL) Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 30979) +++ trunk/src_plugins/import_mucs/mucs.c (revision 30980) @@ -73,7 +73,7 @@ } if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load mucs routing session Resource File...", + fname = rnd_gui->fileselect(rnd_gui, "Load mucs routing session Resource File...", "Picks a mucs session resource file to load.\n" "This file could be generated by mucs-pcb\n", default_file, ".l1", NULL, "unixplot", RND_HID_FSD_READ, NULL); Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30979) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30980) @@ -69,7 +69,7 @@ static void isch_flush_timer(void) { if (isch_ctx.arg_dirty) { - pcb_gui->stop_timer(pcb_gui, isch_ctx.timer); + rnd_gui->stop_timer(rnd_gui, isch_ctx.timer); isch_arg2pcb(); } } @@ -128,11 +128,11 @@ for(n = 0; n < MAX_ARGS; n++) { - pcb_gui->attr_dlg_widget_hide(isch_ctx.dlg_hid_ctx, isch_ctx.warg_box[n], n >= len); - pcb_gui->attr_dlg_widget_hide(isch_ctx.dlg_hid_ctx, isch_ctx.warg_button[n], !((p != NULL) && (p->all_filenames))); + rnd_gui->attr_dlg_widget_hide(isch_ctx.dlg_hid_ctx, isch_ctx.warg_box[n], n >= len); + rnd_gui->attr_dlg_widget_hide(isch_ctx.dlg_hid_ctx, isch_ctx.warg_button[n], !((p != NULL) && (p->all_filenames))); } - pcb_gui->attr_dlg_widget_hide(isch_ctx.dlg_hid_ctx, isch_ctx.warg_ctrl, !controllable); + rnd_gui->attr_dlg_widget_hide(isch_ctx.dlg_hid_ctx, isch_ctx.warg_ctrl, !controllable); isch_conf_lock--; } @@ -206,7 +206,7 @@ if (*cwd == '\0') rnd_get_wd(cwd); - name = pcb_gui->fileselect(pcb_gui, "Import schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", RND_HID_FSD_MAY_NOT_EXIST, NULL); + name = rnd_gui->fileselect(rnd_gui, "Import schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (name == NULL) return; @@ -229,10 +229,10 @@ rnd_hidval_t user_data; if (isch_ctx.arg_dirty) - pcb_gui->stop_timer(pcb_gui, isch_ctx.timer); + rnd_gui->stop_timer(rnd_gui, isch_ctx.timer); user_data.ptr = NULL; - isch_ctx.timer = pcb_gui->add_timer(pcb_gui, isch_timed_update_cb, 1000, user_data); + isch_ctx.timer = rnd_gui->add_timer(rnd_gui, isch_timed_update_cb, 1000, user_data); isch_ctx.arg_dirty = 1; } Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 30979) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 30980) @@ -181,7 +181,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load tinycad netlist file...", + fname = rnd_gui->fileselect(rnd_gui, "Load tinycad netlist file...", "Picks a tinycad netlist file to load.\n", default_file, ".net", NULL, "tinycad", RND_HID_FSD_READ, NULL); if (fname == NULL) Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 30979) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 30980) @@ -79,7 +79,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { - fname = pcb_gui->fileselect(pcb_gui, + fname = rnd_gui->fileselect(rnd_gui, "Load .hyp file...", "Picks a hyperlynx file to load.\n", "default.hyp", ".hyp", NULL, "hyp", RND_HID_FSD_READ, NULL); } Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 30979) +++ trunk/src_plugins/io_kicad/read_net.c (revision 30980) @@ -224,7 +224,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load eeschema netlist file...", + fname = rnd_gui->fileselect(rnd_gui, "Load eeschema netlist file...", "Picks a eeschema netlist file to load.\n", default_file, ".net", NULL, "eeschema", RND_HID_FSD_READ, NULL); if (fname == NULL) Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 30979) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 30980) @@ -118,7 +118,7 @@ do { \ static char *default_file = NULL; \ if ((fname == NULL) || (*fname == '\0')) { \ - fname = pcb_gui->fileselect(pcb_gui, "Load tedax " #type " file...", \ + fname = rnd_gui->fileselect(rnd_gui, "Load tedax " #type " file...", \ "Picks a tedax " #type " file to load.\n", \ default_file, ".tdx", NULL, "tedax-" #type, RND_HID_FSD_READ, NULL); \ if (fname == NULL) \ Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 30979) +++ trunk/src_plugins/jostle/jostle.c (revision 30980) @@ -82,7 +82,7 @@ #endif /* TODO: rewrite this to UI layers if needed - ddraw = pcb_gui->request_debug_draw(); + ddraw = rnd_gui->request_debug_draw(); ddgc = ddraw->make_gc(); */ @@ -97,13 +97,13 @@ y[i++] = v->point[1]; } /* if (1) { - pcb_render->set_color(ddgc, color ? color : conf_core.appearance.color.connected); + rnd_render->set_color(ddgc, color ? color : conf_core.appearance.color.connected); pcb_hid_set_line_width(ddgc, 1); for (i = 0; i < n - 1; i++) { - pcb_render->draw_line(ddgc, x[i], y[i], x[i + 1], y[i + 1]); - pcb_render->fill_circle (ddgc, x[i], y[i], 30); + rnd_render->draw_line(ddgc, x[i], y[i], x[i + 1], y[i + 1]); + rnd_render->fill_circle (ddgc, x[i], y[i], 30); } - pcb_render->draw_line(ddgc, x[n - 1], y[n - 1], x[0], y[0]); + rnd_render->draw_line(ddgc, x[n - 1], y[n - 1], x[0], y[0]); }*/ free(x); free(y); Index: trunk/src_plugins/lib_gtk_common/bu_menu.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 30980) @@ -458,7 +458,7 @@ /* GUI updates to reflect the result of the above action */ pcb_hidlib_adjust_attached_objects(ghidgui->hidlib); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30980) @@ -180,7 +180,7 @@ pcb_gtk_note_event_location(NULL); pcb_hidlib_adjust_attached_objects(ghidgui->hidlib); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); g_idle_add(ghid_idle_cb, tw); return FALSE; } @@ -333,7 +333,7 @@ static gboolean drawing_area_enter_cb(GtkWidget *w, pcb_gtk_expose_t *p, void *user_data) { - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); return FALSE; } Index: trunk/src_plugins/lib_gtk_common/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30980) @@ -161,7 +161,7 @@ ghidgui->port.view.x0 = gtk_adjustment_get_value(h_adj); ghidgui->port.view.y0 = gtk_adjustment_get_value(v_adj); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } void pcb_gtk_pan_common(void) Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30980) @@ -132,7 +132,7 @@ ghid_gui_inited(gctx, 0, 1); pcb_gtk_tw_ranges_scale(gctx); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); return 0; } @@ -151,8 +151,8 @@ ghid_create_pcb_widgets(gctx, &gctx->topwin, gctx->port.top_window); - /* assume pcb_gui is us */ - pcb_gui->hid_cfg = gctx->topwin.ghid_cfg; + /* assume rnd_gui is us */ + rnd_gui->hid_cfg = gctx->topwin.ghid_cfg; gctx->port.drawing_area = gctx->topwin.drawing_area; @@ -232,7 +232,7 @@ gctx->port.view.use_max_pcb = 1; gctx->port.view.coord_per_px = 300.0; - pcb_pixel_slop = 300; + rnd_pixel_slop = 300; gctx->impl.init_renderer(argc, argv, &gctx->port); gctx->wtop_window = window = gctx->port.top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -422,7 +422,7 @@ gdk_display_sync(display); time(&start); do { - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); gdk_window_process_updates(window, FALSE); time(&end); i++; Index: trunk/src_plugins/lib_gtk_common/in_mouse.c =================================================================== --- trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 30980) @@ -270,7 +270,7 @@ hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, ghid_mouse_button(ev->button) | mk, ctx->topwin.cmd.command_entry_status_line_active); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); if (!ctx->port.view.panning) g_idle_add(ghid_idle_cb, &ctx->topwin); @@ -290,7 +290,7 @@ hid_cfg_mouse_action(ctx->hidlib, &ghid_mouse, ghid_mouse_button(ev->button) | mk | PCB_M_Release, ctx->topwin.cmd.command_entry_status_line_active); pcb_hidlib_adjust_attached_objects(ctx->hidlib); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); g_idle_add(ghid_idle_cb, &ctx->topwin); return TRUE; Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h =================================================================== --- trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 30979) +++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 30980) @@ -58,7 +58,7 @@ GtkWidget *(*new_drawing_widget)(pcb_gtk_impl_t *impl); void (*init_drawing_widget)(GtkWidget *widget, void *gport); - gboolean (*preview_expose)(GtkWidget *widget, pcb_gtk_expose_t *p, pcb_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx); /* p == NULL when called from the code, not from a GUI expose event */ + gboolean (*preview_expose)(GtkWidget *widget, pcb_gtk_expose_t *p, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx); /* p == NULL when called from the code, not from a GUI expose event */ void (*load_bg_image)(void); void (*init_renderer)(int *argc, char ***argv, void *port); void (*draw_grid_local)(rnd_hidlib_t *hidlib, rnd_coord_t cx, rnd_coord_t cy); @@ -180,7 +180,7 @@ pcb_gtk_pixmap_t bg_pixmap; - int hid_active; /* 1 if the currently running hid (pcb_gui) is up */ + int hid_active; /* 1 if the currently running hid (rnd_gui) is up */ int gui_is_up; /*1 if all parts of the gui is up and running */ gulong button_press_handler, button_release_handler, key_press_handler[5], key_release_handler[5]; Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 30980) @@ -142,7 +142,7 @@ ytmp = (SIDE_Y(v, center_y) - v->y0) / (double) v->height; v->coord_per_px = new_zoom; - pcb_pixel_slop = new_zoom; + rnd_pixel_slop = new_zoom; pcb_gtk_tw_ranges_scale(ghidgui); v->x0 = SIDE_X(v, center_x) - xtmp * v->width; Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 30979) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 30980) @@ -514,7 +514,7 @@ GtkWidget *pcb_gtk_preview_new(pcb_gtk_t *ctx, pcb_gtk_init_drawing_widget_t init_widget, - pcb_gtk_preview_expose_t expose, pcb_hid_expose_t dialog_draw, pcb_gtk_preview_config_t config, void *draw_data) + pcb_gtk_preview_expose_t expose, rnd_hid_expose_t dialog_draw, pcb_gtk_preview_config_t config, void *draw_data) { pcb_gtk_preview_t *prv = (pcb_gtk_preview_t *)g_object_new( PCB_GTK_TYPE_PREVIEW, Index: trunk/src_plugins/lib_gtk_common/wt_preview.h =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.h (revision 30979) +++ trunk/src_plugins/lib_gtk_common/wt_preview.h (revision 30980) @@ -57,7 +57,7 @@ typedef void (*pcb_gtk_init_drawing_widget_t)(GtkWidget *widget, void *port); typedef void (*pcb_gtk_preview_config_t)(pcb_gtk_preview_t *gp, GtkWidget *widget); -typedef gboolean(*pcb_gtk_preview_expose_t)(GtkWidget *widget, pcb_gtk_expose_t *ev, pcb_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx); +typedef gboolean(*pcb_gtk_preview_expose_t)(GtkWidget *widget, pcb_gtk_expose_t *ev, rnd_hid_expose_t expcall, rnd_hid_expose_ctx_t *ctx); typedef rnd_bool(*pcb_gtk_preview_mouse_ev_t)(void *widget, void *draw_data, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); struct pcb_gtk_preview_s { @@ -77,7 +77,7 @@ pcb_gtk_preview_config_t config_cb; pcb_gtk_preview_expose_t expose; pcb_gtk_preview_mouse_ev_t mouse_cb; - pcb_hid_expose_t overlay_draw_cb; + rnd_hid_expose_t overlay_draw_cb; rnd_coord_t grabx, graby; time_t grabt; long grabmot; @@ -96,7 +96,7 @@ void pcb_gtk_preview_get_natsize(pcb_gtk_preview_t *preview, int *width, int *height); GtkWidget *pcb_gtk_preview_new(pcb_gtk_t *ctx, pcb_gtk_init_drawing_widget_t init_widget, - pcb_gtk_preview_expose_t expose, pcb_hid_expose_t dialog_draw, pcb_gtk_preview_config_t config, void *draw_data); + pcb_gtk_preview_expose_t expose, rnd_hid_expose_t dialog_draw, pcb_gtk_preview_config_t config, void *draw_data); void pcb_gtk_preview_zoomto(pcb_gtk_preview_t *preview, const rnd_rnd_box_t *data_view); Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30980) @@ -153,7 +153,7 @@ rnd_color_load_int(&ctx->clr, clamp(ctx->dlg[ctx->wr].val.lng), clamp(ctx->dlg[ctx->wg].val.lng), clamp(ctx->dlg[ctx->wb].val.lng), 255); val.clr = ctx->clr; - pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val); + rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val); } fgw_error_t pcb_act_gui_FallbackColorPick(fgw_arg_t *res, int argc, fgw_arg_t *argv) @@ -198,13 +198,13 @@ val.lng = ctx.clr.r; - pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wr, &val); + rnd_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wr, &val); val.lng = ctx.clr.g; - pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wg, &val); + rnd_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wg, &val); val.lng = ctx.clr.b; - pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wb, &val); + rnd_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wb, &val); val.clr = ctx.clr; - pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wclr, &val); + rnd_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wclr, &val); if (PCB_DAD_RUN(ctx.dlg) != 0) { PCB_DAD_FREE(ctx.dlg); Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30980) @@ -61,7 +61,7 @@ rnd_conf_loglevel_props(line->level, &prefix, &popup); - if (pcb_gui->supports_dad_text_markup) { + if (rnd_gui->supports_dad_text_markup) { if (prefix != NULL) { gds_t tmp; gds_init(&tmp); @@ -93,8 +93,8 @@ } txt->hid_set_text(atxt, ctx->dlg_hid_ctx, PCB_HID_TEXT_APPEND | PCB_HID_TEXT_MARKUP, line->str); } - if (popup && (pcb_gui->attr_dlg_raise != NULL)) - pcb_gui->attr_dlg_raise(ctx->dlg_hid_ctx); + if (popup && (rnd_gui->attr_dlg_raise != NULL)) + rnd_gui->attr_dlg_raise(ctx->dlg_hid_ctx); if (line->ID > ctx->last_added) ctx->last_added = line->ID; line->seen = 1; @@ -178,7 +178,7 @@ txt->hid_set_readonly(atxt, ctx->dlg_hid_ctx, 1); } hv.lng = 1; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wscroll, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wscroll, &hv); log_import(ctx); maybe_scroll_to_bottom(); } Index: trunk/src_plugins/lib_hid_common/grid_menu.c =================================================================== --- trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30980) @@ -80,7 +80,7 @@ sprintf(act, "grid(#%d)", idx); sprintf(chk, "conf(iseq, editor/grids_idx, %d)", idx); strcpy(end, li->val.string[0]); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } } Index: trunk/src_plugins/lib_hid_common/lead_user.c =================================================================== --- trunk/src_plugins/lib_hid_common/lead_user.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/lead_user.c (revision 30980) @@ -50,10 +50,10 @@ step = sin(p) * LEAD_ANIM_AMP - LEAD_ANIM_AMP; p += LEAD_ANIM_SPEED; - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); if (lead) - lead_timer = pcb_gui->add_timer(pcb_gui, lead_cb, LEAD_PERIOD_MS, user_data); + lead_timer = rnd_gui->add_timer(rnd_gui, lead_cb, LEAD_PERIOD_MS, user_data); } static void pcb_lead_user_to_location(rnd_hidlib_t *hidlib, rnd_coord_t x, rnd_coord_t y, rnd_bool enabled) @@ -61,9 +61,9 @@ rnd_hidval_t user_data; if (lead) { - pcb_gui->stop_timer(pcb_gui, lead_timer); + rnd_gui->stop_timer(rnd_gui, lead_timer); lead = enabled; - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } leadx = x; @@ -72,7 +72,7 @@ lead_hidlib = hidlib; if (enabled) - lead_timer = pcb_gui->add_timer(pcb_gui, lead_cb, LEAD_PERIOD_MS, user_data); + lead_timer = rnd_gui->add_timer(rnd_gui, lead_cb, LEAD_PERIOD_MS, user_data); } void pcb_lead_user_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) @@ -96,17 +96,17 @@ assert(argv[1].type == RND_EVARG_PTR); - pcb_render->set_line_width(*gc, ARL/40); - pcb_render->draw_arc(*gc, leadx, leady, LEAD_CENTER_RAD+step/10, LEAD_CENTER_RAD+step/10, 0, 360); + rnd_render->set_line_width(*gc, ARL/40); + rnd_render->draw_arc(*gc, leadx, leady, LEAD_CENTER_RAD+step/10, LEAD_CENTER_RAD+step/10, 0, 360); -/* pcb_render->set_color(*gc, const rnd_color_t *color);*/ +/* rnd_render->set_color(*gc, const rnd_color_t *color);*/ - pcb_render->draw_line(*gc, x, y, x - ARL, y); - pcb_render->draw_line(*gc, x, y, x, y-ARL); - pcb_render->draw_line(*gc, x - ARL, y, x, y-ARL); + rnd_render->draw_line(*gc, x, y, x - ARL, y); + rnd_render->draw_line(*gc, x, y, x, y-ARL); + rnd_render->draw_line(*gc, x - ARL, y, x, y-ARL); - pcb_gui->set_line_width(*gc, ARL/4); - pcb_render->draw_line(*gc, x - ARL/2, y - ARL/2, x - LEAD_ARROW_LEN, y - LEAD_ARROW_LEN); + rnd_gui->set_line_width(*gc, ARL/4); + rnd_render->draw_line(*gc, x - ARL/2, y - ARL/2, x - LEAD_ARROW_LEN, y - LEAD_ARROW_LEN); } } Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30980) @@ -65,7 +65,7 @@ fgw_error_t pcb_act_Command(fgw_arg_t *res, int argc, fgw_arg_t *argv) { PCB_GUI_NOGUI(); - pcb_gui->open_command(pcb_gui); + rnd_gui->open_command(rnd_gui); RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_hid_common/toolbar.c =================================================================== --- trunk/src_plugins/lib_hid_common/toolbar.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/toolbar.c (revision 30980) @@ -63,7 +63,7 @@ if (wid == 0) continue; st = (tid == pcbhl_conf.editor.mode) ? 2 : 1; - pcb_gui->attr_dlg_widget_state(toolbar.sub.dlg_hid_ctx, wid, st); + rnd_gui->attr_dlg_widget_state(toolbar.sub.dlg_hid_ctx, wid, st); } toolbar.lock = 0; } @@ -76,7 +76,7 @@ return; tid = (ptrdiff_t)attr->user_data; - pcb_tool_select_by_id(pcb_gui->get_dad_hidlib(hid_ctx), tid); + pcb_tool_select_by_id(rnd_gui->get_dad_hidlib(hid_ctx), tid); } static void toolbar_create_tool(pcb_toolid_t tid, pcb_tool_t *tool, const char *menufile_help) @@ -169,7 +169,7 @@ static void toolbar_create(void) { - rnd_hid_cfg_t *cfg = pcb_gui->get_menu_cfg(pcb_gui); + rnd_hid_cfg_t *cfg = rnd_gui->get_menu_cfg(rnd_gui); if (cfg == NULL) return; toolbar_docked_create(cfg); @@ -181,7 +181,7 @@ void pcb_toolbar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { - if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) + if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) toolbar_create(); } Index: trunk/src_plugins/lib_hid_common/zoompan.c =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.c (revision 30979) +++ trunk/src_plugins/lib_hid_common/zoompan.c (revision 30980) @@ -46,7 +46,7 @@ PCB_GUI_NOGUI(); if (argc < 2) { - pcb_gui->zoom_win(pcb_gui, 0, 0, hidlib->size_x, hidlib->size_y, 1); + rnd_gui->zoom_win(rnd_gui, 0, 0, hidlib->size_x, hidlib->size_y, 1); return 0; } @@ -58,7 +58,7 @@ RND_PCB_ACT_CONVARG(3, FGW_COORD, Zoom, x2 = fgw_coord(&argv[3])); RND_PCB_ACT_CONVARG(4, FGW_COORD, Zoom, y2 = fgw_coord(&argv[4])); - pcb_gui->zoom_win(pcb_gui, x1, y1, x2, y2, 1); + rnd_gui->zoom_win(rnd_gui, x1, y1, x2, y2, 1); return 0; } @@ -68,13 +68,13 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, ovp = vp = argv[1].val.str); if (*vp == '?') { - rnd_message(RND_MSG_INFO, "Current zoom level (coord-per-pix): %$mm\n", pcb_gui->coord_per_pix); + rnd_message(RND_MSG_INFO, "Current zoom level (coord-per-pix): %$mm\n", rnd_gui->coord_per_pix); return 0; } if (rnd_strcasecmp(argv[1].val.str, "get") == 0) { res->type = FGW_DOUBLE; - res->val.nat_double = pcb_gui->coord_per_pix; + res->val.nat_double = rnd_gui->coord_per_pix; return 0; } @@ -87,14 +87,14 @@ rnd_hid_get_coords("Select zoom center", &x, &y, 0); switch (ovp[0]) { case '-': - pcb_gui->zoom(pcb_gui, x, y, 1 / v, 1); + rnd_gui->zoom(rnd_gui, x, y, 1 / v, 1); break; default: case '+': - pcb_gui->zoom(pcb_gui, x, y, v, 1); + rnd_gui->zoom(rnd_gui, x, y, v, 1); break; case '=': - pcb_gui->zoom(pcb_gui, x, y, v, 0); + rnd_gui->zoom(rnd_gui, x, y, v, 0); break; } @@ -115,7 +115,7 @@ rnd_hid_get_coords("Click on a place to pan", &x, &y, 0); RND_PCB_ACT_CONVARG(1, FGW_INT, Pan, mode = argv[1].val.nat_int); - pcb_gui->pan_mode(pcb_gui, x, y, mode); + rnd_gui->pan_mode(rnd_gui, x, y, mode); RND_ACT_IRES(0); return 0; @@ -134,7 +134,7 @@ if (argc != 1) RND_ACT_FAIL(Center); - pcb_gui->pan(pcb_gui, x, y, 0); + rnd_gui->pan(rnd_gui, x, y, 0); RND_ACT_IRES(0); return 0; @@ -152,17 +152,17 @@ rnd_PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, Scroll, pixels = argv[2].val.nat_double); if (rnd_strcasecmp(op, "up") == 0) - dy = -pcb_gui->coord_per_pix * pixels; + dy = -rnd_gui->coord_per_pix * pixels; else if (rnd_strcasecmp(op, "down") == 0) - dy = pcb_gui->coord_per_pix * pixels; + dy = rnd_gui->coord_per_pix * pixels; else if (rnd_strcasecmp(op, "right") == 0) - dx = pcb_gui->coord_per_pix * pixels; + dx = rnd_gui->coord_per_pix * pixels; else if (rnd_strcasecmp(op, "left") == 0) - dx = -pcb_gui->coord_per_pix * pixels; + dx = -rnd_gui->coord_per_pix * pixels; else RND_ACT_FAIL(Scroll); - pcb_gui->pan(pcb_gui, dx, dy, 1); + rnd_gui->pan(rnd_gui, dx, dy, 1); RND_ACT_IRES(0); return 0; Index: trunk/src_plugins/lib_hid_common/zoompan.h =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.h (revision 30979) +++ trunk/src_plugins/lib_hid_common/zoompan.h (revision 30980) @@ -28,7 +28,7 @@ if there's GUI */ #define PCB_GUI_NOGUI() \ do { \ - if ((pcb_gui == NULL) || (!pcb_gui->gui)) { \ + if ((rnd_gui == NULL) || (!rnd_gui->gui)) { \ RND_ACT_IRES(1); \ return 0; \ } \ Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 30980) @@ -62,7 +62,7 @@ if (rnd_strcasecmp(vp, "selected") == 0) { rnd_rnd_box_t sb; if (pcb_get_selection_bbox(&sb, PCB->Data) > 0) - pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1); + rnd_gui->zoom_win(rnd_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1); else rnd_message(RND_MSG_ERROR, "Can't zoom to selection: nothing selected\n"); return 0; @@ -71,7 +71,7 @@ if (rnd_strcasecmp(vp, "found") == 0) { rnd_rnd_box_t sb; if (pcb_get_found_bbox(&sb, PCB->Data) > 0) - pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1); + rnd_gui->zoom_win(rnd_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1); else rnd_message(RND_MSG_ERROR, "Can't zoom to 'found': nothing found\n"); return 0; @@ -100,7 +100,7 @@ x = pcb_crosshair.X; y = pcb_crosshair.Y; - pcb_gui->view_get(pcb_gui, &vb); + rnd_gui->view_get(rnd_gui, &vb); xcent = (double)(vb.X1 + vb.X2)/2.0; ycent = (double)(vb.Y1 + vb.Y2)/2.0; xoffs = xcent - x; @@ -175,10 +175,10 @@ pcb_draw_inhibit_dec(); /*rnd_trace("-jump-> %mm;%mm -> %mm;%mm\n", x, y, (rnd_coord_t)(x + xoffs), (rnd_coord_t)(y + yoffs));*/ - pcb_gui->pan(pcb_gui, rnd_round(x + xoffs), rnd_round(y + yoffs), 0); - pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT); + rnd_gui->pan(rnd_gui, rnd_round(x + xoffs), rnd_round(y + yoffs), 0); + rnd_gui->set_crosshair(rnd_gui, x, y, HID_SC_PAN_VIEWPORT); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); RND_ACT_IRES(0); return 0; @@ -255,9 +255,9 @@ } if (*name != '\0') - r = pcb_gui->open_popup(pcb_gui, name); + r = rnd_gui->open_popup(rnd_gui, name); if ((r != 0) && (*name2 != '\0')) - r = pcb_gui->open_popup(pcb_gui, name2); + r = rnd_gui->open_popup(rnd_gui, name2); RND_ACT_IRES(r); return 0; Index: trunk/src_plugins/lib_hid_pcbui/infobar.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 30980) @@ -49,7 +49,7 @@ static void infobar_tick(rnd_hidval_t user_data) { if (conf_core.rc.file_changed_interval > 0) { - infobar_timer = pcb_gui->add_timer(pcb_gui, infobar_tick, (conf_core.rc.file_changed_interval * 1000.0), user_data); + infobar_timer = rnd_gui->add_timer(rnd_gui, infobar_tick, (conf_core.rc.file_changed_interval * 1000.0), user_data); last_interval = conf_core.rc.file_changed_interval; infobar_timer_active = 1; } @@ -71,8 +71,8 @@ { if ((!infobar_gui_inited) || (last_interval == conf_core.rc.file_changed_interval)) return; - if ((infobar_timer_active) && (pcb_gui != NULL) && (pcb_gui->stop_timer != NULL)) { - pcb_gui->stop_timer(pcb_gui, infobar_timer); + if ((infobar_timer_active) && (rnd_gui != NULL) && (rnd_gui->stop_timer != NULL)) { + rnd_gui->stop_timer(rnd_gui, infobar_timer); infobar_timer_active = 0; } infobar_tick(infobar_timer); Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 30980) @@ -83,12 +83,12 @@ sprintf(chk, "ChkView(ui:%d)", idx); pcb_snprintf(end, len_avail, " %s", ly->name); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } props.checked = NULL; pcb_snprintf(end, len_avail, "[UI]"); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } /* menu-only virtual layers; have to go reverse to keep order because this will insert items */ @@ -107,12 +107,12 @@ sprintf(chk, "ChkLayer(%s)", ml->abbrev); } pcb_snprintf(end, len_avail, " %s", ml->name); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } props.checked = NULL; pcb_snprintf(end, len_avail, "[virtual]"); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); /* have to go reverse to keep order because this will insert items */ @@ -124,7 +124,7 @@ props.checked = NULL; *act = '\0'; *chk = '\0'; - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); for(gid = pcb_max_group(PCB)-1; gid >= 0; gid--) { pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid]; @@ -153,7 +153,7 @@ sprintf(chk, "ChkLayer(%ld)", lid+1); } pcb_snprintf(end, len_avail, " %s", l->name); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } props.foreground = NULL; @@ -160,7 +160,7 @@ props.background = NULL; props.checked = NULL; pcb_snprintf(end, len_avail, "[%s]", g->name); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } } @@ -176,7 +176,7 @@ keyprops->accel = key; pcb_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name); sprintf((char *)keyprops->action, "%s(%ld)", action_prefix, lid+1); - pcb_gui->create_menu(pcb_gui, path, keyprops); + rnd_gui->create_menu(rnd_gui, path, keyprops); } } @@ -243,16 +243,16 @@ { rnd_hidval_t timerdata; - if ((pcb_gui == NULL) || (!pcb_gui->gui)) + if ((rnd_gui == NULL) || (!rnd_gui->gui)) return; if (layer_menu_install_timer_active) { - pcb_gui->stop_timer(pcb_gui, layer_menu_install_timer); + rnd_gui->stop_timer(rnd_gui, layer_menu_install_timer); layer_menu_install_timer_active = 0; } timerdata.ptr = NULL; - layer_menu_install_timer = pcb_gui->add_timer(pcb_gui, layer_install_menu_cb, MENU_REFRESH_TIME_MS, timerdata); + layer_menu_install_timer = rnd_gui->add_timer(rnd_gui, layer_install_menu_cb, MENU_REFRESH_TIME_MS, timerdata); layer_menu_install_timer_active = 1; } @@ -260,14 +260,14 @@ void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { layer_install_menu(); - if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL)) - pcb_gui->update_menu_checkbox(pcb_gui, NULL); + if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL)) + rnd_gui->update_menu_checkbox(rnd_gui, NULL); } void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { - if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL)) - pcb_gui->update_menu_checkbox(pcb_gui, NULL); + if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL)) + rnd_gui->update_menu_checkbox(rnd_gui, NULL); } @@ -288,15 +288,15 @@ /* rnd_trace("************ layer key update ev!\n");*/ - if ((pcb_gui == NULL) || (!pcb_gui->gui)) + if ((rnd_gui == NULL) || (!rnd_gui->gui)) return; if (layer_menu_key_timer_active) { - pcb_gui->stop_timer(pcb_gui, layer_menu_key_timer); + rnd_gui->stop_timer(rnd_gui, layer_menu_key_timer); layer_menu_key_timer_active = 0; } timerdata.ptr = NULL; - layer_menu_key_timer = pcb_gui->add_timer(pcb_gui, timed_layer_menu_key_update_cb, MENU_REFRESH_TIME_MS, timerdata); + layer_menu_key_timer = rnd_gui->add_timer(rnd_gui, timed_layer_menu_key_update_cb, MENU_REFRESH_TIME_MS, timerdata); layer_menu_key_timer_active = 1; } Index: trunk/src_plugins/lib_hid_pcbui/layersel.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30980) @@ -226,17 +226,17 @@ ls->lock_sel = 1; if (ls->w_last_sel != 0) { - pcb_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 1); - pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 0); - pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 1); + rnd_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 1); + rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 0); + rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 1); } ls->w_last_sel = wid; ls->w_last_sel_closed = wid_sel_closed; ls->w_last_unsel_closed = wid_unsel_closed; if (ls->w_last_sel != 0) { - pcb_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 2); - pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 1); - pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 0); + rnd_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 2); + rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 1); + rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 0); } ls->lock_sel = 0; } @@ -250,10 +250,10 @@ static void lys_update_vis(ls_layer_t *lys, pcb_bool_t vis) { - pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_open, !vis); - pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_closed, !vis); - pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_open, !!vis); - pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_closed, !!vis); + rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_open, !vis); + rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_closed, !vis); + rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_open, !!vis); + rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_closed, !!vis); } static void layer_select(ls_layer_t *lys) @@ -313,8 +313,8 @@ { group_sync_core(PCB, lgs, 0); - pcb_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wopen, !lgs->is_open); - pcb_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wclosed, !!lgs->is_open); + rnd_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wopen, !lgs->is_open); + rnd_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wclosed, !!lgs->is_open); } static void all_open_close(int is_open) @@ -816,8 +816,8 @@ continue; group_sync_core(pcb, *lgs, 1); - pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wopen, !(*lgs)->is_open); - pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wclosed, (*lgs)->is_open); + rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wopen, !(*lgs)->is_open); + rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wclosed, (*lgs)->is_open); } { /* ifPCB_CURRLAYER(PCB) is not selected, select it */ @@ -840,7 +840,7 @@ void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { - if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) + if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) layersel_build(); } @@ -853,7 +853,7 @@ void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { - if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) { + if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) { pcb_hid_dock_leave(&layersel.sub); layersel.sub_inited = 0; layersel_build(); Index: trunk/src_plugins/lib_hid_pcbui/rendering.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/rendering.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/rendering.c (revision 30980) @@ -93,7 +93,7 @@ static void pcb_rendering_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { /* hook in our dispatcher */ - gui_set_layer_group = pcb_gui->set_layer_group; - pcb_gui->set_layer_group = pcbui_set_layer_group; + gui_set_layer_group = rnd_gui->set_layer_group; + rnd_gui->set_layer_group = pcbui_set_layer_group; } Index: trunk/src_plugins/lib_hid_pcbui/routest.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/routest.c (revision 30980) @@ -75,7 +75,7 @@ sprintf(act, "RouteStyle(%d)", idx+1); /* for historical reasons this action counts from 1 */ sprintf(chk, "ChkRst(%d)", idx); strcpy(end, PCB->RouteStyle.array[idx].name); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } } @@ -87,7 +87,7 @@ for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) { hv.lng = (n == target); - pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv); + rnd_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv); } rstdlg_pcb2dlg(target); } @@ -107,16 +107,16 @@ hv.lng = (n == target); if (rst.sub.dlg[rst.wlab[n]].val.lng != hv.lng) - pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv); + rnd_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv); hv.str = PCB->RouteStyle.array[n].name; if (strcmp(rst.sub.dlg[rst.wlab[n]].name, hv.str) != 0) - pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wlab[n], &hv); + rnd_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wlab[n], &hv); } if (vtroutestyle_len(&PCB->RouteStyle) != rst.last_len) { rst.last_len = vtroutestyle_len(&PCB->RouteStyle); for(n = 0; n < MAX_STYLES; n++) - pcb_gui->attr_dlg_widget_hide(rst.sub.dlg_hid_ctx, rst.whbox[n], n >= rst.last_len); + rnd_gui->attr_dlg_widget_hide(rst.sub.dlg_hid_ctx, rst.whbox[n], n >= rst.last_len); } rstdlg_pcb2dlg(target); } @@ -218,9 +218,9 @@ void pcb_rst_update_conf(rnd_conf_native_t *cfg, int arr_idx) { - if ((PCB != NULL) && (pcb_gui != NULL)) { - if (pcb_gui->update_menu_checkbox != NULL) - pcb_gui->update_menu_checkbox(pcb_gui, NULL); + if ((PCB != NULL) && (rnd_gui != NULL)) { + if (rnd_gui->update_menu_checkbox != NULL) + rnd_gui->update_menu_checkbox(rnd_gui, NULL); if (rst.sub_inited) rst_force_update_chk_and_dlg(); } Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30980) @@ -74,25 +74,25 @@ rst = vtroutestyle_get(&PCB->RouteStyle, rst_idx, 0); hv.str = rst->name; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wname, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wname, &hv); hv.crd = rst->Thick; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wlineth, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wlineth, &hv); hv.crd = rst->textt; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtth, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtth, &hv); hv.crd = rst->texts; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtscale, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtscale, &hv); hv.crd = rst->Clearance; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wclr, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wclr, &hv); hv.crd = rst->Hole; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv); hv.crd = rst->Diameter; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv); pcb_dad_tree_clear(tree); @@ -144,7 +144,7 @@ rst->Hole = attr->val.crd; if (rst->Hole * 1.1 >= rstdlg_ctx.dlg[rstdlg_ctx.wviaring].val.crd) { hv.crd = rst->Hole * 1.1; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv); rst->Diameter = hv.crd; } } @@ -152,7 +152,7 @@ rst->Diameter = attr->val.crd; if (rst->Diameter / 1.1 <= rstdlg_ctx.dlg[rstdlg_ctx.wviahole].val.crd) { hv.crd = rst->Diameter / 1.1; - pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv); + rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv); rst->Hole = hv.crd; } Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 30980) @@ -61,7 +61,7 @@ { char kbd[128]; const char *flag = conf_core.editor.all_direction_lines ? "*" : (conf_core.editor.line_refraction == 0 ? "X" : (conf_core.editor.line_refraction == 1 ? "_/" : "\\_")); - pcb_hid_cfg_keys_t *kst = pcb_gui->key_state; + pcb_hid_cfg_keys_t *kst = rnd_gui->key_state; if (kst != NULL) { if (kst->seq_len_action > 0) { @@ -141,24 +141,24 @@ build_st_line1(); if (!conf_core.appearance.compact) { build_st_line2(); - pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 1); + rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 1); } hv.str = status.buf.array; - pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst1, &hv); + rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst1, &hv); if (conf_core.appearance.compact) { status.buf.used = 0; build_st_line2(); hv.str = status.buf.array; - pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv); + rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv); if (!status.st_has_text) - pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 0); + rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 0); } status.buf.used = 0; build_st_help(); - pcb_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst1, status.buf.array); - pcb_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst2, status.buf.array); + rnd_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst1, status.buf.array); + rnd_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst2, status.buf.array); } static void status_rd_pcb2dlg(void) @@ -175,20 +175,20 @@ status.buf.used = 0; pcb_append_printf(&status.buf, "%m+%-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.X); hv.str = status.buf.array; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv); status.buf.used = 0; pcb_append_printf(&status.buf, "%m+%-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.Y); hv.str = status.buf.array; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv); - pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv); + rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0); } else { status.buf.used = 0; pcb_append_printf(&status.buf, "%m+%-mS %-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y); hv.str = status.buf.array; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv); - pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv); + rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1); } /* distance readout (left side box) */ @@ -216,18 +216,18 @@ } hv.str = s1; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[0], &hv); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[0], &hv); if (conf_core.appearance.compact) { hv.str = s2; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[1], &hv); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[1], &hv); hv.str = s3; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[2], &hv); - pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 0); - pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 0); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[2], &hv); + rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 0); + rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 0); } else { - pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 1); - pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 1); + rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 1); + rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 1); } if (status.last_unit != pcbhl_conf.editor.grid_unit) { @@ -234,7 +234,7 @@ status.lock++; status.last_unit = pcbhl_conf.editor.grid_unit; hv.str = pcbhl_conf.editor.grid_unit->suffix; - pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrdunit, &hv); + rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrdunit, &hv); status.lock--; } } @@ -304,7 +304,7 @@ void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { - if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) { + if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) { status_docked_create_st(); if (pcb_hid_dock_enter(&status.stsub, RND_HID_DOCK_BOTTOM, "status") == 0) { status.stsub_inited = 1; @@ -353,17 +353,17 @@ if (text != NULL) { rnd_hid_attr_val_t hv; hv.str = text; - pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wsttxt, &hv); + rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wsttxt, &hv); hv.str = ""; - pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv); - pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 1); - pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 0); + rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv); + rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 1); + rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 0); status.st_has_text = 1; } else { status.st_has_text = 0; - pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 0); - pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 1); + rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 0); + rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 1); status_st_pcb2dlg(); } Index: trunk/src_plugins/lib_hid_pcbui/title.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/title.c (revision 30979) +++ trunk/src_plugins/lib_hid_pcbui/title.c (revision 30980) @@ -38,7 +38,7 @@ { const char *filename, *name; - if ((pcb_gui == NULL) || (pcb_gui->set_top_title == NULL) || (!gui_inited)) + if ((rnd_gui == NULL) || (rnd_gui->set_top_title == NULL) || (!gui_inited)) return; if ((PCB->hidlib.name == NULL) || (*PCB->hidlib.name == '\0')) @@ -53,7 +53,7 @@ title_buf.used = 0; pcb_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board"); - pcb_gui->set_top_title(pcb_gui, title_buf.array); + rnd_gui->set_top_title(rnd_gui, title_buf.array); } static void pcb_title_board_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 30979) +++ trunk/src_plugins/loghid/hid-logger.c (revision 30980) @@ -98,7 +98,7 @@ { pcb_fprintf(out_, "render_burst(%d,[%mm;%mm,%mm;%mm])\n", op, screen->X1, screen->Y1, screen->X2, screen->Y2); delegatee_->render_burst(hid, op, screen); - pcb_gui->coord_per_pix = delegatee_->coord_per_pix; + rnd_gui->coord_per_pix = delegatee_->coord_per_pix; } Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 30979) +++ trunk/src_plugins/oldactions/oldactions.c (revision 30980) @@ -127,7 +127,7 @@ static fgw_error_t pcb_act_Bell(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_gui->beep(pcb_gui); + rnd_gui->beep(rnd_gui); RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30979) +++ trunk/src_plugins/order/order.c (revision 30980) @@ -98,7 +98,7 @@ end++; strcpy(end, "Order PCB"); strcpy(act, "OrderPCB(gui)"); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); } void pcb_order_free_field_data(order_ctx_t *octx, pcb_order_field_t *f) Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30979) +++ trunk/src_plugins/propedit/propdlg.c (revision 30980) @@ -132,7 +132,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtree, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtree, &hv); free(cursor_path); } @@ -206,7 +206,7 @@ gds_truncate(&scope, gds_len(&scope)-2); hv.str = scope.array; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wscope, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wscope, &hv); } } @@ -247,7 +247,7 @@ case PCB_PROPT_invalid: case PCB_PROPT_max: return; } - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wedit[p->type], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wedit[p->type], &hv); } typedef struct { @@ -275,7 +275,7 @@ if (p == NULL) { /* deselect or not found */ hv.lng = 0; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); return; } @@ -296,7 +296,7 @@ } hv.lng = p->type; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); prop_valedit_update(ctx, p, pvs[0].val); @@ -366,7 +366,7 @@ if (force_update || ctx->dlg[ctx->wabs[p->type]].val.lng) { pcb_propsel_set(&ctx->pe, r->user_data, &sctx); prop_refresh(ctx); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } @@ -648,7 +648,7 @@ /* default all abs */ hv.lng = 1; for(n = 0; n < PCB_PROPT_max; n++) - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wabs[n], &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wabs[n], &hv); } extern int prop_scope_add(pcb_propedit_t *pe, const char *cmd, int quiet); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 30979) +++ trunk/src_plugins/puller/puller.c (revision 30980) @@ -439,7 +439,7 @@ pcb_move_obj(PCB_OBJ_LINE_POINT, PCB_CURRLAYER(PCB), the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); pcb_undo_inc_serial(); RND_ACT_IRES(0); @@ -1976,7 +1976,7 @@ #if TRACE0 printf("\033[35mdid_something: recursing\033[0m\n"); { - int i = pcb_gui->confirm_dialog("recurse?", 0); + int i = rnd_gui->confirm_dialog("recurse?", 0); printf("confirm = %d\n", i); if (i == 0) return; @@ -2140,13 +2140,13 @@ if (did_something != old_did_something) { pcb_undo_inc_serial(); old_did_something = did_something; - if (pcb_gui->confirm_dialog("more?", 0) == 0) { + if (rnd_gui->confirm_dialog("more?", 0) == 0) { did_something = 0; break; } } #endif - /*pcb_gui->progress(0,0,0); */ + /*rnd_gui->progress(0,0,0); */ } PCB_END_LOOP; } Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 30979) +++ trunk/src_plugins/renumber/renumber.c (revision 30980) @@ -88,7 +88,7 @@ * We deal with the case where name already exists in this * function so the GUI doesn't need to deal with it */ - name = pcb_gui->fileselect(pcb_gui, "Save Renumber Annotation File As ...", + name = rnd_gui->fileselect(rnd_gui, "Save Renumber Annotation File As ...", "Choose a file to record the renumbering to.\n" "This file may be used to back annotate the\n" "change to the schematics.\n", default_file, ".eco", NULL, "eco", 0, NULL); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 30979) +++ trunk/src_plugins/report/report.c (revision 30980) @@ -176,7 +176,7 @@ pcb_pstk_proto_t *proto; #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(PCB->Data->padstack_tree, 0); #endif proto = pcb_pstk_get_proto(ps); @@ -194,7 +194,7 @@ static void report_line(gds_t *dst, pcb_line_t *line) { #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(line->parent.layer->line_tree, 0); #endif pcb_append_printf(dst, "%m+LINE ID# %ld; Flags:%s\n" @@ -216,7 +216,7 @@ static void report_rat(gds_t *dst, pcb_rat_t *line) { #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(PCB->Data->rat_tree, 0); #endif pcb_append_printf(dst, "%m+RAT-LINE ID# %ld; Flags:%s\n" @@ -233,7 +233,7 @@ { rnd_rnd_box_t box; #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(arc->parent.layer->arc_tree, 0); #endif pcb_arc_get_end(arc, 0, &box.X1, &box.Y1); @@ -264,7 +264,7 @@ double area, u; #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(poly->parent.layer->polygon_tree, 0); #endif @@ -299,7 +299,7 @@ static void report_subc(gds_t *dst, pcb_subc_t *subc) { #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(PCB->Data->subc_tree, 0); #endif pcb_append_printf(dst, "%m+SUBCIRCUIT ID# %ld; Flags:%s\n" @@ -318,7 +318,7 @@ static void report_text(gds_t *dst, pcb_text_t *text) { #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(text->parent.layer->text_tree, 0); #endif @@ -335,7 +335,7 @@ static void report_gfx(gds_t *dst, pcb_gfx_t *gfx) { #ifndef NDEBUG - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(gfx->parent.layer->gfx_tree, 0); #endif Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 30979) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 30980) @@ -1052,7 +1052,7 @@ point2.Y += argv[argi2 + 1].d.i; pcb_route_init(&route); - pcb_route_calculate(PCB, &route, &point1, &point2, pcb_layer_id(PCB->Data, ptr->Layer), ptr->Line->Thickness, ptr->Line->Clearance, ptr->Line->Flags, pcb_gui->shift_is_pressed(pcb_gui), pcb_gui->control_is_pressed(pcb_gui)); + pcb_route_calculate(PCB, &route, &point1, &point2, pcb_layer_id(PCB->Data, ptr->Layer), ptr->Line->Thickness, ptr->Line->Clearance, ptr->Line->Flags, rnd_gui->shift_is_pressed(rnd_gui), rnd_gui->control_is_pressed(rnd_gui)); pcb_route_apply_to_line(&route, ptr->Layer, ptr->Line); pcb_route_destroy(&route); } @@ -1165,15 +1165,15 @@ } if (PCB_FLAG_TEST(PCB_FLAG_RAT, ptr->Line)) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.rat); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.rat); pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness, 0); } else if (direct || (conf_core.editor.move_linepoint_uses_route == 0)) { - pcb_render->set_color(pcb_crosshair.GC, &ptr->Layer->meta.real.color); + rnd_render->set_color(pcb_crosshair.GC, &ptr->Layer->meta.real.color); pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness, 0); /* Draw the DRC outline if it is enabled */ if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness + 2 * (conf_core.design.bloat + 1), 0); } } @@ -1191,13 +1191,13 @@ pcb_route_calculate(PCB, &route, ptr->delta_index[0] < 0 ? &point1 : &point2, - ptr->delta_index[0] < 0 ? &point2 : &point1, pcb_layer_id(PCB->Data, ptr->Layer), ptr->Line->Thickness, ptr->Line->Clearance, ptr->Line->Flags, pcb_gui->shift_is_pressed(pcb_gui), pcb_gui->control_is_pressed(pcb_gui)); + ptr->delta_index[0] < 0 ? &point2 : &point1, pcb_layer_id(PCB->Data, ptr->Layer), ptr->Line->Thickness, ptr->Line->Clearance, ptr->Line->Flags, rnd_gui->shift_is_pressed(rnd_gui), rnd_gui->control_is_pressed(rnd_gui)); pcb_route_draw(&route, pcb_crosshair.GC); if (conf_core.editor.show_drc) pcb_route_draw_drc(&route, pcb_crosshair.GC); pcb_route_destroy(&route); } - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } ptr++; @@ -1415,7 +1415,7 @@ pcb_route_add_arc(route, ¢er, arc.StartAngle, arc.Delta, arc.Width, layerid); if ((dx != 0) || (dy != 0)) - pcb_route_calculate_to(route, &endpoint, pcb_gui->shift_is_pressed(pcb_gui), pcb_gui->control_is_pressed(pcb_gui)); + pcb_route_calculate_to(route, &endpoint, rnd_gui->shift_is_pressed(rnd_gui), rnd_gui->control_is_pressed(rnd_gui)); } Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30979) +++ trunk/src_plugins/script/live_script.c (revision 30980) @@ -84,7 +84,7 @@ if (lvs->loaded) pcb_script_unload(lvs->longname, NULL); - if (pcb_gui != NULL) + if (rnd_gui != NULL) PCB_DAD_FREE(lvs->dlg); lvs_free_langs(lvs); free(lvs->name); @@ -262,7 +262,7 @@ title = pcb_concat("Live Scripting: ", name, NULL); PCB_DAD_NEW("live_script", lvs->dlg, title, lvs, pcb_false, lvs_close_cb); free(title); - pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 0); + rnd_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 0); return lvs; } @@ -273,8 +273,8 @@ lvs->loaded = 0; } - pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wrun, 1); - pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 0); + rnd_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wrun, 1); + rnd_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 0); return 0; } @@ -312,8 +312,8 @@ res = -1; } lvs->loaded = 1; - pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wrun, 0); - pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 1); + rnd_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wrun, 0); + rnd_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 1); if (!lvs->dlg[lvs->wpers].val.lng) live_stop(lvs); @@ -322,7 +322,7 @@ pcb_undo_inc_serial(); lvs->undo_post = pcb_undo_serial(); - pcb_gui->invalidate_all(pcb_gui); /* if the script drew anything, get it displayed */ + rnd_gui->invalidate_all(rnd_gui); /* if the script drew anything, get it displayed */ rnd_tempfile_unlink(fn); return res; @@ -343,7 +343,7 @@ return 1; } pcb_undo_above(lvs->undo_pre); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); return 0; } @@ -357,7 +357,7 @@ if (fn == NULL) { const char *default_ext = live_default_ext(lvs); - fn = pcb_gui->fileselect(pcb_gui, + fn = rnd_gui->fileselect(rnd_gui, "Load live script", "Load the a live script from file", lvs->fn, default_ext, rnd_hid_fsd_filter_any, "live_script", RND_HID_FSD_READ, NULL); if (fn == NULL) @@ -403,7 +403,7 @@ if (lvs->fn == NULL) lvs->fn = pcb_concat(lvs->name, ".", default_ext, NULL); - fn = pcb_gui->fileselect(pcb_gui, + fn = rnd_gui->fileselect(rnd_gui, "Save live script", "Save the source of a live script", lvs->fn, default_ext, rnd_hid_fsd_filter_any, "live_script", 0, NULL); if (fn == NULL) @@ -514,10 +514,10 @@ end++; strcpy(end, "Open live script dialog...."); strcpy(act, "LiveScript(new)"); - pcb_gui->create_menu(pcb_gui, path, &props); + rnd_gui->create_menu(rnd_gui, path, &props); /* strcpy(end, "Load live script...."); strcpy(act, "LiveScript(load)"); - pcb_gui->create_menu(pcb_gui, path, &props);*/ + rnd_gui->create_menu(rnd_gui, path, &props);*/ } @@ -540,8 +540,8 @@ lvs_close_cb(lvs, RND_HID_ATTR_EV_CODECLOSE); } htsp_uninit(&pcb_live_scripts); - if ((pcb_gui != NULL) && (pcb_gui->remove_menu != NULL)) - pcb_gui->remove_menu(pcb_gui, lvs_cookie); + if ((rnd_gui != NULL) && (rnd_gui->remove_menu != NULL)) + rnd_gui->remove_menu(rnd_gui, lvs_cookie); rnd_event_unbind_allcookie(lvs_cookie); } Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 30979) +++ trunk/src_plugins/script/script.c (revision 30980) @@ -111,8 +111,8 @@ the standard script cookie */ static void script_unreg(const char *cookie) { - if ((pcb_gui != NULL) && (pcb_gui->remove_menu != NULL)) - pcb_gui->remove_menu(pcb_gui, cookie); + if ((rnd_gui != NULL) && (rnd_gui->remove_menu != NULL)) + rnd_gui->remove_menu(rnd_gui, cookie); } /* unload a script, free all memory and remove it from all lists/hashes. Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30979) +++ trunk/src_plugins/script/script_act.c (revision 30980) @@ -138,7 +138,7 @@ if (cursor_path != NULL) { rnd_hid_attr_val_t hv; hv.str = cursor_path; - pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wslist, &hv); + rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wslist, &hv); free(cursor_path); } script_dlg_s2d_act(ctx); @@ -188,7 +188,7 @@ { script_dlg_t *ctx = caller_data; int failed; - char *tmp, *fn = pcb_gui->fileselect(pcb_gui, "script to load", "Select a script file to load", NULL, NULL, NULL, "script", RND_HID_FSD_READ, NULL); + char *tmp, *fn = rnd_gui->fileselect(rnd_gui, "script to load", "Select a script file to load", NULL, NULL, NULL, "script", RND_HID_FSD_READ, NULL); pcb_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}}; typedef struct { PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/script/timer.c =================================================================== --- trunk/src_plugins/script/timer.c (revision 30979) +++ trunk/src_plugins/script/timer.c (revision 30980) @@ -111,7 +111,7 @@ { static rnd_hidval_t hv; timer_running = 1; - pcb_gui->add_timer(pcb_gui, timer_cb, 100, hv); + rnd_gui->add_timer(rnd_gui, timer_cb, 100, hv); } Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 30979) +++ trunk/src_plugins/serpentine/serpentine.c (revision 30980) @@ -96,11 +96,11 @@ const rnd_coord_t x2 = p_info->end.X + nx; const rnd_coord_t y2 = p_info->end.Y + ny; - pcb_render->set_color(pcb_crosshair.GC, "#808080" /*conf_core.appearance.color.attached*/ ); - pcb_render->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, p_info->end.X, p_info->end.Y ); - pcb_render->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, x1, y1 ); - pcb_render->draw_line(pcb_crosshair.GC, p_info->end.X, p_info->end.Y, x2, y2 ); - pcb_render->draw_line(pcb_crosshair.GC, x1, y1, x2, y2 ); + rnd_render->set_color(pcb_crosshair.GC, "#808080" /*conf_core.appearance.color.attached*/ ); + rnd_render->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, p_info->end.X, p_info->end.Y ); + rnd_render->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, x1, y1 ); + rnd_render->draw_line(pcb_crosshair.GC, p_info->end.X, p_info->end.Y, x2, y2 ); + rnd_render->draw_line(pcb_crosshair.GC, x1, y1, x2, y2 ); } int Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 30979) +++ trunk/src_plugins/shape/shape_dialog.c (revision 30980) @@ -49,11 +49,11 @@ /* elliptical logics */ if (!shp->dlg[shp->pell].val.lng) { - pcb_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_false); + rnd_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_false); PCB_DAD_SET_VALUE(hid_ctx, shp->pry, crd, shp->dlg[shp->prx].val.crd); } else - pcb_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_true); + rnd_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_true); del_obj(shp); shp->obj = (pcb_any_obj_t *)regpoly_place( @@ -71,19 +71,19 @@ /* elliptical logics */ if (!shp->dlg[shp->rell].val.lng) { - pcb_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_false); + rnd_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_false); PCB_DAD_SET_VALUE(hid_ctx, shp->ry, crd, shp->dlg[shp->rx].val.crd); } else - pcb_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_true); + rnd_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_true); /* rectangular logics */ if (!shp->dlg[shp->rrect].val.lng) { - pcb_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_false); + rnd_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_false); PCB_DAD_SET_VALUE(hid_ctx, shp->h, crd, shp->dlg[shp->w].val.crd); } else - pcb_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_true); + rnd_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_true); for(n = 0; n < 4; n++) corner[n] = shp->dlg[shp->corner[n]].val.lng; Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 30979) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 30980) @@ -1083,7 +1083,7 @@ for (i = 0; i < vtp0_len(&attached_path.lines); i++) { rnd_point_t *p1 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point1; rnd_point_t *p2 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point2; - pcb_render->draw_line(pcb_crosshair.GC, p1->X, p1->Y, p2->X, p2->Y); + rnd_render->draw_line(pcb_crosshair.GC, p1->X, p1->Y, p2->X, p2->Y); } } } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 30979) +++ trunk/src_plugins/teardrops/teardrops.c (revision 30980) @@ -258,7 +258,7 @@ check_pstk((pcb_pstk_t *)b); pcb_r_end(&it); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); if (new_arcs) pcb_undo_inc_serial(); Index: trunk/src_plugins/tool_std/tool_arc.c =================================================================== --- trunk/src_plugins/tool_std/tool_arc.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_arc.c (revision 30980) @@ -134,7 +134,7 @@ void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl) { - pcb_crosshair.AttachedBox.otherway = pcb_gui->shift_is_pressed(pcb_gui); + pcb_crosshair.AttachedBox.otherway = rnd_gui->shift_is_pressed(rnd_gui); } void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl) @@ -144,15 +144,15 @@ if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) { pcb_xordraw_attached_arc(conf_core.design.line_thickness); if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1)); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } } else { /* Draw a circle (0 length line) to show where the arc will start when placed */ if(PCB_CURRLAYER(pcb)) - pcb_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color); + rnd_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color); pcb_draw_wireframe_line(pcb_crosshair.GC, pcb_crosshair.X, pcb_crosshair.Y, @@ -160,12 +160,12 @@ conf_core.design.line_thickness, 0); if(conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); pcb_draw_wireframe_line(pcb_crosshair.GC, pcb_crosshair.X, pcb_crosshair.Y, pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } } Index: trunk/src_plugins/tool_std/tool_arrow.c =================================================================== --- trunk/src_plugins/tool_std/tool_arrow.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_arrow.c (revision 30980) @@ -70,7 +70,7 @@ if (hl->tool_click) { pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); hl->tool_click = pcb_false; - if (pcb_crosshair_note.Moving && !pcb_gui->shift_is_pressed(pcb_gui)) { + if (pcb_crosshair_note.Moving && !rnd_gui->shift_is_pressed(rnd_gui)) { hl->tool_grabbed.status = pcb_true; pcb_crosshair_note.Buffer = conf_core.editor.buffer_number; pcb_buffer_set_number(PCB_MAX_BUFFER - 1); @@ -82,13 +82,13 @@ pcb_tool_is_saved = pcb_true; pcb_tool_select_by_name(hl, "buffer"); } - else if (hl->tool_hit && !pcb_gui->shift_is_pressed(pcb_gui)) { + else if (hl->tool_hit && !rnd_gui->shift_is_pressed(rnd_gui)) { rnd_rnd_box_t box; hl->tool_grabbed.status = pcb_true; pcb_tool_save(hl); pcb_tool_is_saved = pcb_true; - pcb_tool_select_by_name(hl, pcb_gui->control_is_pressed(pcb_gui)? "copy" : "move"); + pcb_tool_select_by_name(hl, rnd_gui->control_is_pressed(rnd_gui)? "copy" : "move"); pcb_crosshair.AttachedObject.Ptr1 = pcb_crosshair_note.ptr1; pcb_crosshair.AttachedObject.Ptr2 = pcb_crosshair_note.ptr2; pcb_crosshair.AttachedObject.Ptr3 = pcb_crosshair_note.ptr3; @@ -100,10 +100,10 @@ } pcb_crosshair.dragx = hl->tool_x; pcb_crosshair.dragy = hl->tool_y; - box.X1 = hl->tool_x + PCB_SLOP * pcb_pixel_slop; - box.X2 = hl->tool_x - PCB_SLOP * pcb_pixel_slop; - box.Y1 = hl->tool_y + PCB_SLOP * pcb_pixel_slop; - box.Y2 = hl->tool_y - PCB_SLOP * pcb_pixel_slop; + box.X1 = hl->tool_x + PCB_SLOP * rnd_pixel_slop; + box.X2 = hl->tool_x - PCB_SLOP * rnd_pixel_slop; + box.Y1 = hl->tool_y + PCB_SLOP * rnd_pixel_slop; + box.Y2 = hl->tool_y - PCB_SLOP * rnd_pixel_slop; pcb_crosshair.drags = pcb_list_block(pcb, &box, &pcb_crosshair.drags_len); pcb_crosshair.drags_current = 0; pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, pcb_true); @@ -119,7 +119,7 @@ box.X2 = RND_MAX_COORD; box.Y2 = RND_MAX_COORD; /* unselect first if shift key not down */ - if (!pcb_gui->shift_is_pressed(pcb_gui) && pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false)) + if (!rnd_gui->shift_is_pressed(rnd_gui) && pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false)) pcb_board_set_changed_flag(pcb_true); pcb_tool_notify_block(); pcb_crosshair.AttachedBox.Point1.X = hl->tool_x; @@ -130,7 +130,7 @@ if (pcb_crosshair.extobj_edit != NULL) { pcb_extobj_float_geo(pcb_crosshair.extobj_edit); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } @@ -144,7 +144,7 @@ hl->tool_click = pcb_true; /* do something after click time */ hv.ptr = hl; - pcb_gui->add_timer(pcb_gui, click_timer_cb, conf_core.editor.click_time, hv); + rnd_gui->add_timer(rnd_gui, click_timer_cb, conf_core.editor.click_time, hv); /* see if we clicked on something already selected * (pcb_crosshair_note.Moving) or clicked on a MOVE_TYPE @@ -193,7 +193,7 @@ hl->tool_click = pcb_false; /* inhibit timer action */ pcb_undo_save_serial(); /* unselect first if shift key not down */ - if (!pcb_gui->shift_is_pressed(pcb_gui)) { + if (!rnd_gui->shift_is_pressed(rnd_gui)) { if (pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false)) pcb_board_set_changed_flag(pcb_true); if (pcb_crosshair_note.Moving) { Index: trunk/src_plugins/tool_std/tool_buffer.c =================================================================== --- trunk/src_plugins/tool_std/tool_buffer.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_buffer.c (revision 30980) @@ -57,7 +57,7 @@ { pcb_board_t *pcb = (pcb_board_t *)hl; - if (pcb_gui->shift_is_pressed(pcb_gui)) { + if (rnd_gui->shift_is_pressed(rnd_gui)) { rnd_actionva(hl, "ReplaceFootprint", "object", "@buffer", "dumb", NULL); return; } @@ -64,7 +64,7 @@ if (pcb_buffer_copy_to_layout(pcb, pcb_crosshair.AttachedObject.tx, pcb_crosshair.AttachedObject.ty, keep_ids)) { pcb_board_set_changed_flag(pcb_true); - pcb_gui->invalidate_all(pcb_gui); + rnd_gui->invalidate_all(rnd_gui); } } Index: trunk/src_plugins/tool_std/tool_line.c =================================================================== --- trunk/src_plugins/tool_std/tool_line.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_line.c (revision 30980) @@ -109,7 +109,7 @@ case PCB_CH_STATE_FIRST: /* first point */ TODO("subc: this should work on heavy terminals too!") if (pcb->RatDraw && pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr1, &ptr1) == PCB_OBJ_VOID) { - pcb_gui->beep(pcb_gui); + rnd_gui->beep(rnd_gui); break; } if (conf_core.editor.auto_drc) { @@ -341,7 +341,7 @@ void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl) { /* don't draw outline when ctrl key is pressed */ - if (pcb_gui->control_is_pressed(pcb_gui)) { + if (rnd_gui->control_is_pressed(rnd_gui)) { pcb_crosshair.AttachedLine.draw = pcb_false; } else { @@ -366,12 +366,12 @@ pcb_route_draw(&pcb_crosshair.Route,pcb_crosshair.GC); if (conf_core.editor.show_drc) pcb_route_draw_drc(&pcb_crosshair.Route,pcb_crosshair.GC); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } else { /* Draw a circle (0 length line) to show where the line will be placed */ if (PCB_CURRLAYER(pcb)) - pcb_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color); + rnd_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color); pcb_draw_wireframe_line(pcb_crosshair.GC, pcb_crosshair.X, pcb_crosshair.Y, @@ -379,12 +379,12 @@ conf_core.design.line_thickness,0 ); if (conf_core.editor.show_drc) { - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); pcb_draw_wireframe_line(pcb_crosshair.GC, pcb_crosshair.X, pcb_crosshair.Y, pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } } } Index: trunk/src_plugins/tool_std/tool_poly.c =================================================================== --- trunk/src_plugins/tool_std/tool_poly.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_poly.c (revision 30980) @@ -102,7 +102,7 @@ { pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; - if (pcb_gui->control_is_pressed(pcb_gui)) { + if (rnd_gui->control_is_pressed(rnd_gui)) { line->draw = pcb_false; return; } @@ -121,7 +121,7 @@ { /* draw only if starting point is set */ if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) - pcb_render->draw_line(pcb_crosshair.GC, + rnd_render->draw_line(pcb_crosshair.GC, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y); Index: trunk/src_plugins/tool_std/tool_polyhole.c =================================================================== --- trunk/src_plugins/tool_std/tool_polyhole.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_polyhole.c (revision 30980) @@ -132,7 +132,7 @@ { pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; - if (pcb_gui->control_is_pressed(pcb_gui)) { + if (rnd_gui->control_is_pressed(rnd_gui)) { line->draw = pcb_false; return; } @@ -151,7 +151,7 @@ { /* draw only if starting point is set */ if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) - pcb_render->draw_line(pcb_crosshair.GC, + rnd_render->draw_line(pcb_crosshair.GC, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y); Index: trunk/src_plugins/tool_std/tool_rotate.c =================================================================== --- trunk/src_plugins/tool_std/tool_rotate.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_rotate.c (revision 30980) @@ -45,7 +45,7 @@ void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl) { pcb_screen_obj_rotate90((pcb_board_t *)hl, hl->tool_x, hl->tool_y, - pcb_gui->shift_is_pressed(pcb_gui) ? (conf_core.editor.show_solder_side ? 1 : 3) : (conf_core.editor.show_solder_side ? 3 : 1)); + rnd_gui->shift_is_pressed(rnd_gui) ? (conf_core.editor.show_solder_side ? 1 : 3) : (conf_core.editor.show_solder_side ? 3 : 1)); pcb_subc_as_board_update(PCB); } Index: trunk/src_plugins/tool_std/tool_thermal.c =================================================================== --- trunk/src_plugins/tool_std/tool_thermal.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_thermal.c (revision 30980) @@ -57,7 +57,7 @@ int cycles = sizeof(cycle) / sizeof(cycle[0]); th = pcb_pstk_get_thermal(ps, lid, 1); - if (pcb_gui->shift_is_pressed(pcb_gui)) { + if (rnd_gui->shift_is_pressed(rnd_gui)) { int n, curr = -1; /* cycle through the variants to find the current one */ for(n = 0; n < cycles; n++) { Index: trunk/src_plugins/tool_std/tool_via.c =================================================================== --- trunk/src_plugins/tool_std/tool_via.c (revision 30979) +++ trunk/src_plugins/tool_std/tool_via.c (revision 30980) @@ -76,7 +76,7 @@ pcb_obj_add_attribs((pcb_any_obj_t *)ps, pcb->pen_attr, NULL); pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); - if (pcb_gui->shift_is_pressed(pcb_gui)) + if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_tool_thermal_on_pstk(ps, PCB_CURRLID(pcb)); pcb_undo_inc_serial(); @@ -88,7 +88,7 @@ static void xor_draw_fake_via(rnd_coord_t x, rnd_coord_t y, rnd_coord_t dia, rnd_coord_t clearance) { rnd_coord_t r = (dia/2)+clearance; - pcb_render->draw_arc(pcb_crosshair.GC, x, y, r, r, 0, 360); + rnd_render->draw_arc(pcb_crosshair.GC, x, y, r, r, 0, 360); } @@ -98,9 +98,9 @@ xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, 0); if (conf_core.editor.show_drc) { /* XXX: Naughty cheat - use the mask to draw DRC clearance! */ - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc); xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, conf_core.design.clearance); - pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); + rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); } } Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30979) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30980) @@ -144,7 +144,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str); if (!fname || !*fname) { - fname = pcb_gui->fileselect(pcb_gui, "Load Vendor Resource File...", + fname = rnd_gui->fileselect(rnd_gui, "Load Vendor Resource File...", "Picks a vendor resource file to load.\n" "This file can contain drc settings for a\n" "particular vendor as well as a list of\n" Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30979) +++ trunk/tests/conf/conftest.c (revision 30980) @@ -14,7 +14,7 @@ int global_notify = 0; rnd_conf_hid_id_t hid_id; const char *hid_cookie = "conftest cookie"; -rnd_hid_t *pcb_gui = NULL; +rnd_hid_t *rnd_gui = NULL; const char *pcb_hidlib_default_embedded_menu = ""; const char *pcbhl_menu_file_paths[] = { "./", "~/.pcb-rnd/", PCBSHAREDIR "/", NULL }; const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht"; Index: trunk/tests/propedit/tester.c =================================================================== --- trunk/tests/propedit/tester.c (revision 30979) +++ trunk/tests/propedit/tester.c (revision 30980) @@ -2,7 +2,7 @@ #include #include "props.h" -void *pcb_gui = NULL; +void *rnd_gui = NULL; int pcb_propsel_set(const char *prop, const char *value) {