Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 34762) +++ trunk/src/draw.c (revision 34763) @@ -984,7 +984,7 @@ } int pcb_draw_stamp = 0; -void rnd_expose_main(rnd_hid_t * hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller) +void pcb_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller) { if (!pcb_draw_inhibit) { pcb_output_t save; @@ -1005,7 +1005,7 @@ } } -void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) +void pcb_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) { pcb_output_t save; expose_begin(&save, hid); Index: trunk/src/draw.h =================================================================== --- trunk/src/draw.h (revision 34762) +++ trunk/src/draw.h (revision 34763) @@ -188,4 +188,7 @@ #define PCB_DRAW_TERM_GFX_WIDTH (-3) +void pcb_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller); +void pcb_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e); + #endif Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 34762) +++ trunk/src/main.c (revision 34763) @@ -76,6 +76,7 @@ #include #include "tool_logic.h" #include "pixmap_pcb.h" +#include "draw.h" TODO("librnd: remove this once librnd is not extern anymore") #include @@ -425,9 +426,10 @@ rnd_app.crosshair_move_to = pcb_hidlib_crosshair_move_to; rnd_app.draw_marks = pcb_crosshair_draw_marks; rnd_app.draw_attached = pcb_crosshair_draw_attached; + rnd_app.expose_main = pcb_expose_main; + rnd_app.expose_preview = pcb_expose_preview; - rnd_conf_dot_dir = DOT_PCB_RND; rnd_conf_lib_dir = PCBLIBDIR; Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 34762) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 34763) @@ -388,7 +388,7 @@ /* draw the board */ memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - rnd_expose_main(rnd_gui, e, &xform); + rnd_app.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) { Index: trunk/src_plugins/dialogs/dlg_obj_list.c =================================================================== --- trunk/src_plugins/dialogs/dlg_obj_list.c (revision 34762) +++ trunk/src_plugins/dialogs/dlg_obj_list.c (revision 34763) @@ -46,7 +46,7 @@ /* draw the board */ memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - rnd_expose_main(rnd_gui, e, &xform); + rnd_app.expose_main(rnd_gui, e, &xform); /* restore object color */ obj->override_color = saved_color; Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 34762) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 34763) @@ -243,7 +243,7 @@ pcb_draw_force_termlab = 1; memset(&xform, 0, sizeof(xform)); xform.layer_faded = 1; - rnd_expose_main(rnd_gui, e, &xform); + rnd_app.expose_main(rnd_gui, e, &xform); pcb_draw_force_termlab = old_termlab; /* restore object color */ Index: trunk/src_plugins/export_c_draw/export_c_draw.c =================================================================== --- trunk/src_plugins/export_c_draw/export_c_draw.c (revision 34762) +++ trunk/src_plugins/export_c_draw/export_c_draw.c (revision 34763) @@ -113,7 +113,7 @@ memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); - rnd_expose_main(&c_draw_hid, &ctx, xform); + rnd_app.expose_main(&c_draw_hid, &ctx, xform); rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 34762) +++ trunk/src_plugins/export_dxf/dxf.c (revision 34763) @@ -230,7 +230,7 @@ dxf_ctx.drill_fill = options[HA_drill_fill].lng; dxf_ctx.drill_contour = options[HA_drill_contour].lng; - rnd_expose_main(&dxf_hid, &hectx, xform); + rnd_app.expose_main(&dxf_hid, &hectx, xform); rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 34762) +++ trunk/src_plugins/export_excellon/excellon.c (revision 34763) @@ -252,11 +252,11 @@ lastwidth = -1; finding_apertures = 1; - rnd_expose_main(&excellon_hid, &ctx, &xform); + rnd_app.expose_main(&excellon_hid, &ctx, &xform); lastwidth = -1; finding_apertures = 0; - rnd_expose_main(&excellon_hid, &ctx, &xform); + rnd_app.expose_main(&excellon_hid, &ctx, &xform); rnd_conf_update(NULL, -1); /* resotre forced sets */ Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 34762) +++ trunk/src_plugins/export_gerber/gerber.c (revision 34763) @@ -386,12 +386,12 @@ lastgroup = -1; layer_list_idx = 0; finding_apertures = 1; - rnd_expose_main(&gerber_hid, &ctx, &xform); + rnd_app.expose_main(&gerber_hid, &ctx, &xform); lastgroup = -2; layer_list_idx = 0; finding_apertures = 0; - rnd_expose_main(&gerber_hid, &ctx, &xform); + rnd_app.expose_main(&gerber_hid, &ctx, &xform); memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 34762) +++ trunk/src_plugins/export_openems/export_openems.c (revision 34763) @@ -651,7 +651,7 @@ openems_wr_m_outline(&wctx); fprintf(wctx.f, "%%%%%% Copper objects\n"); - rnd_expose_main(&openems_hid, &ctx, NULL); + rnd_app.expose_main(&openems_hid, &ctx, NULL); fprintf(wctx.f, "%%%%%% Port(s) on terminals\n"); openems_wr_testpoints(&wctx, wctx.pcb->Data); Index: trunk/src_plugins/export_openems/openems_xml.c =================================================================== --- trunk/src_plugins/export_openems/openems_xml.c (revision 34762) +++ trunk/src_plugins/export_openems/openems_xml.c (revision 34763) @@ -152,7 +152,7 @@ ectx.view.X2 = ctx->pcb->hidlib.size_x; ectx.view.Y2 = ctx->pcb->hidlib.size_y; - rnd_expose_main(&openems_hid, &ectx, NULL); + rnd_app.expose_main(&openems_hid, &ectx, NULL); openems_wr_xml_layergrp_end(ctx); /* export substrate bricks */ Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 34762) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 34763) @@ -161,7 +161,7 @@ rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); openscad_options = options; - rnd_expose_main(&openscad_hid, &ctx, NULL); + rnd_app.expose_main(&openscad_hid, &ctx, NULL); openscad_options = NULL; rnd_conf_update(NULL, -1); /* restore forced sets */ Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 34762) +++ trunk/src_plugins/export_png/png.c (revision 34763) @@ -579,7 +579,7 @@ } ctx.view = *bounds; - rnd_expose_main(&png_hid, &ctx, xform); + rnd_app.expose_main(&png_hid, &ctx, xform); memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); rnd_conf_update(NULL, -1); /* restore forced sets */ Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 34762) +++ trunk/src_plugins/export_ps/eps.c (revision 34763) @@ -303,7 +303,7 @@ } ctx.view = *bounds; - rnd_expose_main(&eps_hid, &ctx, xform); + rnd_app.expose_main(&eps_hid, &ctx, xform); eps_print_footer(f); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 34762) +++ trunk/src_plugins/export_ps/ps.c (revision 34763) @@ -588,14 +588,14 @@ fprintf(the_file, "/tocp { /y y 12 sub def 90 y moveto rightshow } bind def\n"); global.doing_toc = 1; - global.pagecount = 1; /* 'pagecount' is modified by rnd_expose_main() call */ - rnd_expose_main(&ps_hid, &global.exps, xform); + global.pagecount = 1; /* 'pagecount' is modified by rnd_app.expose_main() call */ + rnd_app.expose_main(&ps_hid, &global.exps, xform); } global.pagecount = 1; /* Reset 'pagecount' if single file */ global.doing_toc = 0; ps_set_layer_group(rnd_render, -1, NULL, -1, -1, 0, -1, NULL); /* reset static vars */ - rnd_expose_main(&ps_hid, &global.exps, xform); + rnd_app.expose_main(&ps_hid, &global.exps, xform); if (the_file) fprintf(the_file, "showpage\n"); Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 34762) +++ trunk/src_plugins/export_svg/svg.c (revision 34763) @@ -263,7 +263,7 @@ xform->enable_silk_invis_clr = 1; } - rnd_expose_main(&svg_hid, &ctx, xform); + rnd_app.expose_main(&svg_hid, &ctx, xform); rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/tests/propedit/glue.c =================================================================== --- trunk/tests/propedit/glue.c (revision 34762) +++ trunk/tests/propedit/glue.c (revision 34763) @@ -40,11 +40,3 @@ void conf_core_init() { } - -void rnd_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller) -{ -} - -void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) -{ -} Index: trunk/util/gsch2pcb-rnd/glue.c =================================================================== --- trunk/util/gsch2pcb-rnd/glue.c (revision 34762) +++ trunk/util/gsch2pcb-rnd/glue.c (revision 34763) @@ -32,6 +32,3 @@ static const char rnd_conf_internal_arr[] = { 0 }; const char *rnd_conf_internal = rnd_conf_internal_arr; - -void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) {} -void rnd_expose_main(rnd_hid_t * hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller) {}