Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 7049) +++ trunk/scconfig/Rev.h (revision 7050) @@ -1 +1 @@ -static const int myrev = 7042; +static const int myrev = 7050; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 7049) +++ trunk/scconfig/Rev.tab (revision 7050) @@ -1,3 +1,4 @@ +7050 configure multifont support: merge all draw stubs for simplicity 7042 configure gtk splitup 7022 configure multifont support: new actions 6980 configure gtk splitup: preferences dialog Index: trunk/src/stub_draw_fab.c =================================================================== --- trunk/src/stub_draw_fab.c (revision 7049) +++ trunk/src/stub_draw_fab.c (nonexistent) @@ -1,50 +0,0 @@ -/* - * COPYRIGHT - * - * PCB, interactive printed circuit board design - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Contact addresses for paper mail and Email: - * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany - * Thomas.Nau@rz.uni-ulm.de - * - */ -#include "config.h" -#include "stub_draw_fab.h" -#include "obj_text.h" -#include "obj_text_draw.h" - -int dummy_DrawFab_overhang(void) -{ - return 0; -} - -void dummy_DrawFab(pcb_hid_gc_t gc) -{ - pcb_text_t t; - t.X = 0; - t.Y = 0; - t.TextString = "Can't render the fab layer: the draw_fab plugin is not compiled and/or not loaded"; - t.Direction = 0; - t.Scale = 150; - t.Flags = pcb_no_flags(); - DrawTextLowLevel(&t, 0); -} - -int (*pcb_stub_draw_fab_overhang)(void) = dummy_DrawFab_overhang; -void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc) = dummy_DrawFab; - Index: trunk/src/stub_draw_fab.h =================================================================== --- trunk/src/stub_draw_fab.h (revision 7049) +++ trunk/src/stub_draw_fab.h (nonexistent) @@ -1,37 +0,0 @@ -/* - * COPYRIGHT - * - * PCB, interactive printed circuit board design - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Contact addresses for paper mail and Email: - * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany - * Thomas.Nau@rz.uni-ulm.de - * - */ - -/* drawing the fab layer is a plugin now */ - -#ifndef PCB_STUB_DRAW_FAB_H -#define PCB_STUB_DRAW_FAB_H - -#include "hid.h" - -extern int (*pcb_stub_draw_fab_overhang)(void); -extern void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc); - -#endif Index: trunk/src/stub_draw_csect.c =================================================================== --- trunk/src/stub_draw_csect.c (revision 7049) +++ trunk/src/stub_draw_csect.c (nonexistent) @@ -1,54 +0,0 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * Copyright (C) 2016 Tibor 'Igor2' Palinkas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* stub for drawing cross section of the board */ - -#include "config.h" -#include "stub_draw_csect.h" -#include "obj_text.h" -#include "obj_text_draw.h" - -static void dummy_draw_csect(pcb_hid_gc_t gc) -{ - pcb_text_t t; - t.X = 0; - t.Y = 0; - t.TextString = "Can't render the fab layer: the draw_csect plugin is not compiled and/or not loaded"; - t.Direction = 0; - t.Scale = 150; - t.Flags = pcb_no_flags(); - DrawTextLowLevel(&t, 0); -} - -static pcb_bool dummy_mouse_csect(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) -{ - return 0; -} - -static void dummy_csect_overlay(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx) -{ -} - -void (*pcb_stub_draw_csect)(pcb_hid_gc_t gc) = dummy_draw_csect; -pcb_bool (*pcb_stub_draw_csect_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) = dummy_mouse_csect; -void (*pcb_stub_draw_csect_overlay)(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx) = dummy_csect_overlay; - Index: trunk/src/stub_draw_csect.h =================================================================== --- trunk/src/stub_draw_csect.h (revision 7049) +++ trunk/src/stub_draw_csect.h (nonexistent) @@ -1,33 +0,0 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * Copyright (C) 2016 Tibor 'Igor2' Palinkas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef PCB_STUD_DRAW_CSECT_H -#define PCB_STUD_DRAW_CSECT_H - -#include "hid.h" -#include "pcb_bool.h" - -extern void (*pcb_stub_draw_csect)(pcb_hid_gc_t gc); -extern pcb_bool (*pcb_stub_draw_csect_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y); -extern void (*pcb_stub_draw_csect_overlay)(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx); - -#endif Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 7049) +++ trunk/src/Makefile.dep (revision 7050) @@ -292,9 +292,8 @@ misc_util.h ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h \ obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h \ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \ - vtonpoint.h hid.h error.h drc.h buffer.h draw.h plugins.h \ - stub_draw_csect.h compat_misc.h hid_actions.h obj_text_draw.h \ - obj_line_draw.h dolists.h + vtonpoint.h hid.h error.h drc.h buffer.h draw.h plugins.h stub_draw.h \ + compat_misc.h hid_actions.h obj_text_draw.h obj_line_draw.h dolists.h ../src_plugins/draw_fab/draw_fab.o: ../src_plugins/draw_fab/draw_fab.c \ ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \ @@ -312,13 +311,30 @@ layer_grp.h library.h rats_patch.h board.h build_run.h data.h \ crosshair.h vtonpoint.h hid.h error.h drc.h buffer.h draw.h \ ../src_plugins/draw_fab/../report/drill.h obj_all.h plugins.h \ - stub_draw_fab.h ../src_plugins/draw_fab/draw_fab_conf.h conf.h \ - pcb-printf.h ../src_3rd/genvector/gds_char.h \ - ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ - ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ - ../src_3rd/liblihata/genht/htsp.h ../src_3rd/genvector/vtp0.h \ - list_conf.h conf.h obj_text_draw.h \ + stub_draw.h ../src_plugins/draw_fab/draw_fab_conf.h conf.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/genvector/vtp0.h list_conf.h conf.h obj_text_draw.h \ ../src_plugins/draw_fab/draw_fab_conf_fields.h +../src_plugins/draw_fontsel/draw_fontsel.o: \ + ../src_plugins/draw_fontsel/draw_fontsel.c ../config.h board.h const.h \ + macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \ + ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \ + obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h font.h \ + ../src_3rd/liblihata/genht/htip.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h box.h math_helper.h move.h \ + misc_util.h ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h \ + obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h \ + layer_grp.h library.h rats_patch.h board.h build_run.h data.h \ + crosshair.h vtonpoint.h hid.h error.h drc.h buffer.h draw.h obj_all.h \ + plugins.h stub_draw.h obj_text_draw.h ../src_plugins/export_bboard/bboard.o: \ ../src_plugins/export_bboard/bboard.c ../config.h math_helper.h board.h \ const.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ @@ -683,7 +699,7 @@ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/genvector/vtp0.h \ - list_conf.h compat_misc.h compat_nls.h stub_draw_fab.h dolists.h + list_conf.h compat_misc.h compat_nls.h stub_draw.h dolists.h ../src_plugins/export_stat/stat.o: ../src_plugins/export_stat/stat.c \ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \ pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -972,7 +988,6 @@ plug_footprint.h vtlibrary.h plug_io.h misc_util.h layer.h compat_nls.h \ layer_vis.h ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \ ../src_plugins/hid_gtk/gui-drc-window.h \ - ../src_plugins/lib_gtk_common/dlg_log.h \ ../src_plugins/hid_gtk/gui-library-window.h \ ../src_plugins/hid_gtk/gui-command-window.h \ ../src_plugins/hid_gtk/gui-top-window.h \ @@ -990,6 +1005,7 @@ ../src_plugins/lib_gtk_common/dlg_file_chooser.h \ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/dlg_input.h \ + ../src_plugins/lib_gtk_common/dlg_log.h \ ../src_plugins/lib_gtk_common/dlg_message.h \ ../src_plugins/lib_gtk_common/dlg_print.h \ ../src_plugins/lib_gtk_common/dlg_progress.h \ @@ -1089,30 +1105,6 @@ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \ ../src_plugins/lib_gtk_common/win_place.h \ ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h -../src_plugins/lib_gtk_common/dlg_log.o: \ - ../src_plugins/lib_gtk_common/dlg_log.c ../config.h \ - ../src_plugins/lib_gtk_common/dlg_log.h pcb_bool.h error.h conf_core.h \ - conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ - ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ - ../src_3rd/genvector/vtp0.h list_conf.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h conf_hid.h error.h \ - pcb-printf.h hid_actions.h hid.h drc.h attrib.h layer.h obj_all_list.h \ - obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \ - ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ - obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ - obj_pinvia_list.h obj_pinvia.h obj_text.h font.h \ - ../src_3rd/liblihata/genht/htip.h box.h math_helper.h macro.h move.h \ - misc_util.h ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h \ - obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h \ - layer_grp.h compat_nls.h ../src_plugins/hid_gtk/gtkhid-main.h \ - ../src_plugins/lib_gtk_common/win_place.h \ - ../src_plugins/lib_gtk_common/bu_text_view.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h ../src_plugins/hid_gtk/gui-netlist-window.o: \ ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h \ ../src_plugins/hid_gtk/gui-netlist-window.h pcb_bool.h unit.h \ @@ -1303,7 +1295,7 @@ board.h hid_attrib.h hid_helper.h hid_init.h hid_color.h hid_extents.h \ hid_flags.h hid_actions.h ../src_plugins/hid_lesstif/stdarg.h \ misc_util.h compat_misc.h layer_vis.h \ - ../src_plugins/hid_lesstif/dlg_preview.c stub_draw_csect.h dolists.h + ../src_plugins/hid_lesstif/dlg_preview.c stub_draw.h dolists.h ../src_plugins/hid_lesstif/menu.o: ../src_plugins/hid_lesstif/menu.c \ ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -2267,6 +2259,30 @@ ../src_plugins/lib_gtk_common/dlg_input.o: \ ../src_plugins/lib_gtk_common/dlg_input.c ../config.h \ ../src_plugins/lib_gtk_common/dlg_input.h +../src_plugins/lib_gtk_common/dlg_log.o: \ + ../src_plugins/lib_gtk_common/dlg_log.c ../config.h \ + ../src_plugins/lib_gtk_common/dlg_log.h pcb_bool.h error.h conf_core.h \ + conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + ../src_3rd/genvector/vtp0.h list_conf.h \ + ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h globalconst.h conf_hid.h error.h \ + pcb-printf.h hid_actions.h hid.h drc.h attrib.h layer.h obj_all_list.h \ + obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \ + ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ + obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ + obj_pinvia_list.h obj_pinvia.h obj_text.h font.h \ + ../src_3rd/liblihata/genht/htip.h box.h math_helper.h macro.h move.h \ + misc_util.h ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h \ + obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h \ + layer_grp.h compat_nls.h ../src_plugins/lib_gtk_common/win_place.h \ + ../src_plugins/lib_gtk_common/bu_text_view.h \ + ../src_plugins/lib_gtk_common/compat.h \ + ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h ../src_plugins/lib_gtk_common/dlg_message.o: \ ../src_plugins/lib_gtk_common/dlg_message.c ../config.h \ ../src_plugins/lib_gtk_common/dlg_message.h compat_nls.h @@ -2625,8 +2641,8 @@ library.h rats_patch.h board.h data.h crosshair.h vtonpoint.h hid.h \ buffer.h event.h layer.h action_helper.h change.h plug_io.h error.h \ draw.h pcb-printf.h hid_attrib.h conf.h misc_util.h paths.h \ - plug_footprint.h vtlibrary.h stub_draw_csect.h compat_misc.h \ - compat_nls.h fptr_cast.h ../src_3rd/liblihata/tree.h \ + plug_footprint.h vtlibrary.h stub_draw.h compat_misc.h compat_nls.h \ + fptr_cast.h ../src_3rd/liblihata/tree.h \ ../src_plugins/lib_gtk_config/gtk_conf_list.h \ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ ../src_plugins/lib_gtk_common/util_str.h \ @@ -3627,10 +3643,9 @@ ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h library.h \ rats_patch.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h buffer.h \ - draw.h rotate.h rtree.h stub_draw_fab.h stub_draw_csect.h obj_all.h \ - layer_ui.h obj_pad_draw.h obj_pinvia_draw.h obj_elem_draw.h \ - obj_line_draw.h obj_arc_draw.h obj_rat_draw.h obj_poly_draw.h \ - obj_text_draw.h + draw.h rotate.h rtree.h stub_draw.h obj_all.h layer_ui.h obj_pad_draw.h \ + obj_pinvia_draw.h obj_elem_draw.h obj_line_draw.h obj_arc_draw.h \ + obj_rat_draw.h obj_poly_draw.h obj_text_draw.h error.o: error.c ../config.h data.h globalconst.h global_typedefs.h \ pcb_bool.h unit.h layer.h attrib.h obj_all_list.h obj_arc_list.h \ obj_common.h ../src_3rd/liblihata/genht/hash.h \ @@ -4883,9 +4898,9 @@ drc.h buffer.h action_helper.h undo.h funchash_core.h funchash.h \ funchash_core_list.h select.h operation.h draw.h remove.h copy.h \ hid_attrib.h compat_misc.h compat_nls.h -stub_draw_csect.o: stub_draw_csect.c ../config.h stub_draw_csect.h hid.h \ - error.h drc.h unit.h global_typedefs.h pcb_bool.h attrib.h layer.h \ - globalconst.h obj_all_list.h obj_arc_list.h obj_common.h \ +stub_draw.o: stub_draw.c ../config.h stub_draw.h hid.h error.h drc.h \ + unit.h global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \ + obj_all_list.h obj_arc_list.h obj_common.h \ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -4896,19 +4911,6 @@ move.h misc_util.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ obj_rat.h layer_grp.h obj_text_draw.h -stub_draw_fab.o: stub_draw_fab.c ../config.h stub_draw_fab.h hid.h \ - error.h drc.h unit.h global_typedefs.h pcb_bool.h attrib.h layer.h \ - globalconst.h obj_all_list.h obj_arc_list.h obj_common.h \ - ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ - obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ - obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h font.h \ - ../src_3rd/liblihata/genht/htip.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h box.h math_helper.h macro.h \ - move.h misc_util.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ - obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ - obj_rat.h layer_grp.h obj_text_draw.h stub_mincut.o: stub_mincut.c ../config.h stub_mincut.h global_typedefs.h \ pcb_bool.h unit.h obj_pinvia.h obj_common.h \ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 7049) +++ trunk/src/Makefile.in (revision 7050) @@ -124,8 +124,7 @@ search.o select.o select_act.o - stub_draw_csect.o - stub_draw_fab.o + stub_draw.o stub_mincut.o stub_stroke.o stub_vendor.o Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 7049) +++ trunk/src/draw.c (revision 7050) @@ -37,8 +37,7 @@ #include "draw.h" #include "rotate.h" #include "rtree.h" -#include "stub_draw_fab.h" -#include "stub_draw_csect.h" +#include "stub_draw.h" #include "obj_all.h" #include "layer_ui.h" Index: trunk/src/stub_draw.c =================================================================== --- trunk/src/stub_draw.c (nonexistent) +++ trunk/src/stub_draw.c (revision 7050) @@ -0,0 +1,82 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Contact addresses for paper mail and Email: + * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany + * Thomas.Nau@rz.uni-ulm.de + * + */ +#include "config.h" +#include "stub_draw.h" +#include "obj_text.h" +#include "obj_text_draw.h" + + +/****** fab ******/ + +int dummy_DrawFab_overhang(void) +{ + return 0; +} + +void dummy_DrawFab(pcb_hid_gc_t gc) +{ + pcb_text_t t; + t.X = 0; + t.Y = 0; + t.TextString = "Can't render the fab layer: the draw_fab plugin is not compiled and/or not loaded"; + t.Direction = 0; + t.Scale = 150; + t.Flags = pcb_no_flags(); + DrawTextLowLevel(&t, 0); +} + +int (*pcb_stub_draw_fab_overhang)(void) = dummy_DrawFab_overhang; +void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc) = dummy_DrawFab; + + +/****** csect - cross section of the board ******/ + + +static void dummy_draw_csect(pcb_hid_gc_t gc) +{ + pcb_text_t t; + t.X = 0; + t.Y = 0; + t.TextString = "Can't render the fab layer: the draw_csect plugin is not compiled and/or not loaded"; + t.Direction = 0; + t.Scale = 150; + t.Flags = pcb_no_flags(); + DrawTextLowLevel(&t, 0); +} + +static pcb_bool dummy_mouse_csect(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) +{ + return 0; +} + +static void dummy_csect_overlay(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx) +{ +} + +void (*pcb_stub_draw_csect)(pcb_hid_gc_t gc) = dummy_draw_csect; +pcb_bool (*pcb_stub_draw_csect_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) = dummy_mouse_csect; +void (*pcb_stub_draw_csect_overlay)(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx) = dummy_csect_overlay; + Index: trunk/src/stub_draw.h =================================================================== --- trunk/src/stub_draw.h (nonexistent) +++ trunk/src/stub_draw.h (revision 7050) @@ -0,0 +1,44 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Contact addresses for paper mail and Email: + * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany + * Thomas.Nau@rz.uni-ulm.de + * + */ + +/* drawing the fab layer is a plugin now */ + +#ifndef PCB_STUB_DRAW_FAB_H +#define PCB_STUB_DRAW_FAB_H + +#include "hid.h" +#include "pcb_bool.h" + +/* fab */ +extern int (*pcb_stub_draw_fab_overhang)(void); +extern void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc); + +/* csect */ +extern void (*pcb_stub_draw_csect)(pcb_hid_gc_t gc); +extern pcb_bool (*pcb_stub_draw_csect_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y); +extern void (*pcb_stub_draw_csect_overlay)(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx); + +#endif Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 7049) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 7050) @@ -28,7 +28,7 @@ #include "data.h" #include "draw.h" #include "plugins.h" -#include "stub_draw_csect.h" +#include "stub_draw.h" #include "compat_misc.h" #include "hid_actions.h" Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 7049) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 7050) @@ -36,7 +36,7 @@ #include "../report/drill.h" #include "obj_all.h" #include "plugins.h" -#include "stub_draw_fab.h" +#include "stub_draw.h" #include "draw_fab_conf.h" #include "obj_text_draw.h" Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 7049) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 7050) @@ -35,7 +35,7 @@ #include "draw.h" #include "obj_all.h" #include "plugins.h" -/*#include "stub_draw_fontsel.h"*/ +#include "stub_draw.h" #include "obj_text_draw.h" Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 7049) +++ trunk/src_plugins/export_ps/ps.c (revision 7050) @@ -32,7 +32,7 @@ #include "conf_core.h" #include "compat_misc.h" #include "compat_nls.h" -#include "stub_draw_fab.h" +#include "stub_draw.h" const char *ps_cookie = "ps HID"; Index: trunk/src_plugins/hid_lesstif/dlg_preview.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_preview.c (revision 7049) +++ trunk/src_plugins/hid_lesstif/dlg_preview.c (revision 7050) @@ -233,7 +233,7 @@ /***************** instance for layer group edit **********************/ -#include "stub_draw_csect.h" +#include "stub_draw.h" static PreviewData *layergrp_edit = NULL; Index: trunk/src_plugins/lib_gtk_config/gui-config.c =================================================================== --- trunk/src_plugins/lib_gtk_config/gui-config.c (revision 7049) +++ trunk/src_plugins/lib_gtk_config/gui-config.c (revision 7050) @@ -49,7 +49,7 @@ #include "misc_util.h" #include "paths.h" #include "plug_footprint.h" -#include "stub_draw_csect.h" +#include "stub_draw.h" #include "compat_misc.h" #include "compat_nls.h" #include "fptr_cast.h"