Index: trunk/doc-rnd/TODO =================================================================== --- trunk/doc-rnd/TODO (revision 1699) +++ trunk/doc-rnd/TODO (revision 1700) @@ -1,4 +1,6 @@ - replace settings with lihata (conf_*) + - shouldn't segfault if pcb-conf.lht is missing (embedded version?) + - PCB->Grid and friends: what should we load from the design? - replace hid_load_settings() with lihata - revise main.c, line by line - setting prio (top pri to bottom prio): Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 1699) +++ trunk/src/Makefile.dep (revision 1700) @@ -37,19 +37,23 @@ global.h plugins.h set.h hid_actions.h dolists.h ../src_plugins/autoroute/autoroute.o: \ ../src_plugins/autoroute/autoroute.c ../config.h ../config.manual.h \ - ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h macro.h \ - ../src_plugins/autoroute/autoroute.h box.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h create.h draw.h error.h find.h \ - heap.h rtree.h misc.h ../src_plugins/autoroute/mtspace.h \ - ../src_plugins/autoroute/vector.h mymem.h polygon.h rats.h remove.h \ - thermal.h undo.h pcb-printf.h set.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h data.h \ + macro.h ../src_plugins/autoroute/autoroute.h box.h misc.h mymem.h \ + create.h draw.h error.h find.h heap.h rtree.h misc.h \ + ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h \ + mymem.h polygon.h rats.h remove.h thermal.h undo.h pcb-printf.h set.h ../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \ ../config.h ../config.manual.h ../config.auto.h global.h const.h \ ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ @@ -73,29 +77,37 @@ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h ../src_plugins/autoroute/vector.h ../src_plugins/djopt/djopt.o: ../src_plugins/djopt/djopt.c ../config.h \ - ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ + global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h create.h remove.h move.h draw.h undo.h \ - strflags.h find.h pcb-printf.h ../src_3rd/genvector/gds_char.h plugins.h \ - hid_flags.h hid_actions.h dolists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h data.h \ + create.h remove.h move.h draw.h undo.h strflags.h find.h pcb-printf.h \ + plugins.h hid_flags.h hid_actions.h dolists.h ../src_plugins/export_bom/bom.o: ../src_plugins/export_bom/bom.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h error.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h pcb-printf.h plugins.h hid.h \ - hid_nogui.h hid_attrib.h hid_helper.h hid_init.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h data.h \ + error.h misc.h mymem.h pcb-printf.h plugins.h hid.h hid_nogui.h \ + hid_attrib.h hid_helper.h hid_init.h ../src_plugins/export_gcode/curve.o: ../src_plugins/export_gcode/curve.c \ ../src_plugins/export_gcode/potracelib.h \ ../src_plugins/export_gcode/lists.h ../src_plugins/export_gcode/curve.h \ @@ -110,17 +122,21 @@ ../src_plugins/export_gcode/bitmap.h \ ../src_plugins/export_gcode/decompose.h ../src_plugins/export_gcode/gcode.o: ../src_plugins/export_gcode/gcode.c \ - ../config.h ../config.manual.h ../config.auto.h plugins.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h error.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h rats.h hid_helper.h hid.h \ - hid_nogui.h hid_draw_helpers.h ../src_plugins/export_gcode/gcode.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h plugins.h global.h \ + error.h data.h misc.h mymem.h rats.h hid_helper.h hid.h hid_nogui.h \ + hid_draw_helpers.h ../src_plugins/export_gcode/gcode.h \ ../src_plugins/export_gcode/bitmap.h \ ../src_plugins/export_gcode/potracelib.h \ ../src_plugins/export_gcode/curve.h \ @@ -179,29 +195,37 @@ hid.h hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h hid_flags.h \ hid_color.h dolists.h ../src_plugins/export_png/png.o: ../src_plugins/export_png/png.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h error.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h plugins.h hid.h hid_nogui.h \ - hid_draw_helpers.h ../src_plugins/export_png/png.h hid_init.h \ - hid_attrib.h hid_color.h hid_helper.h hid_flags.h dolists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h data.h \ + error.h misc.h mymem.h plugins.h hid.h hid_nogui.h hid_draw_helpers.h \ + ../src_plugins/export_png/png.h hid_init.h hid_attrib.h hid_color.h \ + hid_helper.h hid_flags.h dolists.h ../src_plugins/export_ps/eps.o: ../src_plugins/export_ps/eps.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h misc.h ../src_3rd/genvector/gds_char.h \ - mymem.h pcb-printf.h hid.h hid_nogui.h hid_draw_helpers.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h data.h \ + misc.h mymem.h pcb-printf.h hid.h hid_nogui.h hid_draw_helpers.h \ ../src_plugins/export_ps/ps.h hid_init.h hid_attrib.h hid_helper.h \ hid_flags.h hid_color.h ../src_plugins/export_ps/ps.o: ../src_plugins/export_ps/ps.c ../config.h \ @@ -218,17 +242,21 @@ hid_nogui.h hid_draw_helpers.h ../src_plugins/export_ps/ps.h print.h \ hid_init.h hid_attrib.h hid_flags.h hid_actions.h dolists.h ../src_plugins/fontmode/fontmode.o: ../src_plugins/fontmode/fontmode.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h global.h data.h draw.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h move.h remove.h rtree.h \ - strflags.h undo.h pcb-printf.h plugins.h hid_actions.h dolists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h create.h \ + data.h draw.h misc.h mymem.h move.h remove.h rtree.h strflags.h undo.h \ + pcb-printf.h plugins.h hid_actions.h dolists.h ../src_plugins/fp_fs/fp_fs.o: ../src_plugins/fp_fs/fp_fs.c ../config.h \ ../config.manual.h ../config.auto.h mymem.h global.h const.h \ ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ @@ -381,13 +409,14 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h ../src_plugins/hid_gtk/gtkhid.h \ - ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.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 hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + list_element.h conf_core.h conf.h global.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h ../src_plugins/hid_gtk/gtkhid.h ../src_plugins/hid_gtk/gui.h \ + hid.h hid_cfg.h hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h \ + hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -397,20 +426,21 @@ ../src_plugins/hid_gtk/gschem_accel_label.c \ ../src_plugins/hid_gtk/gschem_accel_label.h ../src_plugins/hid_gtk/gtkhid-gdk.o: ../src_plugins/hid_gtk/gtkhid-gdk.c \ - ../config.h ../config.manual.h ../config.auto.h crosshair.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h clip.h ../src_plugins/hid_gtk/gui.h global.h hid.h \ - hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h crosshair.h clip.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -419,8 +449,8 @@ hid_attrib.h hid_helper.h hid_color.h ../src_plugins/hid_gtk/gtkhid-main.o: \ ../src_plugins/hid_gtk/gtkhid-main.c ../config.h ../config.manual.h \ - ../config.auto.h action_helper.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -427,13 +457,14 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h crosshair.h error.h ../src_plugins/hid_gtk/gui.h global.h \ - hid.h hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h \ - ../src_plugins/hid_gtk/ghid-coord-entry.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h action_helper.h \ + crosshair.h error.h ../src_plugins/hid_gtk/gui.h global.h hid.h \ + hid_cfg.h hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + data.h misc.h mymem.h ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ ../src_plugins/hid_gtk/ghid-route-style-selector.h \ @@ -442,8 +473,8 @@ hid_flags.h hid_actions.h dolists.h ../src_plugins/hid_gtk/gui-command-window.o: \ ../src_plugins/hid_gtk/gui-command-window.c ../config.h \ - ../config.manual.h ../config.auto.h ../src_plugins/hid_gtk/gui.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -450,12 +481,13 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -462,21 +494,21 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h \ ../src_plugins/hid_gtk/gui-pinout-preview.h crosshair.h hid_actions.h ../src_plugins/hid_gtk/gui-config.o: ../src_plugins/hid_gtk/gui-config.c \ - ../config.h ../config.manual.h ../config.auto.h \ - ../src_plugins/hid_gtk/gui.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -486,8 +518,8 @@ draw.h pcb-printf.h set.h hid_attrib.h compat_fs.h ../src_plugins/hid_gtk/gui-dialog-print.o: \ ../src_plugins/hid_gtk/gui-dialog-print.c ../config.h ../config.manual.h \ - ../config.auto.h ../src_plugins/hid_gtk/gui.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -494,12 +526,13 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -528,8 +561,8 @@ ../src_plugins/hid_gtk/gui-pinout-preview.h ../src_plugins/hid_gtk/gui-drc-window.o: \ ../src_plugins/hid_gtk/gui-drc-window.c ../config.h ../config.manual.h \ - ../config.auto.h error.h search.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -536,13 +569,15 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h draw.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ - undo.h set.h ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h \ - misc.h mymem.h ../src_plugins/hid_gtk/ghid-coord-entry.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h error.h search.h \ + draw.h pcb-printf.h undo.h set.h ../src_plugins/hid_gtk/gui.h global.h \ + hid.h hid_cfg.h hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h \ + hid_cfg.h data.h misc.h mymem.h \ + ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ ../src_plugins/hid_gtk/ghid-route-style-selector.h \ @@ -571,8 +606,8 @@ ../src_plugins/hid_gtk/gui-pinout-preview.h ../src_plugins/hid_gtk/gui-library-window.o: \ ../src_plugins/hid_gtk/gui-library-window.c ../config.h \ - ../config.manual.h ../config.auto.h ../src_plugins/hid_gtk/gui.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -579,12 +614,13 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -593,8 +629,8 @@ plug_footprint.h vtlibrary.h ../src_plugins/hid_gtk/gui-library-window.h ../src_plugins/hid_gtk/gui-log-window.o: \ ../src_plugins/hid_gtk/gui-log-window.c ../config.h ../config.manual.h \ - ../config.auto.h ../src_plugins/hid_gtk/gui.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -601,12 +637,13 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -613,21 +650,22 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h \ ../src_plugins/hid_gtk/gui-pinout-preview.h pcb-printf.h ../src_plugins/hid_gtk/gui-misc.o: ../src_plugins/hid_gtk/gui-misc.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h crosshair.h global.h data.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h action_helper.h set.h \ - pcb-printf.h ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h crosshair.h \ + data.h misc.h mymem.h action_helper.h set.h pcb-printf.h \ + ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -635,21 +673,23 @@ ../src_plugins/hid_gtk/gui-pinout-preview.h ../src_plugins/hid_gtk/gui-netlist-window.o: \ ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h \ - ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ + global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h global.h data.h draw.h error.h find.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h mymem.h rats.h remove.h search.h \ - select.h set.h undo.h hid_actions.h ../src_plugins/hid_gtk/gui.h hid.h \ - hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h create.h \ + data.h draw.h error.h find.h misc.h mymem.h mymem.h rats.h remove.h \ + search.h select.h set.h undo.h hid_actions.h \ + ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -657,8 +697,8 @@ ../src_plugins/hid_gtk/gui-pinout-preview.h ../src_plugins/hid_gtk/gui-output-events.o: \ ../src_plugins/hid_gtk/gui-output-events.c ../config.h \ - ../config.manual.h ../config.auto.h ../src_plugins/hid_gtk/gui.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -665,12 +705,13 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -680,20 +721,21 @@ error.h set.h find.h search.h rats.h ../src_plugins/hid_gtk/gui-pinout-preview.o: \ ../src_plugins/hid_gtk/gui-pinout-preview.c ../config.h \ - ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ + global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h \ - global.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h \ + ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -702,20 +744,21 @@ rotate.h ../src_plugins/hid_gtk/gui-pinout-window.o: \ ../src_plugins/hid_gtk/gui-pinout-window.c ../config.h \ - ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ + global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h \ - global.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h \ + ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -724,9 +767,8 @@ rotate.h ../src_plugins/hid_gtk/gui-top-window.o: \ ../src_plugins/hid_gtk/gui-top-window.c ../config.h ../config.manual.h \ - ../config.auto.h ../src_plugins/hid_gtk/ghid-layer-selector.h \ - ../src_plugins/hid_gtk/ghid-route-style-selector.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -733,14 +775,16 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h ../src_plugins/hid_gtk/gtkhid.h \ - ../src_plugins/hid_gtk/gui.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ - ../src_plugins/hid_gtk/ghid-coord-entry.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/ghid-layer-selector.h \ + ../src_plugins/hid_gtk/ghid-route-style-selector.h global.h \ + ../src_plugins/hid_gtk/gtkhid.h ../src_plugins/hid_gtk/gui.h hid.h \ + hid_cfg.h hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + data.h misc.h mymem.h ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/gui-pinout-preview.h action_helper.h buffer.h \ change.h copy.h create.h crosshair.h draw.h error.h file.h find.h \ @@ -750,21 +794,21 @@ ../src_plugins/hid_gtk/gui-icons-misc.data hid_attrib.h hid_actions.h \ hid_flags.h ../src_plugins/hid_gtk/gui-utils.o: ../src_plugins/hid_gtk/gui-utils.c \ - ../config.h ../config.manual.h ../config.auto.h \ - ../src_plugins/hid_gtk/gui.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h hid.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_gtk/gui.h global.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h misc.h mymem.h \ ../src_plugins/hid_gtk/ghid-coord-entry.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ @@ -773,44 +817,28 @@ ../src_plugins/hid_gtk/menu_lht.o: ../src_plugins/hid_gtk/menu_lht.c ../src_plugins/hid_lesstif/dialogs.o: \ ../src_plugins/hid_lesstif/dialogs.c ../config.h ../config.manual.h \ - ../config.auto.h ../src_plugins/hid_lesstif/xincludes.h compat_misc.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h crosshair.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h pcb-printf.h hid.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h data.h \ + crosshair.h misc.h mymem.h pcb-printf.h hid.h \ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.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/liblihata/genht/htip.h hid_cfg.h hid_attrib.h hid_actions.h \ - hid_init.h + hid_init.h ../src_plugins/hid_lesstif/stdarg.h ../src_plugins/hid_lesstif/library.o: \ ../src_plugins/hid_lesstif/library.c ../config.h ../config.manual.h \ - ../config.auto.h ../src_plugins/hid_lesstif/xincludes.h compat_misc.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h misc.h ../src_3rd/genvector/gds_char.h \ - mymem.h set.h buffer.h vtptr.h plug_footprint.h vtlibrary.h hid.h \ - ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.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/liblihata/genht/htip.h hid_cfg.h \ - ../src_plugins/hid_lesstif/stdarg.h -../src_plugins/hid_lesstif/main.o: ../src_plugins/hid_lesstif/main.c \ - ../config.h ../config.manual.h ../config.auto.h \ - ../src_plugins/hid_lesstif/xincludes.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -817,32 +845,54 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h action_helper.h crosshair.h mymem.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h pcb-printf.h clip.h \ - event.h error.h plugins.h hid.h hid_nogui.h hid_draw_helpers.h hid_cfg.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 \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h data.h \ + misc.h mymem.h set.h buffer.h vtptr.h plug_footprint.h vtlibrary.h hid.h \ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + ../src_plugins/hid_lesstif/stdarg.h +../src_plugins/hid_lesstif/main.o: ../src_plugins/hid_lesstif/main.c \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_lesstif/xincludes.h global.h data.h action_helper.h \ + crosshair.h mymem.h misc.h mymem.h pcb-printf.h clip.h event.h error.h \ + plugins.h hid.h hid_nogui.h hid_draw_helpers.h hid_cfg.h \ + ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ ../src_3rd/liblihata/genht/htip.h hid_cfg.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 dolists.h ../src_plugins/hid_lesstif/menu.o: ../src_plugins/hid_lesstif/menu.c \ - ../config.h ../config.manual.h ../config.auto.h \ - ../src_plugins/hid_lesstif/xincludes.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h error.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h pcb-printf.h hid.h hid_cfg.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 \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_lesstif/xincludes.h global.h data.h error.h misc.h \ + mymem.h pcb-printf.h hid.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ ../src_plugins/hid_lesstif/lesstif.h mymem.h paths.h hid_actions.h \ hid_flags.h ../src_plugins/hid_lesstif/stdarg.h \ ../src_3rd/liblihata/genht/hash.h @@ -864,27 +914,30 @@ ../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/liblihata/genht/htip.h hid_cfg.h + ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + ../src_plugins/hid_lesstif/stdarg.h ../src_plugins/hid_lesstif/stdarg.o: ../src_plugins/hid_lesstif/stdarg.c \ ../src_plugins/hid_lesstif/stdarg.h \ ../src_plugins/hid_lesstif/xincludes.h ../src_plugins/hid_lesstif/styles.o: ../src_plugins/hid_lesstif/styles.c \ - ../config.h ../config.manual.h ../config.auto.h \ - ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h set.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h mymem.h pcb-printf.h hid.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h data.h \ + set.h misc.h mymem.h mymem.h pcb-printf.h hid.h \ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.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/liblihata/genht/htip.h hid_cfg.h hid_flags.h + ../src_3rd/liblihata/genht/htip.h hid_cfg.h hid_flags.h \ + ../src_plugins/hid_lesstif/stdarg.h ../src_plugins/import_edif/edif.o: ../src_plugins/import_edif/edif.c \ global.h ../config.h ../config.manual.h ../config.auto.h const.h \ ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ @@ -897,16 +950,21 @@ list_element.h data.h global.h error.h plugins.h stub_edif.h ../src_plugins/import_sch/import_sch.o: \ ../src_plugins/import_sch/import_sch.c ../config.h ../config.manual.h \ - ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h global.h action_helper.h change.h error.h undo.h \ - plugins.h misc.h ../src_3rd/genvector/gds_char.h mymem.h compat_fs.h \ - pcb-printf.h remove.h rats.h hid_actions.h dolists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h data.h \ + action_helper.h change.h error.h undo.h plugins.h misc.h mymem.h \ + compat_fs.h pcb-printf.h remove.h rats.h hid_actions.h dolists.h ../src_plugins/legacy_func/legacy_func.o: \ ../src_plugins/legacy_func/legacy_func.c ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -926,17 +984,22 @@ ../src_plugins/mincut/pcb-mincut/solve.h \ ../src_plugins/mincut/pcb-mincut/graph.h ../src_plugins/mincut/rats_mincut.o: ../src_plugins/mincut/rats_mincut.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h global.h data.h draw.h error.h file.h find.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h mymem.h polygon.h rats.h \ - search.h set.h undo.h plugins.h ../src_plugins/mincut/pcb-mincut/graph.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h create.h \ + data.h draw.h error.h file.h find.h misc.h mymem.h mymem.h polygon.h \ + rats.h search.h set.h undo.h plugins.h \ + ../src_plugins/mincut/pcb-mincut/graph.h \ ../src_plugins/mincut/pcb-mincut/solve.h \ ../src_plugins/mincut/pcb-mincut/graph.h stub_mincut.h ../src_plugins/oldactions/oldactions.o: \ @@ -951,17 +1014,21 @@ list_element.h data.h global.h action_helper.h change.h error.h undo.h \ plugins.h dolists.h ../src_plugins/puller/puller.o: ../src_plugins/puller/puller.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h global.h data.h draw.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h move.h pcb-printf.h remove.h \ - rtree.h strflags.h undo.h plugins.h hid_actions.h dolists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h create.h \ + data.h draw.h misc.h mymem.h move.h pcb-printf.h remove.h rtree.h \ + strflags.h undo.h plugins.h hid_actions.h dolists.h ../src_plugins/renumber/renumber.o: ../src_plugins/renumber/renumber.c \ ../config.h ../config.manual.h ../config.auto.h global.h const.h \ ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ @@ -975,31 +1042,39 @@ misc.h ../src_3rd/genvector/gds_char.h mymem.h set.h plugins.h \ hid_actions.h pcb-printf.h dolists.h ../src_plugins/report/report.o: ../src_plugins/report/report.c \ - ../config.h ../config.manual.h ../config.auto.h \ - ../src_plugins/report/report.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h crosshair.h global.h data.h drill.h error.h search.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h mymem.h rats.h rtree.h \ - strflags.h macro.h undo.h find.h draw.h pcb-printf.h plugins.h \ - hid_actions.h dolists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_plugins/report/report.h global.h crosshair.h data.h drill.h \ + error.h search.h misc.h mymem.h mymem.h rats.h rtree.h strflags.h \ + macro.h undo.h find.h draw.h pcb-printf.h plugins.h hid_actions.h \ + dolists.h ../src_plugins/shand_cmd/command.o: ../src_plugins/shand_cmd/command.c \ - ../config.h ../config.manual.h ../config.auto.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h action_helper.h global.h buffer.h \ - ../src_plugins/shand_cmd/command.h data.h error.h file.h mymem.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h rats.h set.h plugins.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h global.h \ + action_helper.h buffer.h ../src_plugins/shand_cmd/command.h data.h \ + error.h file.h mymem.h misc.h mymem.h rats.h set.h plugins.h \ hid_actions.h dolists.h ../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \ ../config.h ../config.manual.h ../config.auto.h global.h const.h \ @@ -1028,20 +1103,21 @@ heap.h rtree.h misc.h mymem.h polygon.h rats.h remove.h thermal.h undo.h \ ../src_3rd/gts/gts.h pcb-printf.h ../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.c \ - ../config.h ../config.manual.h ../config.auto.h change.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h draw.h error.h global.h set.h undo.h \ - ../src_plugins/vendordrill/vendor.h stub_vendor.h plugins.h hid_flags.h \ - hid_actions.h hid_cfg.h ../src_3rd/liblihata/dom.h \ + list_element.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/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h change.h data.h \ + draw.h error.h global.h set.h undo.h ../src_plugins/vendordrill/vendor.h \ + stub_vendor.h plugins.h hid_flags.h hid_actions.h hid_cfg.h \ ../src_3rd/liblihata/tree.h dolists.h gds_char.o: ../src_3rd/genvector/gds_char.c \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ @@ -1131,25 +1207,32 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h action_helper.h buffer.h change.h copy.h create.h \ - crosshair.h data.h draw.h error.h find.h insert.h line.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h move.h polygon.h rats.h remove.h \ - rotate.h rubberband.h search.h select.h set.h undo.h rtree.h \ - stub_stroke.h funchash_core.h funchash.h funchash_core_list.h \ - hid_actions.h + list_element.h conf_core.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h action_helper.h buffer.h change.h copy.h create.h \ + crosshair.h data.h draw.h error.h find.h insert.h line.h misc.h mymem.h \ + move.h polygon.h rats.h remove.h rotate.h rubberband.h search.h select.h \ + set.h undo.h rtree.h stub_stroke.h funchash_core.h funchash.h \ + funchash_core_list.h hid_actions.h buffer.o: buffer.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h action_helper.h buffer.h copy.h create.h crosshair.h \ - data.h error.h file.h mymem.h mirror.h misc.h \ - ../src_3rd/genvector/gds_char.h parse_l.h polygon.h rats.h rotate.h \ - remove.h rtree.h search.h select.h set.h funchash_core.h funchash.h \ - funchash_core_list.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h action_helper.h \ + buffer.h copy.h create.h crosshair.h data.h error.h file.h mymem.h \ + mirror.h misc.h parse_l.h polygon.h rats.h rotate.h remove.h rtree.h \ + search.h select.h set.h funchash_core.h funchash.h funchash_core_list.h buildin.o: buildin.c plugins.h buildin.h change.o: change.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ @@ -1159,21 +1242,31 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h change.h create.h crosshair.h data.h draw.h error.h \ - mymem.h misc.h ../src_3rd/genvector/gds_char.h mirror.h polygon.h rats.h \ - remove.h rtree.h search.h select.h set.h thermal.h undo.h hid_actions.h + list_element.h conf_core.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h change.h create.h crosshair.h data.h draw.h error.h mymem.h \ + misc.h mirror.h polygon.h rats.h remove.h rtree.h search.h select.h \ + set.h thermal.h undo.h hid_actions.h change_act.o: change_act.c ../config.h ../config.manual.h \ - ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h funchash_core.h funchash.h funchash_core_list.h \ - action_helper.h hid_actions.h change.h crosshair.h draw.h search.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h set.h error.h undo.h \ - rubberband.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + funchash_core.h funchash.h funchash_core_list.h action_helper.h \ + hid_actions.h change.h crosshair.h draw.h search.h misc.h mymem.h set.h \ + error.h undo.h rubberband.h clip.o: clip.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1213,17 +1306,50 @@ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h -copy.o: copy.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +conf.o: conf.c ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + ../src_3rd/liblihata/genht/hash.h conf.h global.h ../config.h \ + ../config.manual.h ../config.auto.h const.h ../globalconst.h ../config.h \ + macro.h global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h \ + polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h copy.h create.h data.h draw.h mymem.h mirror.h misc.h \ - ../src_3rd/genvector/gds_char.h move.h polygon.h rats.h rtree.h select.h \ - undo.h + list_element.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 list_conf.h hid_cfg.h misc.h mymem.h \ + error.h +conf_core.o: conf_core.c conf.h global.h ../config.h ../config.manual.h \ + ../config.auto.h const.h ../globalconst.h ../config.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h conf_core.h \ + conf_core_fields.h +copy.o: copy.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h copy.h create.h \ + data.h draw.h mymem.h mirror.h misc.h move.h polygon.h rats.h rtree.h \ + select.h undo.h create.o: create.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1232,9 +1358,14 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h data.h draw.h error.h mymem.h misc.h \ - ../src_3rd/genvector/gds_char.h parse_l.h pcb-printf.h polygon.h rtree.h \ - search.h set.h undo.h file.h stub_vendor.h hid_actions.h + list_element.h conf_core.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h create.h data.h draw.h error.h mymem.h misc.h parse_l.h \ + polygon.h rtree.h search.h set.h undo.h file.h stub_vendor.h \ + hid_actions.h paths.h crosshair.o: crosshair.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1243,9 +1374,13 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h box.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ - crosshair.h data.h draw.h error.h line.h rtree.h search.h polygon.h \ - hid_actions.h + list_element.h conf_core.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h box.h misc.h mymem.h crosshair.h data.h draw.h error.h \ + line.h rtree.h search.h polygon.h hid_actions.h data.o: data.c ../config.h ../config.manual.h ../config.auto.h data.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1263,9 +1398,13 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h compat_misc.h crosshair.h data.h draw.h error.h mymem.h \ - misc.h ../src_3rd/genvector/gds_char.h rotate.h rtree.h search.h \ - select.h print.h hid_helper.h + list_element.h conf_core.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h compat_misc.h crosshair.h data.h draw.h error.h mymem.h \ + misc.h rotate.h rtree.h search.h select.h print.h hid_helper.h drill.o: drill.c ../config.h ../config.manual.h ../config.auto.h data.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1286,29 +1425,37 @@ list_element.h data.h error.h file.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h event.o: event.c event.h error.h -file.o: file.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +file.o: file.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h buffer.h change.h create.h crosshair.h data.h error.h \ - file.h misc.h ../src_3rd/genvector/gds_char.h mymem.h move.h parse_l.h \ - pcb-printf.h polygon.h rats.h remove.h set.h strflags.h compat_fs.h \ - paths.h rats_patch.h stub_edif.h hid_actions.h hid_flags.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h buffer.h change.h \ + create.h crosshair.h data.h error.h file.h misc.h mymem.h move.h \ + parse_l.h polygon.h rats.h remove.h set.h strflags.h compat_fs.h paths.h \ + rats_patch.h stub_edif.h hid_actions.h hid_flags.h file_act.o: file_act.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h \ - crosshair.h set.h file.h buffer.h mymem.h misc.h \ - ../src_3rd/genvector/gds_char.h remove.h create.h draw.h find.h search.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h crosshair.h set.h file.h \ + buffer.h mymem.h misc.h remove.h create.h draw.h find.h search.h \ hid_actions.h hid_attrib.h find.o: find.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ @@ -1318,29 +1465,40 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h crosshair.h data.h draw.h error.h find.h mymem.h misc.h \ - ../src_3rd/genvector/gds_char.h rtree.h polygon.h pcb-printf.h search.h \ - set.h undo.h rats.h file.h hid_actions.h + list_element.h conf_core.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/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + list_conf.h crosshair.h data.h draw.h error.h find.h mymem.h misc.h \ + rtree.h polygon.h search.h set.h undo.h rats.h file.h hid_actions.h find_act.o: find_act.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h find.h \ - pcb-printf.h ../src_3rd/genvector/gds_char.h -flags.o: flags.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h find.h +flags.o: flags.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ - hid_flags.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h hid_flags.h free_atexit.o: free_atexit.c funchash.o: funchash.c ../src_3rd/liblihata/genht/htpi.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1347,17 +1505,21 @@ ../src_3rd/liblihata/genht/hash.h funchash_core.h funchash.h \ funchash_core_list.h macro.h gui_act.o: gui_act.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h \ - funchash_core.h funchash.h funchash_core_list.h draw.h search.h \ - crosshair.h find.h set.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ - stub_stroke.h hid_actions.h hid_init.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h funchash_core.h funchash.h \ + funchash_core_list.h draw.h search.h crosshair.h find.h set.h misc.h \ + mymem.h stub_stroke.h hid_actions.h hid_init.h heap.o: heap.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1368,10 +1530,8 @@ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h heap.h hid_actions.o: hid_actions.c ../config.h ../config.manual.h \ - ../config.auto.h ../src_3rd/liblihata/genht/hash.h \ - ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h global.h const.h \ - ../globalconst.h ../config.h macro.h global_typedefs.h global_objs.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -1378,7 +1538,13 @@ list_pad.h list_pin.h list_rat.h vtonpoint.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h error.h event.h hid_actions.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/liblihata/genht/htsp.h \ + data.h error.h event.h hid_actions.h hid_attrib.o: hid_attrib.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ @@ -1487,16 +1653,20 @@ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h insert.o: insert.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h copy.h create.h crosshair.h data.h draw.h insert.h line.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h move.h polygon.h rtree.h \ - search.h select.h set.h undo.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h copy.h create.h \ + crosshair.h data.h draw.h insert.h line.h misc.h mymem.h move.h \ + polygon.h rtree.h search.h select.h set.h undo.h intersect.o: intersect.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1506,21 +1676,39 @@ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h data.h intersect.h mymem.h -line.o: line.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +line.o: line.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h crosshair.h find.h line.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h rtree.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h crosshair.h \ + find.h line.h misc.h mymem.h rtree.h list_arc.o: list_arc.c global_objs.h ../src_3rd/genlist/gendlist.h \ ../config.h ../config.manual.h ../config.auto.h ../globalconst.h \ ../config.h global_typedefs.h polyarea.h list_arc.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c +list_conf.o: list_conf.c conf.h global.h ../config.h ../config.manual.h \ + ../config.auto.h const.h ../globalconst.h ../config.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h \ + ../src_3rd/genlist/gentdlist_impl.c list_element.o: list_element.c global.h ../config.h ../config.manual.h \ ../config.auto.h const.h ../globalconst.h ../config.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ @@ -1560,20 +1748,23 @@ ../config.h global_typedefs.h polyarea.h list_text.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c -main.o: main.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +main.o: main.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h buffer.h create.h crosshair.h draw.h error.h \ - file.h set.h action_helper.h misc.h ../src_3rd/genvector/gds_char.h \ - mymem.h compat_lrealpath.h free_atexit.h polygon.h pcb-printf.h \ - buildin.h paths.h strflags.h plugins.h plug_footprint.h vtlibrary.h \ - event.h funchash.h hid_actions.h hid_attrib.h hid_init.h dolists.h \ - generated_lists.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h buffer.h \ + create.h crosshair.h draw.h error.h file.h set.h action_helper.h misc.h \ + mymem.h compat_lrealpath.h free_atexit.h polygon.h buildin.h paths.h \ + strflags.h plugins.h plug_footprint.h vtlibrary.h event.h funchash.h \ + hid_actions.h hid_attrib.h hid_init.h dolists.h generated_lists.h mirror.o: mirror.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1585,29 +1776,37 @@ list_element.h data.h draw.h mirror.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h polygon.h search.h select.h \ set.h -misc.o: misc.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +misc.o: misc.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h box.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ - crosshair.h create.h data.h draw.h file.h error.h move.h pcb-printf.h \ - polygon.h remove.h rtree.h rotate.h rubberband.h search.h set.h undo.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h box.h misc.h mymem.h \ + crosshair.h create.h data.h draw.h file.h error.h move.h polygon.h \ + remove.h rtree.h rotate.h rubberband.h search.h set.h undo.h \ action_helper.h compat_fs.h compat_misc.h hid_actions.h hid_init.h -move.o: move.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +move.o: move.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h crosshair.h data.h draw.h error.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h move.h polygon.h rtree.h \ - search.h select.h thermal.h undo.h hid_actions.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h create.h crosshair.h \ + data.h draw.h error.h misc.h mymem.h move.h polygon.h rtree.h search.h \ + select.h thermal.h undo.h hid_actions.h mymem.o: mymem.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1630,7 +1829,24 @@ mymem.h misc.h ../src_3rd/genvector/gds_char.h rats.h set.h create.h \ rats_patch.h hid_actions.h object_act.o: object_act.c ../config.h ../config.manual.h \ - ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h funchash_core.h funchash.h \ + funchash_core_list.h search.h move.h draw.h mirror.h rotate.h set.h \ + copy.h misc.h mymem.h rubberband.h buffer.h remove.h create.h +parse_l.o: parse_l.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1637,31 +1853,27 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h \ - funchash_core.h funchash.h funchash_core_list.h search.h move.h draw.h \ - mirror.h rotate.h set.h copy.h misc.h ../src_3rd/genvector/gds_char.h \ - mymem.h rubberband.h buffer.h remove.h create.h -parse_l.o: parse_l.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h crosshair.h data.h error.h file.h mymem.h misc.h \ - ../src_3rd/genvector/gds_char.h strflags.h parse_l.h parse_y.h create.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h crosshair.h data.h \ + error.h file.h mymem.h misc.h strflags.h parse_l.h parse_y.h create.h \ plug_footprint.h vtlibrary.h parse_y.o: parse_y.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h data.h error.h file.h mymem.h misc.h \ - ../src_3rd/genvector/gds_char.h parse_l.h polygon.h remove.h rtree.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h create.h data.h \ + error.h file.h mymem.h misc.h parse_l.h polygon.h remove.h rtree.h \ strflags.h thermal.h rats_patch.h parse_y.h paths.o: paths.c paths.h error.h pcb-printf.o: pcb-printf.c ../config.h ../config.manual.h \ @@ -1686,16 +1898,20 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h plug_footprint_host.o: plug_footprint_host.c ../config.h \ - ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ - ../config.h macro.h global_typedefs.h global_objs.h \ - ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../config.manual.h ../config.auto.h conf_core.h ../globalconst.h \ + ../config.h conf.h global.h const.h macro.h global_typedefs.h \ + global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h file.h plug_footprint.h vtlibrary.h plugins.h \ - error.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h file.h \ + plug_footprint.h vtlibrary.h plugins.h error.h plugins.o: plugins.c plugins.h ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ @@ -1706,16 +1922,20 @@ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h data.h action_helper.h ../src_3rd/genvector/gds_char.h polygon.o: polygon.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h box.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ - create.h crosshair.h data.h draw.h error.h find.h move.h pcb-printf.h \ - polygon.h remove.h rtree.h search.h set.h thermal.h undo.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h box.h misc.h mymem.h \ + create.h crosshair.h data.h draw.h error.h find.h move.h polygon.h \ + remove.h rtree.h search.h set.h thermal.h undo.h polygon1.o: polygon1.c global.h ../config.h ../config.manual.h \ ../config.auto.h const.h ../globalconst.h ../config.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ @@ -1726,16 +1946,21 @@ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ list_element.h rtree.h heap.h polygon_act.o: polygon_act.c ../config.h ../config.manual.h \ - ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h \ - funchash_core.h funchash.h funchash_core_list.h polygon.h draw.h \ - search.h crosshair.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h funchash_core.h funchash.h \ + funchash_core_list.h polygon.h draw.h search.h crosshair.h print.o: print.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1747,28 +1972,36 @@ list_element.h data.h draw.h drill.h file.h find.h error.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h print.h polygon.h rtree.h \ search.h -rats.o: rats.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ +rats.o: rats.c ../config.h ../config.manual.h ../config.auto.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h create.h data.h draw.h error.h file.h find.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h polygon.h rats.h search.h set.h \ - undo.h stub_mincut.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h create.h data.h \ + draw.h error.h file.h find.h misc.h mymem.h polygon.h rats.h search.h \ + set.h undo.h stub_mincut.h rats_act.o: rats_act.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h set.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h find.h remove.h \ - funchash_core.h funchash.h funchash_core_list.h rats.h draw.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h set.h misc.h mymem.h find.h \ + remove.h funchash_core.h funchash.h funchash_core_list.h rats.h draw.h rats_patch.o: rats_patch.c rats_patch.h global.h ../config.h \ ../config.manual.h ../config.auto.h const.h ../globalconst.h ../config.h \ macro.h global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h \ @@ -1782,16 +2015,20 @@ ../src_3rd/liblihata/genht/hash.h create.h data.h action_helper.h \ error.h buffer.h remove.h copy.h remove.o: remove.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h draw.h error.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h move.h polygon.h rats.h remove.h \ - rtree.h search.h select.h set.h undo.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h draw.h \ + error.h misc.h mymem.h move.h polygon.h rats.h remove.h rtree.h search.h \ + select.h set.h undo.h remove_act.o: remove_act.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ @@ -1834,27 +2071,52 @@ ../src_3rd/genvector/gds_char.h mymem.h polygon.h rubberband.h rtree.h \ search.h search.o: search.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h box.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h box.h misc.h mymem.h \ data.h draw.h error.h find.h polygon.h rtree.h search.h select.o: select.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h draw.h error.h search.h select.h undo.h rats.h \ - misc.h ../src_3rd/genvector/gds_char.h mymem.h find.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h draw.h \ + error.h search.h select.h undo.h rats.h misc.h mymem.h find.h select_act.o: select_act.c ../config.h ../config.manual.h \ - ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + ../config.auto.h conf_core.h ../globalconst.h ../config.h conf.h \ + global.h const.h macro.h global_typedefs.h global_objs.h \ + ../src_3rd/genlist/gendlist.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h undo.h funchash_core.h funchash.h \ + funchash_core_list.h search.h select.h crosshair.h set.h buffer.h draw.h \ + remove.h copy.h hid_attrib.h +set.o: set.c ../config.h ../config.manual.h ../config.auto.h conf_core.h \ + ../globalconst.h ../config.h conf.h global.h const.h macro.h \ global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1861,20 +2123,13 @@ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h undo.h \ - funchash_core.h funchash.h funchash_core_list.h search.h select.h \ - crosshair.h set.h buffer.h draw.h remove.h copy.h hid_attrib.h -set.o: set.c ../config.h ../config.manual.h ../config.auto.h global.h \ - const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h action_helper.h buffer.h compat_misc.h crosshair.h data.h \ - draw.h error.h find.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ - set.h undo.h hid_actions.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h action_helper.h \ + buffer.h compat_misc.h crosshair.h data.h draw.h error.h find.h misc.h \ + mymem.h set.h undo.h hid_actions.h strflags.o: strflags.c ../config.h ../config.manual.h ../config.auto.h \ ../globalconst.h ../config.h global.h const.h macro.h global_typedefs.h \ global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ @@ -1935,16 +2190,21 @@ misc.h ../src_3rd/genvector/gds_char.h mymem.h mirror.h move.h polygon.h \ remove.h rotate.h rtree.h search.h set.h undo.h strflags.h undo_act.o: undo_act.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h global_typedefs.h \ - global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h ../globalconst.h ../config.h conf.h global.h const.h macro.h \ + global_typedefs.h global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \ - list_element.h data.h action_helper.h change.h error.h funchash_core.h \ - funchash.h funchash_core_list.h crosshair.h undo.h polygon.h set.h \ - search.h draw.h misc.h ../src_3rd/genvector/gds_char.h mymem.h + list_element.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/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h list_conf.h data.h \ + action_helper.h change.h error.h funchash_core.h funchash.h \ + funchash_core_list.h crosshair.h undo.h polygon.h set.h search.h draw.h \ + misc.h mymem.h vtlibrary.o: vtlibrary.c vtlibrary.h global_objs.h \ ../src_3rd/genlist/gendlist.h ../config.h ../config.manual.h \ ../config.auto.h ../globalconst.h ../config.h global_typedefs.h \ @@ -1963,4 +2223,3 @@ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h \ ../src_3rd/genvector/genvector_impl.c -conf_core.o: conf_core_fields.h Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 1699) +++ trunk/src/Makefile.in (revision 1700) @@ -277,6 +277,7 @@ $(MKDIR) $(BINDIR) $(DATADIR) $(LIBDIR) $(LIBDIR)/plugins $(CPC) "`pwd`/pcb-rnd" "$(BINDIR)/pcb-rnd" $(CPC) "`pwd`/default.pcb" "$(DATADIR)/default.pcb" + $(CPC) "`pwd`/pcb-conf.lht" "$(DATADIR)/pcb-conf.lht" $(CPC) "`pwd`/pcb-menu-lesstif.lht" "$(DATADIR)/pcb-menu-lesstif.lht" $(CPC) "`pwd`/pcb-menu-gtk.lht" "$(DATADIR)/pcb-menu-gtk.lht" $(CPC) "`pwd`/default_font" "$(DATADIR)/default_font"@/local/pcb/rules/install_@ @@ -293,6 +294,7 @@ $(RM) $(BINDIR)/pcb-rnd $(RM) $(DATADIR)/default.pcb $(RM) $(DATADIR)/pcb-menu-lesstif.lht + $(RM) $(DATADIR)/pcb-conf.lht $(RM) $(DATADIR)/pcb-menu-gtk.lht $(RM) $(DATADIR)/default_font@/local/pcb/rules/uninstall@ @] Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 1699) +++ trunk/src/action_helper.c (revision 1700) @@ -31,6 +31,7 @@ #include "config.h" #include "global.h" +#include "conf_core.h" #include "action_helper.h" #include "buffer.h" @@ -160,7 +161,7 @@ */ void ClearWarnings() { - Settings.RatWarn = false; + conf_core.editor.rat_warn = false; ALLPIN_LOOP(PCB->Data); { if (TEST_FLAG(WARNFLAG, pin)) { @@ -219,7 +220,7 @@ notify_crosshair_change(false); Note.Click = false; if (Note.Moving && !gui->shift_is_pressed()) { - Note.Buffer = Settings.BufferNumber; + Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); ClearBuffer(PASTEBUFFER); AddSelectedToBuffer(PASTEBUFFER, Note.X, Note.Y, true); @@ -317,7 +318,7 @@ NotifyMode(); Note.Hit = 0; } - else if (Settings.Mode == ARROW_MODE) { + else if (conf_core.editor.mode == ARROW_MODE) { box.X1 = Crosshair.AttachedBox.Point1.X; box.Y1 = Crosshair.AttachedBox.Point1.Y; box.X2 = Crosshair.AttachedBox.Point2.X; @@ -341,7 +342,7 @@ */ static void AdjustAttachedBox(void) { - if (Settings.Mode == ARC_MODE) { + if (conf_core.editor.mode == ARC_MODE) { Crosshair.AttachedBox.otherway = gui->shift_is_pressed(); return; } @@ -362,7 +363,7 @@ void AdjustAttachedObjects(void) { PointTypePtr pnt; - switch (Settings.Mode) { + switch (conf_core.editor.mode) { /* update at least an attached block (selection) */ case NO_MODE: case ARROW_MODE: @@ -417,7 +418,7 @@ gui->beep(); break; } - if (TEST_FLAG(AUTODRCFLAG, PCB) && Settings.Mode == LINE_MODE) { + if (TEST_FLAG(AUTODRCFLAG, PCB) && conf_core.editor.mode == LINE_MODE) { type = SearchScreen(Crosshair.X, Crosshair.Y, PIN_TYPE | PAD_TYPE | VIA_TYPE, &ptr1, &ptr2, &ptr3); LookupConnection(Crosshair.X, Crosshair.Y, true, 1, FOUNDFLAG); } @@ -485,9 +486,9 @@ void *ptr1, *ptr2, *ptr3; int type; - if (Settings.RatWarn) + if (conf_core.editor.rat_warn) ClearWarnings(); - switch (Settings.Mode) { + switch (conf_core.editor.mode) { case ARROW_MODE: { int test; @@ -526,8 +527,8 @@ break; } if ((via = CreateNewVia(PCB->Data, Note.X, Note.Y, - Settings.ViaThickness, 2 * Settings.Keepaway, - 0, Settings.ViaDrillingHole, NULL, NoFlags())) != NULL) { + conf_core.design.via_thickness, 2 * conf_core.design.keepaway, + 0, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { AddObjectToCreateUndoList(VIA_TYPE, via, via, via); if (gui->shift_is_pressed()) ChangeObjectThermal(VIA_TYPE, via, via, via, PCB->ThermStyle); @@ -584,8 +585,8 @@ abs(wy), sa, dir, - Settings.LineThickness, - 2 * Settings.Keepaway, + conf_core.design.line_thickness, + 2 * conf_core.design.keepaway, MakeFlags(TEST_FLAG(CLEARNEWFLAG, PCB) ? CLEARLINEFLAG : 0)))) { BoxTypePtr bx; @@ -727,8 +728,8 @@ Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, - Settings.LineThickness, - 2 * Settings.Keepaway, + conf_core.design.line_thickness, + 2 * conf_core.design.keepaway, MakeFlags(maybe_found_flag | (TEST_FLAG(CLEARNEWFLAG, PCB) ? CLEARLINEFLAG : 0)))) != NULL) { PinTypePtr via; @@ -744,14 +745,14 @@ SearchObjectByLocation(PIN_TYPES, &ptr1, &ptr2, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, - Settings.ViaThickness / 2) == + conf_core.design.via_thickness / 2) == NO_TYPE && (via = CreateNewVia(PCB->Data, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, - Settings.ViaThickness, - 2 * Settings.Keepaway, 0, Settings.ViaDrillingHole, NULL, NoFlags())) != NULL) { + conf_core.design.via_thickness, + 2 * conf_core.design.keepaway, 0, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { AddObjectToCreateUndoList(VIA_TYPE, via, via, via); DrawVia(via); } @@ -767,8 +768,8 @@ Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, Note.X, Note.Y, - Settings.LineThickness, - 2 * Settings.Keepaway, + conf_core.design.line_thickness, + 2 * conf_core.design.keepaway, MakeFlags((TEST_FLAG (AUTODRCFLAG, PCB) ? FOUNDFLAG : 0) | @@ -833,7 +834,7 @@ if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(solder_silk_layer)) flag |= ONSOLDERFLAG; if ((text = CreateNewText(CURRENT, &PCB->Font, Note.X, - Note.Y, 0, Settings.TextScale, string, MakeFlags(flag))) != NULL) { + Note.Y, 0, conf_core.design.text_scale, string, MakeFlags(flag))) != NULL) { AddObjectToCreateUndoList(TEXT_TYPE, CURRENT, text, text); IncrementUndoSerialNumber(); DrawText(CURRENT, text); @@ -1041,13 +1042,13 @@ /* first notify, lookup object */ case STATE_FIRST: { - int types = (Settings.Mode == COPY_MODE) ? COPY_TYPES : MOVE_TYPES; + int types = (conf_core.editor.mode == COPY_MODE) ? COPY_TYPES : MOVE_TYPES; Crosshair.AttachedObject.Type = SearchScreen(Note.X, Note.Y, types, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != NO_TYPE) { - if (Settings.Mode == MOVE_MODE && TEST_FLAG(LOCKFLAG, (PinTypePtr) + if (conf_core.editor.mode == MOVE_MODE && TEST_FLAG(LOCKFLAG, (PinTypePtr) Crosshair.AttachedObject.Ptr2)) { Message(_("Sorry, the object is locked\n")); Crosshair.AttachedObject.Type = NO_TYPE; @@ -1060,7 +1061,7 @@ /* second notify, move or copy object */ case STATE_SECOND: - if (Settings.Mode == COPY_MODE) + if (conf_core.editor.mode == COPY_MODE) CopyObject(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, @@ -1182,18 +1183,18 @@ case F_Selected: case F_SelectedElements: if (size_id == 0) - *out = Settings.ViaThickness; + *out = conf_core.design.via_thickness; else if (size_id == 1) - *out = Settings.ViaDrillingHole; + *out = conf_core.design.via_drilling_hole; else - *out = Settings.Keepaway; + *out = conf_core.design.keepaway; break; case F_SelectedArcs: case F_SelectedLines: if (size_id == 2) - *out = Settings.Keepaway; + *out = conf_core.design.keepaway; else - *out = Settings.LineThickness; + *out = conf_core.design.line_thickness; return 0; case F_SelectedTexts: case F_SelectedNames: Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 1699) +++ trunk/src/buffer.c (revision 1700) @@ -30,6 +30,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -445,7 +446,7 @@ ClearBuffer(Buffer); if (!ParseElement(Buffer->Data, Name)) { - if (Settings.ShowSolderSide) + if (conf_core.editor.show_solder_side) SwapBuffer(Buffer); SetBufferBoundingBox(Buffer); if (elementlist_length(&Buffer->Data->Element)) { @@ -731,7 +732,7 @@ sprintf(num, "%d", pin_n++); CreateNewPad(Element, x1, y1, x2, y2, t, - 2 * Settings.Keepaway, t + Settings.Keepaway, NULL, num, MakeFlags(SQUAREFLAG | onsolderflag)); + 2 * conf_core.design.keepaway, t + conf_core.design.keepaway, NULL, num, MakeFlags(SQUAREFLAG | onsolderflag)); MAYBE_WARN(); hasParts = true; } Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 1699) +++ trunk/src/change.c (revision 1700) @@ -37,6 +37,7 @@ #include #include "global.h" +#include "conf_core.h" #include "change.h" #include "create.h" @@ -2467,7 +2468,7 @@ /* crosshair range is different if pastebuffer-mode * is enabled */ - if (Settings.Mode == PASTEBUFFER_MODE) + if (conf_core.editor.mode == PASTEBUFFER_MODE) SetCrosshairRange(PASTEBUFFER->X - PASTEBUFFER->BoundingBox.X1, PASTEBUFFER->Y - PASTEBUFFER->BoundingBox.Y1, MAX(0, Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 1699) +++ trunk/src/change_act.c (revision 1700) @@ -28,7 +28,10 @@ /* action routines for output window */ +#include + #include "config.h" +#include "conf_core.h" #include "global.h" #include "data.h" @@ -45,7 +48,6 @@ #include "error.h" #include "undo.h" #include "rubberband.h" -#include static void ChangeFlag(char *, char *, int, char *); static int ActionChangeSize(int argc, char **argv, Coord x, Coord y); @@ -1320,7 +1322,7 @@ value = GetValue(val, units, &absolute); switch (funchash_get(function, NULL)) { case F_ViaDrillingHole: - SetViaDrillingHole(absolute ? value : value + Settings.ViaDrillingHole, false); + SetViaDrillingHole(absolute ? value : value + conf_core.design.via_drilling_hole, false); hid_action("RouteStylesChanged"); break; @@ -1341,13 +1343,13 @@ case F_LineSize: case F_Line: - SetLineSize(absolute ? value : value + Settings.LineThickness); + SetLineSize(absolute ? value : value + conf_core.design.line_thickness); hid_action("RouteStylesChanged"); break; case F_Via: case F_ViaSize: - SetViaSize(absolute ? value : value + Settings.ViaThickness, false); + SetViaSize(absolute ? value : value + conf_core.design.via_thickness, false); hid_action("RouteStylesChanged"); break; @@ -1354,7 +1356,7 @@ case F_Text: case F_TextScale: value /= 45; - SetTextScale(absolute ? value : value + Settings.TextScale); + SetTextScale(absolute ? value : value + conf_core.design.text_scale); break; default: err = 1; Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 1699) +++ trunk/src/copy.c (revision 1700) @@ -32,6 +32,7 @@ */ #include "config.h" +#include "conf_core.h" #include @@ -51,7 +52,6 @@ #include "select.h" #include "undo.h" - RCSID("$Id$"); /* --------------------------------------------------------------------------- Index: trunk/src/create.c =================================================================== --- trunk/src/create.c (revision 1699) +++ trunk/src/create.c (revision 1700) @@ -37,6 +37,7 @@ #include #include "global.h" +#include "conf_core.h" #include "create.h" #include "data.h" @@ -54,6 +55,7 @@ #include "file.h" #include "stub_vendor.h" #include "hid_actions.h" +#include "paths.h" RCSID("$Id$"); @@ -99,30 +101,30 @@ int i; /* copy default settings */ - ptr->ConnectedColor = Settings.ConnectedColor; - ptr->ElementColor = Settings.ElementColor; - ptr->ElementColor_nonetlist = Settings.ElementColor_nonetlist; - ptr->RatColor = Settings.RatColor; - ptr->InvisibleObjectsColor = Settings.InvisibleObjectsColor; - ptr->InvisibleMarkColor = Settings.InvisibleMarkColor; - ptr->ElementSelectedColor = Settings.ElementSelectedColor; - ptr->RatSelectedColor = Settings.RatSelectedColor; - ptr->PinColor = Settings.PinColor; - ptr->PinSelectedColor = Settings.PinSelectedColor; - ptr->PinNameColor = Settings.PinNameColor; - ptr->ViaColor = Settings.ViaColor; - ptr->ViaSelectedColor = Settings.ViaSelectedColor; - ptr->WarnColor = Settings.WarnColor; - ptr->MaskColor = Settings.MaskColor; + ptr->ConnectedColor = conf_core.appearance.color.connected; + ptr->ElementColor = conf_core.appearance.color.element; + ptr->ElementColor_nonetlist = conf_core.appearance.color.element_nonetlist; + ptr->RatColor = conf_core.appearance.color.rat; + ptr->InvisibleObjectsColor = conf_core.appearance.color.invisible_objects; + ptr->InvisibleMarkColor = conf_core.appearance.color.invisible_mark; + ptr->ElementSelectedColor = conf_core.appearance.color.element_selected; + ptr->RatSelectedColor = conf_core.appearance.color.rat_selected; + ptr->PinColor = conf_core.appearance.color.pin; + ptr->PinSelectedColor = conf_core.appearance.color.pin_selected; + ptr->PinNameColor = conf_core.appearance.color.pin_name; + ptr->ViaColor = conf_core.appearance.color.via; + ptr->ViaSelectedColor = conf_core.appearance.color.via_selected; + ptr->WarnColor = conf_core.appearance.color.warn; + ptr->MaskColor = conf_core.appearance.color.mask; for (i = 0; i < MAX_LAYER; i++) { - ptr->Data->Layer[i].Color = Settings.LayerColor[i]; - ptr->Data->Layer[i].SelectedColor = Settings.LayerSelectedColor[i]; + ptr->Data->Layer[i].Color = conf_core.appearance.color.layer[i]; + ptr->Data->Layer[i].SelectedColor = conf_core.appearance.color.layer_selected[i]; } ptr->Data->Layer[component_silk_layer].Color = - Settings.ShowSolderSide ? Settings.InvisibleObjectsColor : Settings.ElementColor; - ptr->Data->Layer[component_silk_layer].SelectedColor = Settings.ElementSelectedColor; - ptr->Data->Layer[solder_silk_layer].Color = Settings.ShowSolderSide ? Settings.ElementColor : Settings.InvisibleObjectsColor; - ptr->Data->Layer[solder_silk_layer].SelectedColor = Settings.ElementSelectedColor; + conf_core.editor.show_solder_side ? conf_core.appearance.color.invisible_objects : conf_core.appearance.color.element; + ptr->Data->Layer[component_silk_layer].SelectedColor = conf_core.appearance.color.element_selected; + ptr->Data->Layer[solder_silk_layer].Color = conf_core.editor.show_solder_side ? conf_core.appearance.color.element : conf_core.appearance.color.invisible_objects; + ptr->Data->Layer[solder_silk_layer].SelectedColor = conf_core.appearance.color.element_selected; } /* --------------------------------------------------------------------------- @@ -143,59 +145,60 @@ ptr->SilkActive = false; ptr->RatDraw = false; SET_FLAG(NAMEONPCBFLAG, ptr); - if (Settings.ShowNumber) + if (conf_core.editor.show_number) SET_FLAG(SHOWNUMBERFLAG, ptr); - if (Settings.AllDirectionLines) + if (conf_core.editor.all_direction_lines) SET_FLAG(ALLDIRECTIONFLAG, ptr); ptr->Clipping = 1; /* this is the most useful starting point for now */ - if (Settings.RubberBandMode) + if (conf_core.editor.rubber_band_mode) SET_FLAG(RUBBERBANDFLAG, ptr); - if (Settings.SwapStartDirection) + if (conf_core.editor.swap_start_direction) SET_FLAG(SWAPSTARTDIRFLAG, ptr); - if (Settings.UniqueNames) + if (conf_core.editor.unique_names) SET_FLAG(UNIQUENAMEFLAG, ptr); - if (Settings.SnapPin) + if (conf_core.editor.snap_pin) SET_FLAG(SNAPPINFLAG, ptr); - if (Settings.SnapOffGridLine) + if (conf_core.editor.snap_offgrid_line) SET_FLAG(SNAPOFFGRIDLINEFLAG, ptr); - if (Settings.HighlightOnPoint) + if (conf_core.editor.highlight_on_point) SET_FLAG(HIGHLIGHTONPOINTFLAG, ptr); - if (Settings.ClearLine) + if (conf_core.editor.clear_line) SET_FLAG(CLEARNEWFLAG, ptr); - if (Settings.FullPoly) + if (conf_core.editor.full_poly) SET_FLAG(NEWFULLPOLYFLAG, ptr); - if (Settings.OrthogonalMoves) + if (conf_core.editor.orthogonal_moves) SET_FLAG(ORTHOMOVEFLAG, ptr); - if (Settings.liveRouting) + if (conf_core.editor.live_routing) SET_FLAG(LIVEROUTEFLAG, ptr); - if (Settings.ShowDRC) + if (conf_core.editor.show_drc) SET_FLAG(SHOWDRCFLAG, ptr); - if (Settings.AutoDRC) + if (conf_core.editor.auto_drc) SET_FLAG(AUTODRCFLAG, ptr); - ptr->Grid = Settings.Grid; - ptr->LayerGroups = Settings.LayerGroups; + ptr->Grid = conf_core.editor.grid; + ParseGroupString(conf_core.rc.groups, &ptr->LayerGroups, MAX_LAYER); STYLE_LOOP(ptr); { - *style = Settings.RouteStyle[n]; + char *s = &conf_core.rc.routes[n]; + ParseRoutingString1(&s, style, "mil"); style->index = n; } END_LOOP; hid_action("RouteStylesChanged"); - ptr->Zoom = Settings.Zoom; - ptr->MaxWidth = Settings.MaxWidth; - ptr->MaxHeight = Settings.MaxHeight; + ptr->Zoom = conf_core.editor.zoom; + ptr->MaxWidth = conf_core.design.max_width; + ptr->MaxHeight = conf_core.design.max_height; ptr->ID = ID++; ptr->ThermScale = 0.5; - ptr->Bloat = Settings.Bloat; - ptr->Shrink = Settings.Shrink; - ptr->minWid = Settings.minWid; - ptr->minSlk = Settings.minSlk; - ptr->minDrill = Settings.minDrill; - ptr->minRing = Settings.minRing; + ptr->Bloat = conf_core.design.bloat; + ptr->Shrink = conf_core.design.shrink; + ptr->minWid = conf_core.design.min_wid; + ptr->minSlk = conf_core.design.min_slk; + ptr->minDrill = conf_core.design.min_drill; + ptr->minRing = conf_core.design.min_ring; for (i = 0; i < MAX_LAYER; i++) - ptr->Data->Layer[i].Name = strdup(Settings.DefaultLayerName[i]); + ptr->Data->Layer[i].Name = strdup(conf_core.design.default_layer_name[i]); CreateDefaultFont(ptr); @@ -205,11 +208,17 @@ PCBTypePtr CreateNewPCB() { PCBTypePtr old, nw; + int dpcb; old = PCB; PCB = NULL; - if ((LoadPCB(Settings.DefaultPcbFile, false, true) == 0) || (LoadPCB(PCB_DEFAULT_PCB_FILE_SRC, false, true) == 0)) { + + dpcb = -1; + conf_list_foreach_path_first(dpcb, &conf_core.rc.default_pcb_file, LoadPCB(__path__, false, true)); + +#warning TODO: load from a lihata list instead? same for font file? + if (dpcb == 0) { nw = PCB; if (nw->Filename != NULL) { /* make sure the new PCB doesn't inherit the name of the default pcb */ @@ -251,7 +260,7 @@ { if (Distance(X, Y, via->X, via->Y) <= via->DrillingHole / 2 + DrillingHole / 2) { Message(_("%m+Dropping via at %$mD because it's hole would overlap with the via " - "at %$mD\n"), Settings.grid_unit->allow, X, Y, via->X, via->Y); + "at %$mD\n"), conf_core.editor.grid_unit->allow, X, Y, via->X, via->Y); return (NULL); /* don't allow via stacking */ } } @@ -271,7 +280,7 @@ Via->DrillingHole = stub_vendorDrillMap(DrillingHole); if (Via->DrillingHole != DrillingHole) { Message(_("%m+Mapped via drill hole to %$mS from %$mS per vendor table\n"), - Settings.grid_unit->allow, Via->DrillingHole, DrillingHole); + conf_core.editor.grid_unit->allow, Via->DrillingHole, DrillingHole); } Via->Name = STRDUP(Name); @@ -287,7 +296,7 @@ if (!TEST_FLAG(HOLEFLAG, Via) && (Via->Thickness < Via->DrillingHole + MIN_PINORVIACOPPER)) { Via->Thickness = Via->DrillingHole + MIN_PINORVIACOPPER; Message(_("%m+Increased via thickness to %$mS to allow enough copper" - " at %$mD.\n"), Settings.grid_unit->allow, Via->Thickness, Via->X, Via->Y); + " at %$mD.\n"), conf_core.editor.grid_unit->allow, Via->Thickness, Via->X, Via->Y); } SetPinBoundingBox(Via); @@ -744,18 +753,18 @@ if (stub_vendorIsElementMappable(Element)) { if (pin->DrillingHole < MIN_PINORVIASIZE) { Message(_("%m+Did not map pin #%s (%s) drill hole because %$mS is below the minimum allowed size\n"), - Settings.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); + conf_core.editor.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; } else if (pin->DrillingHole > MAX_PINORVIASIZE) { Message(_("%m+Did not map pin #%s (%s) drill hole because %$mS is above the maximum allowed size\n"), - Settings.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); + conf_core.editor.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; } else if (!TEST_FLAG(HOLEFLAG, pin) && (pin->DrillingHole > pin->Thickness - MIN_PINORVIACOPPER)) { Message(_("%m+Did not map pin #%s (%s) drill hole because %$mS does not leave enough copper\n"), - Settings.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); + conf_core.editor.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; } } @@ -765,7 +774,7 @@ if (pin->DrillingHole != DrillingHole) { Message(_("%m+Mapped pin drill hole to %$mS from %$mS per vendor table\n"), - Settings.grid_unit->allow, pin->DrillingHole, DrillingHole); + conf_core.editor.grid_unit->allow, pin->DrillingHole, DrillingHole); } return (pin); @@ -859,8 +868,11 @@ */ void CreateDefaultFont(PCBTypePtr pcb) { - if (ParseFont(&pcb->Font, Settings.FontFile)) - Message(_("Can't find font-symbol-file '%s'\n"), Settings.FontFile); + int res = -1; + conf_list_foreach_path_first(res, &conf_core.rc.default_font_file, ParseFont(&pcb->Font, __path__)); +#warning TODO: print content of list + if (res != 0) + Message(_("Can't find font-symbol-file '%s'\n"), ""); } /* --------------------------------------------------------------------------- Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 1699) +++ trunk/src/crosshair.c (revision 1700) @@ -37,6 +37,7 @@ #include #include "global.h" +#include "conf_core.h" #include "box.h" #include "crosshair.h" @@ -51,6 +52,7 @@ #include "polygon.h" #include "hid_actions.h" + RCSID("$Id$"); typedef struct { @@ -213,7 +215,7 @@ /* pads */ PAD_LOOP(Element); { - if (PCB->InvisibleObjectsOn || (TEST_FLAG(ONSOLDERFLAG, pad) != 0) == Settings.ShowSolderSide) { + if (PCB->InvisibleObjectsOn || (TEST_FLAG(ONSOLDERFLAG, pad) != 0) == conf_core.editor.show_solder_side) { /* Make a copy of the pad structure, moved to the correct position */ PadType moved_pad = *pad; moved_pad.Point1.X += DX; @@ -453,7 +455,7 @@ */ void DrawAttached(void) { - switch (Settings.Mode) { + switch (conf_core.editor.mode) { case VIA_MODE: { /* Make a dummy via structure to draw from */ @@ -460,9 +462,9 @@ PinType via; via.X = Crosshair.X; via.Y = Crosshair.Y; - via.Thickness = Settings.ViaThickness; - via.Clearance = 2 * Settings.Keepaway; - via.DrillingHole = Settings.ViaDrillingHole; + via.Thickness = conf_core.design.via_thickness; + via.Clearance = 2 * conf_core.design.keepaway; + via.DrillingHole = conf_core.design.via_drilling_hole; via.Mask = 0; via.Flags = NoFlags(); @@ -470,10 +472,10 @@ if (TEST_FLAG(SHOWDRCFLAG, PCB)) { /* XXX: Naughty cheat - use the mask to draw DRC clearance! */ - via.Mask = Settings.ViaThickness + PCB->Bloat * 2; - gui->set_color(Crosshair.GC, Settings.CrossColor); + via.Mask = conf_core.design.via_thickness + PCB->Bloat * 2; + gui->set_color(Crosshair.GC, conf_core.appearance.color.cross); gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &via, false, true); - gui->set_color(Crosshair.GC, Settings.CrosshairColor); + gui->set_color(Crosshair.GC, conf_core.appearance.color.crosshair); } break; } @@ -495,11 +497,11 @@ case ARC_MODE: if (Crosshair.AttachedBox.State != STATE_FIRST) { - XORDrawAttachedArc(Settings.LineThickness); + XORDrawAttachedArc(conf_core.design.line_thickness); if (TEST_FLAG(SHOWDRCFLAG, PCB)) { - gui->set_color(Crosshair.GC, Settings.CrossColor); - XORDrawAttachedArc(Settings.LineThickness + 2 * (PCB->Bloat + 1)); - gui->set_color(Crosshair.GC, Settings.CrosshairColor); + gui->set_color(Crosshair.GC, conf_core.appearance.color.cross); + XORDrawAttachedArc(conf_core.design.line_thickness + 2 * (PCB->Bloat + 1)); + gui->set_color(Crosshair.GC, conf_core.appearance.color.crosshair); } } @@ -511,23 +513,23 @@ XORDrawAttachedLine(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, - Crosshair.AttachedLine.Point2.Y, PCB->RatDraw ? 10 : Settings.LineThickness); + Crosshair.AttachedLine.Point2.Y, PCB->RatDraw ? 10 : conf_core.design.line_thickness); /* draw two lines ? */ if (PCB->Clipping) XORDrawAttachedLine(Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, - Crosshair.X, Crosshair.Y, PCB->RatDraw ? 10 : Settings.LineThickness); + Crosshair.X, Crosshair.Y, PCB->RatDraw ? 10 : conf_core.design.line_thickness); if (TEST_FLAG(SHOWDRCFLAG, PCB)) { - gui->set_color(Crosshair.GC, Settings.CrossColor); + gui->set_color(Crosshair.GC, conf_core.appearance.color.cross); XORDrawAttachedLine(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, - Crosshair.AttachedLine.Point2.Y, PCB->RatDraw ? 10 : Settings.LineThickness + 2 * (PCB->Bloat + 1)); + Crosshair.AttachedLine.Point2.Y, PCB->RatDraw ? 10 : conf_core.design.line_thickness + 2 * (PCB->Bloat + 1)); if (PCB->Clipping) XORDrawAttachedLine(Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, - Crosshair.X, Crosshair.Y, PCB->RatDraw ? 10 : Settings.LineThickness + 2 * (PCB->Bloat + 1)); - gui->set_color(Crosshair.GC, Settings.CrosshairColor); + Crosshair.X, Crosshair.Y, PCB->RatDraw ? 10 : conf_core.design.line_thickness + 2 * (PCB->Bloat + 1)); + gui->set_color(Crosshair.GC, conf_core.appearance.color.crosshair); } } break; @@ -895,8 +897,8 @@ * the same layer), and when moving a line end-point * (but don't snap to the same line) */ - if ((Settings.Mode != LINE_MODE || CURRENT != ptr1) && - (Settings.Mode != MOVE_MODE || + if ((conf_core.editor.mode != LINE_MODE || CURRENT != ptr1) && + (conf_core.editor.mode != MOVE_MODE || Crosshair.AttachedObject.Ptr1 != ptr1 || Crosshair.AttachedObject.Type != LINEPOINT_TYPE || Crosshair.AttachedObject.Ptr2 == line)) return; @@ -1001,11 +1003,11 @@ /* Avoid self-snapping when moving */ if (ans != NO_TYPE && - Settings.Mode == MOVE_MODE && Crosshair.AttachedObject.Type == ELEMENT_TYPE && ptr1 == Crosshair.AttachedObject.Ptr1) + conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == ELEMENT_TYPE && ptr1 == Crosshair.AttachedObject.Ptr1) ans = NO_TYPE; if (ans != NO_TYPE && - (Settings.Mode == LINE_MODE || (Settings.Mode == MOVE_MODE && Crosshair.AttachedObject.Type == LINEPOINT_TYPE))) { + (conf_core.editor.mode == LINE_MODE || (conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == LINEPOINT_TYPE))) { PadTypePtr pad = (PadTypePtr) ptr2; LayerType *desired_layer; Cardinal desired_group; @@ -1013,7 +1015,7 @@ int found_our_layer = false; desired_layer = CURRENT; - if (Settings.Mode == MOVE_MODE && Crosshair.AttachedObject.Type == LINEPOINT_TYPE) { + if (conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == LINEPOINT_TYPE) { desired_layer = (LayerType *) Crosshair.AttachedObject.Ptr1; } @@ -1046,7 +1048,7 @@ /* Avoid self-snapping when moving */ if (ans != NO_TYPE && - Settings.Mode == MOVE_MODE && Crosshair.AttachedObject.Type == ELEMENT_TYPE && ptr1 == Crosshair.AttachedObject.Ptr1) + conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == ELEMENT_TYPE && ptr1 == Crosshair.AttachedObject.Ptr1) ans = NO_TYPE; if (ans != NO_TYPE) { @@ -1059,7 +1061,7 @@ ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, VIA_TYPE, &ptr1, &ptr2, &ptr3); /* Avoid snapping vias to any other vias */ - if (Settings.Mode == MOVE_MODE && Crosshair.AttachedObject.Type == VIA_TYPE && (ans & PIN_TYPES)) + if (conf_core.editor.mode == MOVE_MODE && Crosshair.AttachedObject.Type == VIA_TYPE && (ans & PIN_TYPES)) ans = NO_TYPE; if (ans != NO_TYPE) { @@ -1099,7 +1101,7 @@ if (TEST_FLAG(HIGHLIGHTONPOINTFLAG, PCB)) onpoint_work(&Crosshair, Crosshair.X, Crosshair.Y); - if (Settings.Mode == ARROW_MODE) { + if (conf_core.editor.mode == ARROW_MODE) { ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, LINEPOINT_TYPE, &ptr1, &ptr2, &ptr3); if (ans == NO_TYPE) hid_action("PointCursor"); @@ -1107,7 +1109,7 @@ hid_actionl("PointCursor", "True", NULL); } - if (Settings.Mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST && TEST_FLAG(AUTODRCFLAG, PCB)) + if (conf_core.editor.mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST && TEST_FLAG(AUTODRCFLAG, PCB)) EnforceLineDRC(); gui->set_crosshair(Crosshair.X, Crosshair.Y, HID_SC_DO_NOTHING); @@ -1170,7 +1172,7 @@ { Crosshair.GC = gui->make_gc(); - gui->set_color(Crosshair.GC, Settings.CrosshairColor); + gui->set_color(Crosshair.GC, conf_core.appearance.color.crosshair); gui->set_draw_xor(Crosshair.GC, 1); gui->set_line_cap(Crosshair.GC, Trace_Cap); gui->set_line_width(Crosshair.GC, 1); Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 1699) +++ trunk/src/data.c (revision 1700) @@ -45,7 +45,6 @@ PCBTypePtr PCB; /* pointer to layout struct */ char *Progname; -SettingType Settings; int LayerStack[MAX_LAYER]; /* determines the layer draw order */ BufferType Buffers[MAX_BUFFER]; /* my buffers */ Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 1699) +++ trunk/src/data.h (revision 1700) @@ -51,8 +51,6 @@ #define solder_silk_layer (max_copper_layer + SOLDER_LAYER) #define component_silk_layer (max_copper_layer + COMPONENT_LAYER) -extern SettingType Settings; - extern BufferType Buffers[MAX_BUFFER]; /*extern DeviceInfoType PrintingDevice[];*/ Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 1699) +++ trunk/src/draw.c (revision 1700) @@ -33,6 +33,7 @@ #include "config.h" #include "global.h" +#include "conf_core.h" /*#include "clip.h"*/ #include "compat_misc.h" @@ -49,7 +50,6 @@ #include "print.h" #include "hid_helper.h" - #undef NDEBUG #include @@ -210,12 +210,12 @@ vert = TEST_FLAG(EDGE2FLAG, pv); if (vert) { - box.X1 = pv->X - pv->Thickness / 2 + Settings.PinoutTextOffsetY; - box.Y1 = pv->Y - pv->DrillingHole / 2 - Settings.PinoutTextOffsetX; + box.X1 = pv->X - pv->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; + box.Y1 = pv->Y - pv->DrillingHole / 2 - conf_core.appearance.pinout.text_offset_x; } else { - box.X1 = pv->X + pv->DrillingHole / 2 + Settings.PinoutTextOffsetX; - box.Y1 = pv->Y - pv->Thickness / 2 + Settings.PinoutTextOffsetY; + box.X1 = pv->X + pv->DrillingHole / 2 + conf_core.appearance.pinout.text_offset_x; + box.Y1 = pv->Y - pv->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; } gui->set_color(Output.fgGC, PCB->PinNameColor); @@ -295,14 +295,14 @@ if (vert) { box.X1 = pad->Point1.X - pad->Thickness / 2; box.Y1 = MAX(pad->Point1.Y, pad->Point2.Y) + pad->Thickness / 2; - box.X1 += Settings.PinoutTextOffsetY; - box.Y1 -= Settings.PinoutTextOffsetX; + box.X1 += conf_core.appearance.pinout.text_offset_y; + box.Y1 -= conf_core.appearance.pinout.text_offset_x; } else { box.X1 = MIN(pad->Point1.X, pad->Point2.X) - pad->Thickness / 2; box.Y1 = pad->Point1.Y - pad->Thickness / 2; - box.X1 += Settings.PinoutTextOffsetX; - box.Y1 += Settings.PinoutTextOffsetY; + box.X1 += conf_core.appearance.pinout.text_offset_x; + box.Y1 += conf_core.appearance.pinout.text_offset_y; } gui->set_color(Output.fgGC, PCB->PinNameColor); @@ -458,7 +458,7 @@ else if (TEST_FLAG(SELECTEDFLAG, pv)) color = PCB->ViaSelectedColor; else - color = Settings.BlackColor; + color = conf_core.appearance.color.black; if (TEST_FLAG(ONPOINTFLAG, pv)) { assert(color != NULL); @@ -543,8 +543,8 @@ else gui->set_color(Output.fgGC, PCB->RatColor); - if (Settings.RatThickness < 20) - rat->Thickness = pixel_slop * Settings.RatThickness; + if (conf_core.design.rat_thickness < 20) + rat->Thickness = pixel_slop * conf_core.design.rat_thickness; /* rats.c set VIAFLAG if this rat goes to a containing poly: draw a donut */ if (TEST_FLAG(VIAFLAG, rat)) { int w = rat->Thickness; @@ -1126,12 +1126,12 @@ bool vert = TEST_FLAG(EDGE2FLAG, Ptr); if (vert) { - box.X1 = Ptr->X - Ptr->Thickness / 2 + Settings.PinoutTextOffsetY; - box.Y1 = Ptr->Y - Ptr->DrillingHole / 2 - Settings.PinoutTextOffsetX; + box.X1 = Ptr->X - Ptr->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; + box.Y1 = Ptr->Y - Ptr->DrillingHole / 2 - conf_core.appearance.pinout.text_offset_x; } else { - box.X1 = Ptr->X + Ptr->DrillingHole / 2 + Settings.PinoutTextOffsetX; - box.Y1 = Ptr->Y - Ptr->Thickness / 2 + Settings.PinoutTextOffsetY; + box.X1 = Ptr->X + Ptr->DrillingHole / 2 + conf_core.appearance.pinout.text_offset_x; + box.Y1 = Ptr->Y - Ptr->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; } if (vert) { @@ -1156,8 +1156,8 @@ if (vert) { box.X1 = Pad->Point1.X - Pad->Thickness / 2; box.Y1 = MAX(Pad->Point1.Y, Pad->Point2.Y) + Pad->Thickness / 2; - box.X1 += Settings.PinoutTextOffsetY; - box.Y1 -= Settings.PinoutTextOffsetX; + box.X1 += conf_core.appearance.pinout.text_offset_y; + box.Y1 -= conf_core.appearance.pinout.text_offset_x; box.X2 = box.X1; box.Y2 = box.Y1; } @@ -1164,8 +1164,8 @@ else { box.X1 = MIN(Pad->Point1.X, Pad->Point2.X) - Pad->Thickness / 2; box.Y1 = Pad->Point1.Y - Pad->Thickness / 2; - box.X1 += Settings.PinoutTextOffsetX; - box.Y1 += Settings.PinoutTextOffsetY; + box.X1 += conf_core.appearance.pinout.text_offset_x; + box.Y1 += conf_core.appearance.pinout.text_offset_y; box.X2 = box.X1; box.Y2 = box.Y1; } @@ -1317,8 +1317,8 @@ */ void DrawRat(RatTypePtr Rat) { - if (Settings.RatThickness < 20) - Rat->Thickness = pixel_slop * Settings.RatThickness; + if (conf_core.design.rat_thickness < 20) + Rat->Thickness = pixel_slop * conf_core.design.rat_thickness; /* rats.c set VIAFLAG if this rat goes to a containing poly: draw a donut */ if (TEST_FLAG(VIAFLAG, Rat)) { Coord w = Rat->Thickness; Index: trunk/src/file.c =================================================================== --- trunk/src/file.c (revision 1699) +++ trunk/src/file.c (revision 1700) @@ -33,6 +33,7 @@ */ #include "config.h" +#include "conf_core.h" #include @@ -414,10 +415,11 @@ unit_suffix = AttributeGet(PCB, "PCB::grid::unit"); if (unit_suffix && *unit_suffix) { const Unit *new_unit = get_unit_struct(unit_suffix); +#warning TODO: we MUST NOT overwrite this here; should be handled by pcb-local settings if (new_unit) - Settings.grid_unit = new_unit; + conf_core.editor.grid_unit = new_unit; } - AttributePut(PCB, "PCB::grid::unit", Settings.grid_unit->suffix); + AttributePut(PCB, "PCB::grid::unit", conf_core.editor.grid_unit->suffix); sort_netlist(); rats_patch_make_edited(PCB); @@ -581,7 +583,7 @@ fputs("\nPCB[", FP); PrintQuotedString(FP, (char *) EMPTY(PCB->Name)); pcb_fprintf(FP, " %mr %mr]\n\n", PCB->MaxWidth, PCB->MaxHeight); - pcb_fprintf(FP, "Grid[%.1mr %mr %mr %d]\n", PCB->Grid, PCB->GridOffsetX, PCB->GridOffsetY, Settings.DrawGrid); + pcb_fprintf(FP, "Grid[%.1mr %mr %mr %d]\n", PCB->Grid, PCB->GridOffsetX, PCB->GridOffsetY, conf_core.editor.draw_grid); pcb_fprintf(FP, "Cursor[%mr %mr %s]\n", Crosshair.X, Crosshair.Y, c_dtostr(PCB->Zoom)); /* PolyArea should be output in square cmils, no suffix */ fprintf(FP, "PolyArea[%s]\n", c_dtostr(COORD_TO_MIL(COORD_TO_MIL(PCB->IsleArea) * 100) * 100)); @@ -885,7 +887,7 @@ } /* --------------------------------------------------------------------------- - * writes to pipe using the command defined by Settings.SaveCommand + * writes to pipe using the command defined by conf_core.rc.save_command * %f are replaced by the passed filename */ static int WritePipe(char *Filename, bool thePcb) @@ -896,7 +898,7 @@ static gds_t command; int used_popen = 0; - if (EMPTY_STRING_P(Settings.SaveCommand)) { + if (EMPTY_STRING_P(conf_core.rc.save_command)) { fp = fopen(Filename, "w"); if (fp == 0) { Message("Unable to write to file %s\n", Filename); @@ -907,7 +909,7 @@ used_popen = 1; /* setup commandline */ gds_truncate(&command,0); - for (p = Settings.SaveCommand; *p; p++) { + for (p = conf_core.rc.save_command; *p; p++) { /* copy character if not special or add string to command */ if (!(*p == '%' && *(p + 1) == 'f')) gds_append(&command, *p); @@ -985,14 +987,14 @@ /* * If the backup interval is > 0 then set another timer. Otherwise * we do nothing and it is up to the GUI to call EnableAutosave() - * after setting Settings.BackupInterval > 0 again. + * after setting conf_core.rc.backup_interval > 0 again. */ static void backup_cb(hidval data) { backup_timer.ptr = NULL; Backup(); - if (Settings.BackupInterval > 0 && gui->add_timer) - backup_timer = gui->add_timer(backup_cb, 1000 * Settings.BackupInterval, data); + if (conf_core.rc.backup_interval > 0 && gui->add_timer) + backup_timer = gui->add_timer(backup_cb, 1000 * conf_core.rc.backup_interval, data); } void EnableAutosave(void) @@ -1007,8 +1009,8 @@ backup_timer.ptr = NULL; /* Start up a new timer */ - if (Settings.BackupInterval > 0 && gui->add_timer) - backup_timer = gui->add_timer(backup_cb, 1000 * Settings.BackupInterval, x); + if (conf_core.rc.backup_interval > 0 && gui->add_timer) + backup_timer = gui->add_timer(backup_cb, 1000 * conf_core.rc.backup_interval, x); } /* --------------------------------------------------------------------------- @@ -1088,7 +1090,7 @@ Message(_("Importing PCB netlist %s\n"), filename); - if (EMPTY_STRING_P(Settings.RatCommand)) { + if (EMPTY_STRING_P(conf_core.rc.rat_command)) { fp = fopen(filename, "r"); if (!fp) { Message("Cannot open %s for reading", filename); @@ -1097,7 +1099,7 @@ } else { used_popen = 1; - command = EvaluateFilename(Settings.RatCommand, Settings.RatPath, filename, NULL); + command = EvaluateFilename(conf_core.rc.rat_command, conf_core.rc.rat_path, filename, NULL); /* open pipe to stdout of command */ if (*command == '\0' || (fp = popen(command, "r")) == NULL) { Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 1699) +++ trunk/src/file_act.c (revision 1700) @@ -25,6 +25,7 @@ * */ #include "config.h" +#include "conf_core.h" #include "global.h" #include "data.h" #include "action_helper.h" @@ -188,7 +189,7 @@ /* do emergency saving * clear the old struct and allocate memory for the new one */ - if (PCB->Changed && Settings.SaveInTMP) + if (PCB->Changed && conf_core.editor.save_in_tmp) SaveInTMP(); RemovePCB(PCB); PCB = CreateNewPCB(); Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 1699) +++ trunk/src/find.c (revision 1700) @@ -78,6 +78,7 @@ #endif #include "global.h" +#include "conf_core.h" #include "crosshair.h" #include "data.h" @@ -117,7 +118,7 @@ { \ int i; \ fputc('#', (FP)); \ - for (i = Settings.CharPerLine; i; i--) \ + for (i = conf_core.appearance.messages.char_per_line; i; i--) \ fputc('=', (FP)); \ fputc('\n', (FP)); \ } @@ -213,13 +214,13 @@ else { /* Fallback to formatting the violation message as text */ append_drc_dialog_message("%s\n", violation->title); - append_drc_dialog_message(_("%m+near %$mD\n"), Settings.grid_unit->allow, violation->x, violation->y); + append_drc_dialog_message(_("%m+near %$mD\n"), conf_core.editor.grid_unit->allow, violation->x, violation->y); GotoError(); } if (gui->drc_gui == NULL || gui->drc_gui->log_drc_violations) { Message(_("WARNING! Design Rule error - %s\n"), violation->title); - Message(_("%m+near location %$mD\n"), Settings.grid_unit->allow, violation->x, violation->y); + Message(_("%m+near location %$mD\n"), conf_core.editor.grid_unit->allow, violation->x, violation->y); } } @@ -911,7 +912,7 @@ if (!TEST_FLAG(TheFlag, pin) && PV_TOUCH_PV(&i->pv, pin)) { if (TEST_FLAG(HOLEFLAG, pin) || TEST_FLAG(HOLEFLAG, &i->pv)) { SET_FLAG(WARNFLAG, pin); - Settings.RatWarn = true; + conf_core.editor.rat_warn = true; if (pin->Element) Message(_("WARNING: Hole too close to pin.\n")); else @@ -990,7 +991,7 @@ if (!TEST_FLAG(TheFlag, pv) && PinLineIntersect(pv, &i->line)) { if (TEST_FLAG(HOLEFLAG, pv)) { SET_FLAG(WARNFLAG, pv); - Settings.RatWarn = true; + conf_core.editor.rat_warn = true; Message(_("WARNING: Hole too close to line.\n")); } else if (ADD_PV_TO_LIST(pv, LINE_TYPE, &i->line, FCT_COPPER)) @@ -1007,7 +1008,7 @@ if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_PAD(pv, &i->pad)) { if (TEST_FLAG(HOLEFLAG, pv)) { SET_FLAG(WARNFLAG, pv); - Settings.RatWarn = true; + conf_core.editor.rat_warn = true; Message(_("WARNING: Hole too close to pad.\n")); } else if (ADD_PV_TO_LIST(pv, PAD_TYPE, &i->pad, FCT_COPPER)) @@ -1024,7 +1025,7 @@ if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_ARC(pv, &i->arc)) { if (TEST_FLAG(HOLEFLAG, pv)) { SET_FLAG(WARNFLAG, pv); - Settings.RatWarn = true; + conf_core.editor.rat_warn = true; Message(_("WARNING: Hole touches arc.\n")); } else if (ADD_PV_TO_LIST(pv, ARC_TYPE, &i->arc, FCT_COPPER)) @@ -2867,7 +2868,7 @@ InitConnectionLookup(); PrintElementConnections(Element, FP, true); SetChangedFlag(true); - if (Settings.RingBellWhenFinished) + if (conf_core.editor.beep_when_finished) gui->beep(); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); @@ -2892,11 +2893,11 @@ if (PrintElementConnections(element, FP, false)) break; SEPARATE(FP); - if (Settings.ResetAfterElement && gdl_it_idx(&__it__) != 1) + if (conf_core.editor.reset_after_element && gdl_it_idx(&__it__) != 1) ResetConnections(false); } END_LOOP; - if (Settings.RingBellWhenFinished) + if (conf_core.editor.beep_when_finished) gui->beep(); ResetConnections(false); FreeConnectionLookupMemory(); @@ -3018,7 +3019,7 @@ /* we are done */ if (AndDraw) Draw(); - if (AndDraw && Settings.RingBellWhenFinished) + if (AndDraw && conf_core.editor.beep_when_finished) gui->beep(); FreeConnectionLookupMemory(); } @@ -3056,7 +3057,7 @@ } END_LOOP; - if (Settings.RingBellWhenFinished) + if (conf_core.editor.beep_when_finished) gui->beep(); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); Index: trunk/src/find_act.c =================================================================== --- trunk/src/find_act.c (revision 1699) +++ trunk/src/find_act.c (revision 1700) @@ -25,6 +25,7 @@ * */ #include "config.h" +#include "conf_core.h" #include "global.h" #include "data.h" #include "action_helper.h" @@ -55,7 +56,7 @@ Message(_("%m+Rules are minspace %$mS, minoverlap %$mS " "minwidth %$mS, minsilk %$mS\n" "min drill %$mS, min annular ring %$mS\n"), - Settings.grid_unit->allow, PCB->Bloat, PCB->Shrink, PCB->minWid, PCB->minSlk, PCB->minDrill, PCB->minRing); + conf_core.editor.grid_unit->allow, PCB->Bloat, PCB->Shrink, PCB->minWid, PCB->minSlk, PCB->minDrill, PCB->minRing); } count = DRCAll(); if (gui->drc_gui == NULL || gui->drc_gui->log_drc_overview) { Index: trunk/src/flags.c =================================================================== --- trunk/src/flags.c (revision 1699) +++ trunk/src/flags.c (revision 1700) @@ -24,6 +24,7 @@ #include "config.h" +#include "conf_core.h" #include #include @@ -44,9 +45,9 @@ { STYLE_LOOP(PCB); { - if (style->Thick == Settings.LineThickness && - style->Diameter == Settings.ViaThickness && - style->Hole == Settings.ViaDrillingHole && style->Keepaway == Settings.Keepaway) + if (style->Thick == conf_core.design.line_thickness && + style->Diameter == conf_core.design.via_thickness && + style->Hole == conf_core.design.via_drilling_hole && style->Keepaway == conf_core.design.keepaway) return n + 1; } END_LOOP; @@ -68,7 +69,8 @@ static const Unit *u = NULL; if (u == NULL) u = get_unit_struct("mm"); - return (Settings.grid_unit == u); +#warning we can save a memcmp here, probably + return memcmp(&conf_core.editor.grid_unit, u, sizeof(Unit)); } static int FlagUnitsMil(int dummy) @@ -76,12 +78,13 @@ static const Unit *u = NULL; if (u == NULL) u = get_unit_struct("mil"); - return (Settings.grid_unit == u); +#warning we can save a memcmp here, probably + return memcmp(&conf_core.editor.grid_unit, u, sizeof(Unit)); } static int FlagBuffer(int dummy) { - return (int) (Settings.BufferNumber + 1); + return (int) (conf_core.editor.buffer_number + 1); } static int FlagElementName(int dummy) @@ -100,14 +103,14 @@ static int FlagSETTINGS(int ofs) { - return *(bool *) ((char *) (&Settings) + ofs); + return *(bool *) ((char *) (&conf_core) + ofs); } static int FlagMode(int x) { if (x == -1) - return Settings.Mode; - return Settings.Mode == x; + return conf_core.editor.mode; + return conf_core.editor.mode == x; } static int FlagHaveRegex(int x) @@ -169,7 +172,7 @@ * 64bit machines. */ #define OffsetOf(a,b) (int)(size_t)(&(((a *)0)->b)) - +#warning TODO: do we still need this? HID_Flag flags_flag_list[] = { {"style", FlagCurrentStyle, 0} , @@ -291,43 +294,39 @@ {"highlightonpoint", FlagTESTFLAG, HIGHLIGHTONPOINTFLAG} , - {"fullpoly", FlagSETTINGS, OffsetOf(SettingType, FullPoly)} + {"fullpoly", FlagSETTINGS, OffsetOf(conf_core_t, editor.full_poly)} , {"grid_units_mm", FlagUnitsMm, -1} , {"grid_units_mil", FlagUnitsMil, -1} , - {"clearline", FlagSETTINGS, OffsetOf(SettingType, ClearLine)} + {"clearline", FlagSETTINGS, OffsetOf(conf_core_t, editor.clear_line)} , - {"uniquenames", FlagSETTINGS, OffsetOf(SettingType, UniqueNames)} + {"uniquenames", FlagSETTINGS, OffsetOf(conf_core_t, editor.unique_names)} , - {"showsolderside", FlagSETTINGS, OffsetOf(SettingType, ShowSolderSide)} + {"showsolderside", FlagSETTINGS, OffsetOf(conf_core_t, editor.show_solder_side)} , - {"savelastcommand", FlagSETTINGS, OffsetOf(SettingType, SaveLastCommand)} + {"savelastcommand", FlagSETTINGS, OffsetOf(conf_core_t, editor.save_last_command)} , - {"saveintmp", FlagSETTINGS, OffsetOf(SettingType, SaveInTMP)} + {"saveintmp", FlagSETTINGS, OffsetOf(conf_core_t, editor.save_in_tmp)} , - {"drawgrid", FlagSETTINGS, OffsetOf(SettingType, DrawGrid)} + {"drawgrid", FlagSETTINGS, OffsetOf(conf_core_t, editor.draw_grid)} , - {"ratwarn", FlagSETTINGS, OffsetOf(SettingType, RatWarn)} + {"ratwarn", FlagSETTINGS, OffsetOf(conf_core_t, editor.rat_warn)} , - {"stipplepolygons", FlagSETTINGS, OffsetOf(SettingType, StipplePolygons)} + {"stipplepolygons", FlagSETTINGS, OffsetOf(conf_core_t, editor.stipple_polygons)} , - {"alldirectionlines", FlagSETTINGS, - OffsetOf(SettingType, AllDirectionLines)} + {"alldirectionlines", FlagSETTINGS, OffsetOf(conf_core_t, editor.all_direction_lines)} , - {"rubberbandmode", FlagSETTINGS, OffsetOf(SettingType, RubberBandMode)} + {"rubberbandmode", FlagSETTINGS, OffsetOf(conf_core_t, editor.rubber_band_mode)} , - {"swapstartdirection", FlagSETTINGS, - OffsetOf(SettingType, SwapStartDirection)} + {"swapstartdirection", FlagSETTINGS, OffsetOf(conf_core_t, editor.swap_start_direction)} , - {"showdrcmode", FlagSETTINGS, OffsetOf(SettingType, ShowDRC)} + {"showdrcmode", FlagSETTINGS, OffsetOf(conf_core_t, editor.show_drc)} , - {"resetafterelement", FlagSETTINGS, - OffsetOf(SettingType, ResetAfterElement)} + {"resetafterelement", FlagSETTINGS, OffsetOf(conf_core_t, editor.reset_after_element)} , - {"ringbellwhenfinished", FlagSETTINGS, - OffsetOf(SettingType, RingBellWhenFinished)} + {"ringbellwhenfinished", FlagSETTINGS, OffsetOf(conf_core_t, editor.beep_when_finished)} , {"buffer", FlagBuffer, 0} Index: trunk/src/global.h =================================================================== --- trunk/src/global.h (revision 1699) +++ trunk/src/global.h (revision 1700) @@ -417,92 +417,6 @@ Coord X, Y; } MarkType, *MarkTypePtr; -/* --------------------------------------------------------------------------- - * our resources - * most of them are used as default when a new design is started - */ -typedef struct { /* some resources... */ - const Unit *grid_unit; - Increments *increments; - - int verbose; - - char *BlackColor, *WhiteColor, *BackgroundColor, /* background and cursor color ... */ - *CrosshairColor, /* different object colors */ - *CrossColor, - *ViaColor, - *ViaSelectedColor, - *PinColor, - *PinSelectedColor, - *PinNameColor, - *ElementColor, - *ElementColor_nonetlist, - *RatColor, - *InvisibleObjectsColor, - *InvisibleMarkColor, - *ElementSelectedColor, - *RatSelectedColor, - *ConnectedColor, *OffLimitColor, *GridColor, *LayerColor[MAX_LAYER], *LayerSelectedColor[MAX_LAYER], *WarnColor, *MaskColor; - Coord ViaThickness, /* some preset values */ - ViaDrillingHole, LineThickness, RatThickness, Keepaway, /* default size of a new layout */ - MaxWidth, MaxHeight, AlignmentDistance, Bloat, /* default drc sizes */ - Shrink, minWid, minSlk, minDrill, minRing; - int TextScale; /* text scaling in % */ - Coord Grid; /* grid in pcb-units */ - double Zoom, IsleArea, /* polygon min area */ - PinoutZoom; /* same for pinout windows */ - int PinoutNameLength, /* max displayed length of a pinname */ - Volume, /* the speakers volume -100..100 */ - CharPerLine, /* width of an output line in characters */ - Mode, /* currently active mode */ - BufferNumber; /* number of the current buffer */ - int BackupInterval; /* time between two backups in seconds */ - char *DefaultLayerName[MAX_LAYER], *FontCommand, /* commands for file loading... */ - *FileCommand, *PrintFile, *LibraryShell, *LibrarySearchPaths, *SaveCommand, *FontFile, /* name of default font file */ - *DefaultPcbFile, *Groups, /* string with layergroups */ - *Routes, /* string with route styles */ - *FilePath, *RatPath, *RatCommand, *FontPath, *PinoutFont, *ElementPath, *Size, /* geometry string for size */ - *BackgroundImage, /* PPM file for board background */ - *ScriptFilename, /* PCB Actions script to execute on startup */ - *ActionString, /* PCB Actions string to execute on startup */ - *FabAuthor, /* Full name of author for FAB drawings */ - *GnetlistProgram, /* gnetlist program name */ - *MakeProgram, /* make program name */ - *InitialLayerStack; /* If set, the initial layer stack is set to this */ - Coord PinoutOffsetX, /* offset of origin */ - PinoutOffsetY; - Coord PinoutTextOffsetX, /* offset of text from pin center */ - PinoutTextOffsetY; - RouteStyleType RouteStyle[NUM_STYLES]; /* default routing styles */ - LayerGroupType LayerGroups; /* default layer groups */ - bool ClearLine, FullPoly, UniqueNames, /* force unique names */ - SnapPin, /* snap to pins and pads */ - SnapOffGridLine, /*!< Snap to certain off-grid points along a line. */ - HighlightOnPoint, /*!< Highlight if crosshair is on endpoints. */ - ShowSolderSide, /* mirror output */ - SaveLastCommand, /* save the last command entered by user */ - SaveInTMP, /* always save data in /tmp */ - DrawGrid, /* draw grid points */ - RatWarn, /* rats nest has set warnings */ - StipplePolygons, /* draw polygons with stipple */ - AllDirectionLines, /* enable lines to all directions */ - RubberBandMode, /* move, rotate use rubberband connections */ - SwapStartDirection, /* change starting direction after each click */ - ShowDRC, /* show drc region on crosshair */ - AutoDRC, /* */ - ShowNumber, /* pinout shows number */ - OrthogonalMoves, /* */ - ResetAfterElement, /* reset connections after each element */ - liveRouting, /* autorouter shows tracks in progress */ - RingBellWhenFinished, /* flag if a signal should be */ - /* produced when searching of */ - /* connections is done */ - AutoPlace, /* flag which says we should force placement of the - windows on startup */ - EnableMincut, /* Enable calculating mincut on shorts (rats_mincut.c) when non-zero */ - EnableStroke; /* Enable libstroke gesutres on middle mouse button when non-zero */ -} SettingType, *SettingTypePtr; - /* ---------------------------------------------------------------------- * pointer to low-level copy, move and rotate functions */ Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 1699) +++ trunk/src/global_typedefs.h (revision 1700) @@ -44,7 +44,7 @@ /*typedef unsigned int Pixel;*/ typedef char *String; typedef short Position; -typedef short Dimension; +typedef short dimension_t; #endif typedef unsigned char BYTE; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 1699) +++ trunk/src/gui_act.c (revision 1700) @@ -25,6 +25,7 @@ * */ #include "config.h" +#include "conf_core.h" #include "global.h" #include "data.h" #include "action_helper.h" @@ -348,7 +349,7 @@ case F_ToggleStroke: TOGGLE_FLAG(ENABLESTROKEFLAG, PCB); - Settings.EnableStroke = TEST_FLAG(ENABLESTROKEFLAG, PCB); + conf_core.editor.enable_stroke = TEST_FLAG(ENABLESTROKEFLAG, PCB); break; case F_ToggleShowDRC: @@ -362,7 +363,7 @@ case F_ToggleAutoDRC: notify_crosshair_change(false); TOGGLE_FLAG(AUTODRCFLAG, PCB); - if (TEST_FLAG(AUTODRCFLAG, PCB) && Settings.Mode == LINE_MODE) { + if (TEST_FLAG(AUTODRCFLAG, PCB) && conf_core.editor.mode == LINE_MODE) { if (ResetConnections(true)) { IncrementUndoSerialNumber(); Draw(); @@ -414,7 +415,7 @@ /* toggle displaying of the grid */ case F_Grid: - Settings.DrawGrid = !Settings.DrawGrid; + conf_core.editor.draw_grid = !conf_core.editor.draw_grid; Redraw(); break; @@ -516,7 +517,7 @@ if (argc > 2) { PCB->GridOffsetX = GetValue(argv[1], NULL, NULL); PCB->GridOffsetY = GetValue(argv[2], NULL, NULL); - if (Settings.DrawGrid) + if (conf_core.editor.draw_grid) Redraw(); } break; @@ -628,7 +629,7 @@ break; case F_Cancel: { - int saved_mode = Settings.Mode; + int saved_mode = conf_core.editor.mode; SetMode(NO_MODE); SetMode(saved_mode); } @@ -635,7 +636,7 @@ break; case F_Escape: { - switch (Settings.Mode) { + switch (conf_core.editor.mode) { case VIA_MODE: case PASTEBUFFER_MODE: case TEXT_MODE: @@ -718,7 +719,7 @@ SetMode(POLYGONHOLE_MODE); break; case F_Release: - if ((mid_stroke) && (Settings.EnableStroke)) + if ((mid_stroke) && (conf_core.editor.enable_stroke)) stub_stroke_finish(); else ReleaseMode(); @@ -733,7 +734,7 @@ SetMode(ROTATE_MODE); break; case F_Stroke: - if (Settings.EnableStroke) { + if (conf_core.editor.enable_stroke) { stub_stroke_start(); break; } @@ -740,14 +741,14 @@ /* Handle middle mouse button restarts of drawing mode. If not in | a drawing mode, middle mouse button will select objects. */ - if (Settings.Mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { + if (conf_core.editor.mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { SetMode(LINE_MODE); } - else if (Settings.Mode == ARC_MODE && Crosshair.AttachedBox.State != STATE_FIRST) + else if (conf_core.editor.mode == ARC_MODE && Crosshair.AttachedBox.State != STATE_FIRST) SetMode(ARC_MODE); - else if (Settings.Mode == RECTANGLE_MODE && Crosshair.AttachedBox.State != STATE_FIRST) + else if (conf_core.editor.mode == RECTANGLE_MODE && Crosshair.AttachedBox.State != STATE_FIRST) SetMode(RECTANGLE_MODE); - else if (Settings.Mode == POLYGON_MODE && Crosshair.AttachedLine.State != STATE_FIRST) + else if (conf_core.editor.mode == POLYGON_MODE && Crosshair.AttachedLine.State != STATE_FIRST) SetMode(POLYGON_MODE); else { SaveMode(); @@ -1067,10 +1068,10 @@ switch (type) { case LINE_TYPE: notify_crosshair_change(false); - Settings.LineThickness = ((LineTypePtr) ptr2)->Thickness; - Settings.Keepaway = ((LineTypePtr) ptr2)->Clearance / 2; + conf_core.design.line_thickness = ((LineTypePtr) ptr2)->Thickness; + conf_core.design.keepaway = ((LineTypePtr) ptr2)->Clearance / 2; layer = (LayerTypePtr) ptr1; - if (Settings.Mode != LINE_MODE) + if (conf_core.editor.mode != LINE_MODE) SetMode(LINE_MODE); notify_crosshair_change(true); hid_action("RouteStylesChanged"); @@ -1078,10 +1079,10 @@ case ARC_TYPE: notify_crosshair_change(false); - Settings.LineThickness = ((ArcTypePtr) ptr2)->Thickness; - Settings.Keepaway = ((ArcTypePtr) ptr2)->Clearance / 2; + conf_core.design.line_thickness = ((ArcTypePtr) ptr2)->Thickness; + conf_core.design.keepaway = ((ArcTypePtr) ptr2)->Clearance / 2; layer = (LayerTypePtr) ptr1; - if (Settings.Mode != ARC_MODE) + if (conf_core.editor.mode != ARC_MODE) SetMode(ARC_MODE); notify_crosshair_change(true); hid_action("RouteStylesChanged"); @@ -1093,10 +1094,10 @@ case VIA_TYPE: notify_crosshair_change(false); - Settings.ViaThickness = ((PinTypePtr) ptr2)->Thickness; - Settings.ViaDrillingHole = ((PinTypePtr) ptr2)->DrillingHole; - Settings.Keepaway = ((PinTypePtr) ptr2)->Clearance / 2; - if (Settings.Mode != VIA_MODE) + conf_core.design.via_thickness = ((PinTypePtr) ptr2)->Thickness; + conf_core.design.via_drilling_hole = ((PinTypePtr) ptr2)->DrillingHole; + conf_core.design.keepaway = ((PinTypePtr) ptr2)->Clearance / 2; + if (conf_core.editor.mode != VIA_MODE) SetMode(VIA_MODE); notify_crosshair_change(true); hid_action("RouteStylesChanged"); Index: trunk/src/hid_actions.c =================================================================== --- trunk/src/hid_actions.c (revision 1699) +++ trunk/src/hid_actions.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -245,7 +246,7 @@ if (a->need_coord_msg) gui->get_coords(_(a->need_coord_msg), &x, &y); - if (Settings.verbose) { + if (conf_core.rc.verbose) { printf("Action: \033[34m%s(", name); for (i = 0; i < argc; i++) printf("%s%s", i ? "," : "", argv[i]); Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 1699) +++ trunk/src/insert.c (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" @@ -93,7 +94,7 @@ LineTypePtr newone; newone = CreateDrawnLineOnLayer(CURRENT, Rat->Point1.X, Rat->Point1.Y, - InsertX, InsertY, Settings.LineThickness, 2 * Settings.Keepaway, Rat->Flags); + InsertX, InsertY, conf_core.design.line_thickness, 2 * conf_core.design.keepaway, Rat->Flags); if (!newone) return newone; AddObjectToCreateUndoList(LINE_TYPE, CURRENT, newone, newone); @@ -100,7 +101,7 @@ EraseRat(Rat); DrawLine(CURRENT, newone); newone = CreateDrawnLineOnLayer(CURRENT, Rat->Point2.X, Rat->Point2.Y, - InsertX, InsertY, Settings.LineThickness, 2 * Settings.Keepaway, Rat->Flags); + InsertX, InsertY, conf_core.design.line_thickness, 2 * conf_core.design.keepaway, Rat->Flags); if (newone) { AddObjectToCreateUndoList(LINE_TYPE, CURRENT, newone, newone); DrawLine(CURRENT, newone); Index: trunk/src/line.c =================================================================== --- trunk/src/line.c (revision 1699) +++ trunk/src/line.c (revision 1700) @@ -28,6 +28,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -58,7 +59,7 @@ if (line->State == STATE_FIRST) return; /* don't draw outline when ctrl key is pressed */ - if (Settings.Mode == LINE_MODE && gui->control_is_pressed()) { + if (conf_core.editor.mode == LINE_MODE && gui->control_is_pressed()) { line->draw = false; return; } @@ -272,7 +273,7 @@ s = 0.5; last = -1; line1.Flags = line2.Flags = NoFlags(); - line1.Thickness = Settings.LineThickness + 2 * (PCB->Bloat + 1); + line1.Thickness = conf_core.design.line_thickness + 2 * (PCB->Bloat + 1); line2.Thickness = line1.Thickness; line1.Clearance = line2.Clearance = 0; line1.Point1.X = Crosshair.AttachedLine.Point1.X; Index: trunk/src/macro.h =================================================================== --- trunk/src/macro.h (revision 1699) +++ trunk/src/macro.h (revision 1700) @@ -37,7 +37,7 @@ * draw.c uses a different definition of TO_SCREEN */ #ifndef SWAP_IDENT -#define SWAP_IDENT Settings.ShowSolderSide +#define SWAP_IDENT conf_core.editor.show_solder_side #endif #define SWAP_SIGN_X(x) (x) @@ -76,15 +76,15 @@ #define LAYER_ON_STACK(n) (&PCB->Data->Layer[LayerStack[(n)]]) #define LAYER_PTR(n) (&PCB->Data->Layer[(n)]) #define CURRENT (PCB->SilkActive ? &PCB->Data->Layer[ \ - (Settings.ShowSolderSide ? solder_silk_layer : component_silk_layer)] \ + (conf_core.editor.show_solder_side ? solder_silk_layer : component_silk_layer)] \ : LAYER_ON_STACK(0)) #define INDEXOFCURRENT (PCB->SilkActive ? \ - (Settings.ShowSolderSide ? solder_silk_layer : component_silk_layer) \ + (conf_core.editor.show_solder_side ? solder_silk_layer : component_silk_layer) \ : LayerStack[0]) #define SILKLAYER Layer[ \ - (Settings.ShowSolderSide ? solder_silk_layer : component_silk_layer)] + (conf_core.editor.show_solder_side ? solder_silk_layer : component_silk_layer)] #define BACKSILKLAYER Layer[ \ - (Settings.ShowSolderSide ? component_silk_layer : solder_silk_layer)] + (conf_core.editor.show_solder_side ? component_silk_layer : solder_silk_layer)] #define TEST_SILK_LAYER(layer) (GetLayerNumber (PCB->Data, layer) >= max_copper_layer) @@ -97,7 +97,7 @@ /* --------------------------------------------------------------------------- * access macro for current buffer */ -#define PASTEBUFFER (&Buffers[Settings.BufferNumber]) +#define PASTEBUFFER (&Buffers[conf_core.editor.buffer_number]) /* --------------------------------------------------------------------------- * some routines for flag setting, clearing, changing and testing Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 1699) +++ trunk/src/main.c (revision 1700) @@ -30,6 +30,7 @@ /* main program, initializes some stuff and handles user input */ #include "config.h" +#include "conf_core.h" #include #ifdef HAVE_STRING_H @@ -86,13 +87,14 @@ extern void stroke_init(void); #endif +#warning TODO: to conf static const char *fontfile_paths_in[] = { "./default_font", PCBSHAREDIR "/default_font", NULL }; - char **fontfile_paths = NULL; /* Try gui libs in this order when not explicitly specified by the user if there are multiple GUIs available this sets the order of preference */ +#warning TODO: to conf static const char *try_gui_hids[] = { "gtk", "lesstif", NULL }; /* ---------------------------------------------------------------------- @@ -160,97 +162,6 @@ static UsageNotes *usage_notes = NULL; -static void usage_attr(HID_Attribute * a) -{ - int i, n; - const Unit *unit_list; - static char buf[200]; - - if (a->help_text == ATTR_UNDOCUMENTED) - return; - - switch (a->type) { - case HID_Label: - return; - case HID_Integer: - case HID_Real: - sprintf(buf, "--%s ", a->name); - break; - case HID_Coord: - sprintf(buf, "--%s ", a->name); - break; - case HID_String: - sprintf(buf, "--%s ", a->name); - break; - case HID_Boolean: - sprintf(buf, "--%s", a->name); - break; - case HID_Mixed: - case HID_Enum: - sprintf(buf, "--%s ", a->name); - if (a->type == HID_Mixed) - strcat(buf, " "); - for (i = 0; a->enumerations[i]; i++) { - strcat(buf, i ? "|" : "<"); - strcat(buf, a->enumerations[i]); - } - strcat(buf, ">"); - break; - case HID_Path: - sprintf(buf, "--%s ", a->name); - break; - case HID_Unit: - unit_list = get_unit_list(); - n = get_n_units(); - sprintf(buf, "--%s ", a->name); - for (i = 0; i < n; i++) { - strcat(buf, i ? "|" : "<"); - strcat(buf, unit_list[i].suffix); - } - strcat(buf, ">"); - break; - } - - if (strlen(buf) <= 30) { - if (a->help_text) - fprintf(stderr, " %-30s\t%s\n", buf, a->help_text); - else - fprintf(stderr, " %-30s\n", buf); - } - else if (a->help_text && strlen(a->help_text) + strlen(buf) < 72) - fprintf(stderr, " %s\t%s\n", buf, a->help_text); - else if (a->help_text) - fprintf(stderr, " %s\n\t\t\t%s\n", buf, a->help_text); - else - fprintf(stderr, " %s\n", buf); -} - -static void usage_hid(HID * h) -{ - HID_Attribute *attributes; - int i, n_attributes = 0; - UsageNotes *note; - - if (h->gui) { - fprintf(stderr, "\n%s gui options:\n", h->name); - attributes = h->get_export_options(&n_attributes); - } - else { - fprintf(stderr, "\n%s options:\n", h->name); - exporter = h; - attributes = exporter->get_export_options(&n_attributes); - exporter = NULL; - } - - note = (UsageNotes *) malloc(sizeof(UsageNotes)); - note->next = usage_notes; - note->seen = attributes; - usage_notes = note; - - for (i = 0; i < n_attributes; i++) - usage_attr(attributes + i); -} - static void usage(void) { HID **hl = hid_enumerate(); @@ -286,6 +197,8 @@ if (hl[i]->exporter) fprintf(stderr, "\t%-8s %s\n", hl[i]->name, hl[i]->description); +#warning TODO: do this on a per plugin basis +#if 0 for (i = 0; hl[i]; i++) if (hl[i]->gui) usage_hid(hl[i]); @@ -295,8 +208,11 @@ for (i = 0; hl[i]; i++) if (hl[i]->exporter) usage_hid(hl[i]); +#endif u("\nCommon options:"); +#warning TODO: do this from conf_ +#if 0 for (ha = hid_attr_nodes; ha; ha = ha->next) { for (note = usage_notes; note && note->seen != ha->attributes; note = note->next); if (note) @@ -305,1081 +221,12 @@ usage_attr(ha->attributes + i); } } +#endif exit(1); } -static void print_defaults_1(HID_Attribute * a, void *value) -{ - int i; - Coord c; - double d; - const char *s; - - /* Remember, at this point we've parsed the command line, so they - may be in the global variable instead of the default_val. */ - switch (a->type) { - case HID_Integer: - i = value ? *(int *) value : a->default_val.int_value; - fprintf(stderr, "%s %d\n", a->name, i); - break; - case HID_Boolean: - i = value ? *(char *) value : a->default_val.int_value; - fprintf(stderr, "%s %s\n", a->name, i ? "yes" : "no"); - break; - case HID_Real: - d = value ? *(double *) value : a->default_val.real_value; - fprintf(stderr, "%s %g\n", a->name, d); - break; - case HID_Coord: - c = value ? *(Coord *) value : a->default_val.coord_value; - pcb_fprintf(stderr, "%s %$mS\n", a->name, c); - break; - case HID_String: - case HID_Path: - s = value ? *(char **) value : a->default_val.str_value; - fprintf(stderr, "%s \"%s\"\n", a->name, s); - break; - case HID_Enum: - i = value ? *(int *) value : a->default_val.int_value; - fprintf(stderr, "%s %s\n", a->name, a->enumerations[i]); - break; - case HID_Mixed: - i = value ? ((HID_Attr_Val *) value)->int_value : a->default_val.int_value; - d = value ? ((HID_Attr_Val *) value)->real_value : a->default_val.real_value; - fprintf(stderr, "%s %g%s\n", a->name, d, a->enumerations[i]); - break; - case HID_Label: - break; - case HID_Unit: - i = value ? *(int *) value : a->default_val.int_value; - fprintf(stderr, "%s %s\n", a->name, get_unit_list()[i].suffix); - } -} - -static void print_defaults() -{ - HID **hl = hid_enumerate(); - HID_Attribute *e; - int i, n, hi; - - for (hi = 0; hl[hi]; hi++) { - HID *h = hl[hi]; - if (h->gui) { - HID_AttrNode *ha; - fprintf(stderr, "\ngui defaults:\n"); - for (ha = hid_attr_nodes; ha; ha = ha->next) - for (i = 0; i < ha->n; i++) - print_defaults_1(ha->attributes + i, ha->attributes[i].value); - } - else { - fprintf(stderr, "\n%s defaults:\n", h->name); - exporter = h; - e = exporter->get_export_options(&n); - exporter = NULL; - if (e) - for (i = 0; i < n; i++) - print_defaults_1(e + i, 0); - } - } - exit(1); -} - -#define SSET(F,D,N,H) { N, H, \ - HID_String, 0, 0, { 0, D, 0 }, 0, &Settings.F } -#define ISET(F,D,N,H) { N, H, \ - HID_Integer, 0, 0, { D, 0, 0 }, 0, &Settings.F } -#define BSET(F,D,N,H) { N, H, \ - HID_Boolean, 0, 0, { D, 0, 0 }, 0, &Settings.F } -#define RSET(F,D,N,H) { N, H, \ - HID_Real, 0, 0, { 0, 0, D }, 0, &Settings.F } -#define CSET(F,D,N,H) { N, H, \ - HID_Coord, 0, 0, { 0, 0, 0, D }, 0, &Settings.F } - -#define COLOR(F,D,N,H) { N, H, \ - HID_String, 0, 0, { 0, D, 0 }, 0, &Settings.F } -#define LAYERCOLOR(N,D) { "layer-color-" #N, "Color for layer " #N, \ - HID_String, 0, 0, { 0, D, 0 }, 0, &Settings.LayerColor[N-1] } -#define LAYERNAME(N,D) { "layer-name-" #N, "Name for layer " #N, \ - HID_String, 0, 0, { 0, D, 0 }, 0, &Settings.DefaultLayerName[N-1] } -#define LAYERSELCOLOR(N) { "layer-selected-color-" #N, "Color for layer " #N " when selected", \ - HID_String, 0, 0, { 0, "#00ffff", 0 }, 0, &Settings.LayerSelectedColor[N-1] } - -static int show_help = 0; -static int show_version = 0; -static int show_copyright = 0; -static int show_defaults = 0; -static int show_actions = 0; -static int do_dump_actions = 0; -static char *grid_units; - -HID_Attribute main_attribute_list[] = { - -/* %start-doc options "1 General Options" -@ftable @code -@item --help -Show help on command line options. -@end ftable -%end-doc -*/ - {"help", "Show help on command line options", HID_Boolean, 0, 0, {0, 0, 0}, 0, - &show_help}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --version -Show version. -@end ftable -%end-doc -*/ - {"version", "Show version", HID_Boolean, 0, 0, {0, 0, 0}, 0, &show_version}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --verbose -Be verbose on stdout. -@end ftable -%end-doc -*/ - {"verbose", "Be verbose on stdout", HID_Boolean, 0, 0, {0, 0, 0}, 0, - &Settings.verbose}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --copyright -Show copyright. -@end ftable -%end-doc -*/ - {"copyright", "Show Copyright", HID_Boolean, 0, 0, {0, 0, 0}, 0, - &show_copyright}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --show-defaults -Show option defaults. -@end ftable -%end-doc -*/ - {"show-defaults", "Show option defaults", HID_Boolean, 0, 0, {0, 0, 0}, 0, - &show_defaults}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --show-actions -Show available actions and exit. -@end ftable -%end-doc -*/ - {"show-actions", "Show available actions", HID_Boolean, 0, 0, {0, 0, 0}, 0, - &show_actions}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --dump-actions -Dump actions (for documentation). -@end ftable -%end-doc -*/ - {"dump-actions", "Dump actions (for documentation)", HID_Boolean, 0, 0, - {0, 0, 0}, 0, &do_dump_actions}, - -/* %start-doc options "1 General Options" -@ftable @code -@item --grid-units-mm -Set default grid units. Can be mm or mil. Defaults to mil. -@end ftable -%end-doc -*/ - {"grid-units", "Default grid units (mm|mil)", HID_String, 0, 0, {0, "mil", 0}, - 0, &grid_units}, - -/* %start-doc options "3 Colors" -@ftable @code -@item --black-color -Color value for black. Default: @samp{#000000} -@end ftable -%end-doc -*/ - COLOR(BlackColor, "#000000", "black-color", "color value of 'black'"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --black-color -Color value for white. Default: @samp{#ffffff} -@end ftable -%end-doc -*/ - COLOR(WhiteColor, "#ffffff", "white-color", "color value of 'white'"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --background-color -Background color of the canvas. Default: @samp{#e5e5e5} -@end ftable -%end-doc -*/ - COLOR(BackgroundColor, "#e5e5e5", "background-color", - "color for background"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --crosshair-color -Color of the crosshair. Default: @samp{#ff0000} -@end ftable -%end-doc -*/ - COLOR(CrosshairColor, "#ff0000", "crosshair-color", - "color for the crosshair"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --cross-color -Color of the cross. Default: @samp{#cdcd00} -@end ftable -%end-doc -*/ - COLOR(CrossColor, "#cdcd00", "cross-color", "color of the cross"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --via-color -Color of vias. Default: @samp{#7f7f7f} -@end ftable -%end-doc -*/ - COLOR(ViaColor, "#7f7f7f", "via-color", "color of vias"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --via-selected-color -Color of selected vias. Default: @samp{#00ffff} -@end ftable -%end-doc -*/ - COLOR(ViaSelectedColor, "#00ffff", "via-selected-color", - "color for selected vias"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --pin-color -Color of pins. Default: @samp{#4d4d4d} -@end ftable -%end-doc -*/ - COLOR(PinColor, "#4d4d4d", "pin-color", "color of pins"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --pin-selected-color -Color of selected pins. Default: @samp{#00ffff} -@end ftable -%end-doc -*/ - COLOR(PinSelectedColor, "#00ffff", "pin-selected-color", - "color of selected pins"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --pin-name-color -Color of pin names and pin numbers. Default: @samp{#ff0000} -@end ftable -%end-doc -*/ - COLOR(PinNameColor, "#ff0000", "pin-name-color", - "color for pin names and pin numbers"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --element-color -Color of components. Default: @samp{#000000} -@end ftable -%end-doc -*/ - COLOR(ElementColor, "#000000", "element-color", "color of components"), - - -/* %start-doc options "3 Colors" -@ftable @code -@item --element-color-nonetlist -Color of components. Default: @samp{#777777} -@end ftable -%end-doc -*/ - COLOR(ElementColor_nonetlist, "#777777", "element-color-nonetlist", "color of components not part of the netlist"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --rat-color -Color of ratlines. Default: @samp{#b8860b} -@end ftable -%end-doc -*/ - COLOR(RatColor, "#b8860b", "rat-color", "color of ratlines"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --invisible-objects-color -Color of invisible objects. Default: @samp{#cccccc} -@end ftable -%end-doc -*/ - COLOR(InvisibleObjectsColor, "#cccccc", "invisible-objects-color", - "color of invisible objects"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --invisible-mark-color -Color of invisible marks. Default: @samp{#cccccc} -@end ftable -%end-doc -*/ - COLOR(InvisibleMarkColor, "#cccccc", "invisible-mark-color", - "color of invisible marks"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --element-selected-color -Color of selected components. Default: @samp{#00ffff} -@end ftable -%end-doc -*/ - COLOR(ElementSelectedColor, "#00ffff", "element-selected-color", - "color of selected components"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --rat-selected-color -Color of selected rats. Default: @samp{#00ffff} -@end ftable -%end-doc -*/ - COLOR(RatSelectedColor, "#00ffff", "rat-selected-color", - "color of selected rats"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --connected-color -Color to indicate connections. Default: @samp{#00ff00} -@end ftable -%end-doc -*/ - COLOR(ConnectedColor, "#00ff00", "connected-color", - "color to indicate connections"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --off-limit-color -Color of off-canvas area. Default: @samp{#cccccc} -@end ftable -%end-doc -*/ - COLOR(OffLimitColor, "#cccccc", "off-limit-color", - "color of off-canvas area"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --grid-color -Color of the grid. Default: @samp{#ff0000} -@end ftable -%end-doc -*/ - COLOR(GridColor, "#ff0000", "grid-color", "color of the grid"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --layer-color- -Color of layer @code{}, where @code{} is an integer from 1 to 16. -@end ftable -%end-doc -*/ - LAYERCOLOR(1, "#8b2323"), - LAYERCOLOR(2, "#3a5fcd"), - LAYERCOLOR(3, "#104e8b"), - LAYERCOLOR(4, "#cd3700"), - LAYERCOLOR(5, "#548b54"), - LAYERCOLOR(6, "#8b7355"), - LAYERCOLOR(7, "#00868b"), - LAYERCOLOR(8, "#228b22"), - LAYERCOLOR(9, "#8b2323"), - LAYERCOLOR(10, "#3a5fcd"), - LAYERCOLOR(11, "#104e8b"), - LAYERCOLOR(12, "#cd3700"), - LAYERCOLOR(13, "#548b54"), - LAYERCOLOR(14, "#8b7355"), - LAYERCOLOR(15, "#00868b"), - LAYERCOLOR(16, "#228b22"), -/* %start-doc options "3 Colors" -@ftable @code -@item --layer-selected-color- -Color of layer @code{}, when selected. @code{} is an integer from 1 to 16. -@end ftable -%end-doc -*/ - LAYERSELCOLOR(1), - LAYERSELCOLOR(2), - LAYERSELCOLOR(3), - LAYERSELCOLOR(4), - LAYERSELCOLOR(5), - LAYERSELCOLOR(6), - LAYERSELCOLOR(7), - LAYERSELCOLOR(8), - LAYERSELCOLOR(9), - LAYERSELCOLOR(10), - LAYERSELCOLOR(11), - LAYERSELCOLOR(12), - LAYERSELCOLOR(13), - LAYERSELCOLOR(14), - LAYERSELCOLOR(15), - LAYERSELCOLOR(16), - -/* %start-doc options "3 Colors" -@ftable @code -@item --warn-color -Color of offending objects during DRC. Default value is @code{"#ff8000"} -@end ftable -%end-doc -*/ - COLOR(WarnColor, "#ff8000", "warn-color", "color of offending objects during DRC"), - -/* %start-doc options "3 Colors" -@ftable @code -@item --mask-color -Color of the mask layer. Default value is @code{"#ff0000"} -@end ftable -%end-doc -*/ - COLOR(MaskColor, "#ff0000", "mask-color", "color for solder mask"), - - -/* %start-doc options "5 Sizes" -All parameters should be given with an unit. If no unit is given, 1/100 mil -(cmil) will be used. Write units without space to the -number like @code{3mm}, not @code{3 mm}. -Valid Units are: - @table @samp - @item km - Kilometer - @item m - Meter - @item cm - Centimeter - @item mm - Millimeter - @item um - Micrometer - @item nm - Nanometer - @item in - Inch (1in = 0.0254m) - @item mil - Mil (1000mil = 1in) - @item cmil - Centimil (1/100 mil) -@end table - -@ftable @code -@item --via-thickness -Default diameter of vias. Default value is @code{60mil}. -@end ftable -%end-doc -*/ - CSET(ViaThickness, MIL_TO_COORD(60), "via-thickness", - "default diameter of vias in 1/100 mil"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --via-drilling-hole -Default diameter of holes. Default value is @code{28mil}. -@end ftable -%end-doc -*/ - CSET(ViaDrillingHole, MIL_TO_COORD(28), "via-drilling-hole", - "default diameter of holes"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --line-thickness -Default thickness of new lines. Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(LineThickness, MIL_TO_COORD(10), "line-thickness", - "initial thickness of new lines"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --rat-thickness -Thickness of rats. Values from 1 to 19 are fixed width in screen pixels. -Anything larger means PCB units (i.e. 100 means "1 mil"). Default value -is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(RatThickness, MIL_TO_COORD(10), "rat-thickness", "thickness of rat lines"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --keepaway -Default minimum distance between a track and adjacent copper. -Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(Keepaway, MIL_TO_COORD(10), "keepaway", "minimum distance between adjacent copper"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --default-PCB-width -Default width of the canvas. Default value is @code{6000mil}. -@end ftable -%end-doc -*/ - CSET(MaxWidth, MIL_TO_COORD(6000), "default-PCB-width", - "default width of the canvas"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --default-PCB-height -Default height of the canvas. Default value is @code{5000mil}. -@end ftable -%end-doc -*/ - CSET(MaxHeight, MIL_TO_COORD(5000), "default-PCB-height", - "default height of the canvas"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --text-scale -Default text scale. This value is in percent. Default value is @code{100}. -@end ftable -%end-doc -*/ - ISET(TextScale, 100, "text-scale", "default text scale in percent"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --alignment-distance -Specifies the distance between the board outline and alignment targets. -Default value is @code{2mil}. -@end ftable -%end-doc -*/ - CSET(AlignmentDistance, MIL_TO_COORD(2), "alignment-distance", - "distance between the boards outline and alignment targets"), - -/* %start-doc options "7 DRC Options" -All parameters should be given with an unit. If no unit is given, 1/100 mil -(cmil) will be used for backward compability. Valid units are given in section -@ref{Sizes}. -%end-doc -*/ - - -/* %start-doc options "7 DRC Options" -@ftable @code -@item --bloat -Minimum spacing. Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(Bloat, MIL_TO_COORD(10), "bloat", "DRC minimum spacing in 1/100 mil"), - -/* %start-doc options "7 DRC Options" -@ftable @code -@item --shrink -Minimum touching overlap. Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(Shrink, MIL_TO_COORD(10), "shrink", "DRC minimum overlap in 1/100 mils"), - -/* %start-doc options "7 DRC Options" -@ftable @code -@item --min-width -Minimum width of copper. Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(minWid, MIL_TO_COORD(10), "min-width", "DRC minimum copper spacing"), - -/* %start-doc options "7 DRC Options" -@ftable @code -@item --min-silk -Minimum width of lines in silk. Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(minSlk, MIL_TO_COORD(10), "min-silk", "DRC minimum silk width"), - -/* %start-doc options "7 DRC Options" -@ftable @code -@item --min-drill -Minimum diameter of holes. Default value is @code{15mil}. -@end ftable -%end-doc -*/ - CSET(minDrill, MIL_TO_COORD(15), "min-drill", "DRC minimum drill diameter"), - -/* %start-doc options "7 DRC Options" -@ftable @code -@item --min-ring -Minimum width of annular ring. Default value is @code{10mil}. -@end ftable -%end-doc -*/ - CSET(minRing, MIL_TO_COORD(10), "min-ring", "DRC minimum annular ring"), - - -/* %start-doc options "5 Sizes" -@ftable @code -@item --grid -Initial grid size. Default value is @code{25mil}. -@end ftable -%end-doc -*/ - CSET(Grid, MIL_TO_COORD(25), "grid", "Initial grid size in 1/100 mil"), - -/* %start-doc options "5 Sizes" -@ftable @code -@item --minimum polygon area -Minimum polygon area. -@end ftable -%end-doc -*/ - RSET(IsleArea, MIL_TO_COORD(100) * MIL_TO_COORD(100), "minimum polygon area", 0), - - -/* %start-doc options "1 General Options" -@ftable @code -@item --backup-interval -Time between automatic backups in seconds. Set to @code{0} to disable. -The default value is @code{60}. -@end ftable -%end-doc -*/ - ISET(BackupInterval, 60, "backup-interval", - "Time between automatic backups in seconds. Set to 0 to disable"), - -/* %start-doc options "6 Commands" -pcb uses external commands for input output operations. These commands can be -configured at start-up to meet local requirements. The command string may include -special sequences @code{%f}, @code{%p} or @code{%a}. These are replaced when the -command is called. The sequence @code{%f} is replaced by the file name, -@code{%p} gets the path and @code{%a} indicates a package name. -%end-doc -*/ - -/* %start-doc options "6 Commands" -@ftable @code -@item --font-command -Command to load a font. -@end ftable -%end-doc -*/ - SSET(FontCommand, "", "font-command", "Command to load a font"), - -/* %start-doc options "6 Commands" -@ftable @code -@item --file-command -Command to read a file. -@end ftable -%end-doc -*/ - SSET(FileCommand, "", "file-command", "Command to read a file"), - -/* %start-doc options "6 Commands" -@ftable @code -@item --print-file -Command to print to a file. -@end ftable -%end-doc -*/ - SSET(PrintFile, "%f.output", "print-file", "Command to print to a file"), - -/* %start-doc options "5 Paths" -@ftable @code -@item --lib-search-paths -A list of (footprint) library search paths, separated by colons. -@end ftable -%end-doc -*/ - SSET(LibrarySearchPaths, PCB_LIBRARY_SEARCH_PATHS, "lib-search-paths", - "A list of paths to be searched for footprints."), - -/* %start-doc options "6 Commands" -@ftable @code -@item --lib-shell -A shell command that should be used as a prefix before executing -parametric library commands. On UNIX it is safe to leave this empty, -on windows a POSIX shell should be specified with -c (e.g. "bash.exe -c"). -@end ftable -%end-doc -*/ - SSET(LibraryShell, PCB_LIBRARY_SHELL, "lib-shell", - "Optional shell command to be used for running parametric footprint generators"), - -/* %start-doc options "6 Commands" -@ftable @code -@item --save-command -Command to save to a file. -@end ftable -%end-doc -*/ - SSET(SaveCommand, "", "save-command", "Command to save to a file"), - -/* %start-doc options "5 Paths" -@ftable @code -@item --default-font -The name of the default font. -@end ftable -%end-doc -*/ - SSET(FontFile, NULL, "default-font", - "File name of default font"), - -/* %start-doc options "5 Paths" -@ftable @code -@item --default-pcb -The name of the default font. -@end ftable -%end-doc -*/ - SSET(DefaultPcbFile, PCB_DEFAULT_PCB_FILE, "default-pcb", - "File name of default pcb file (layer and style settings)"), - -/* %start-doc options "5 Paths" -@ftable @code -@item --file-path -A colon separated list of directories or commands (starts with '|'). The path -is passed to the program specified in @option{--file-command} together with the selected -filename. -@end ftable -%end-doc -*/ - SSET(FilePath, "", "file-path", 0), - -/* %start-doc options "6 Commands" -@ftable @code -@item --rat-command -Command for reading a netlist. Sequence @code{%f} is replaced by the netlist filename. -@end ftable -%end-doc -*/ - SSET(RatCommand, "", "rat-command", "Command for reading a netlist"), - -/* %start-doc options "5 Paths" -@ftable @code -@item --font-path -A colon separated list of directories to search the default font. Defaults to -the default library path. -@end ftable -%end-doc -*/ - SSET(FontPath, PCBLIBPATH, "font-path", - "Colon separated list of directories to search the default font"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --element-path -A colon separated list of directories or commands (starts with '|'). -The path is passed to the program specified in @option{--element-command}. -@end ftable -%end-doc -*/ - SSET(ElementPath, PCBLIBPATH, "element-path", - "A colon separated list of directories or commands (starts with '|')"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --action-script -If set, this file is executed at startup. -@end ftable -%end-doc -*/ - SSET(ScriptFilename, 0, "action-script", - "If set, this file is executed at startup"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --action-string -If set, this string of actions is executed at startup. -@end ftable -%end-doc -*/ - SSET(ActionString, 0, "action-string", - "If set, this is executed at startup"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --fab-author -Name of author to be put in the Gerber files. -@end ftable -%end-doc -*/ - SSET(FabAuthor, "", "fab-author", - "Name of author to be put in the Gerber files"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --layer-stack -Initial layer stackup, for setting up an export. A comma separated list of layer -names, layer numbers and layer groups. -@end ftable -%end-doc -*/ - SSET(InitialLayerStack, "", "layer-stack", - "Initial layer stackup, for setting up an export."), - - SSET(MakeProgram, NULL, "make-program", - "Sets the name and optionally full path to a make(3) program"), - SSET(GnetlistProgram, NULL, "gnetlist", - "Sets the name and optionally full path to the gnetlist(3) program"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --pinout-offset-x -Horizontal offset of the pin number display. Defaults to @code{100mil}. -@end ftable -%end-doc -*/ - CSET(PinoutOffsetX, MIL_TO_COORD(1), "pinout-offset-x", - "Horizontal offset of the pin number display in mil"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --pinout-offset-y -Vertical offset of the pin number display. Defaults to @code{100mil}. -@end ftable -%end-doc -*/ - CSET(PinoutOffsetY, MIL_TO_COORD(1), "pinout-offset-y", - "Vertical offset of the pin number display in mil"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --pinout-text-offset-x -Horizontal offset of the pin name display. Defaults to @code{800mil}. -@end ftable -%end-doc -*/ - CSET(PinoutTextOffsetX, MIL_TO_COORD(8), "pinout-text-offset-x", - "Horizontal offset of the pin name display in mil"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --pinout-text-offset-y -Vertical offset of the pin name display. Defaults to @code{-100mil}. -@end ftable -%end-doc -*/ - CSET(PinoutTextOffsetY, MIL_TO_COORD(-1), "pinout-text-offset-y", - "Vertical offset of the pin name display in mil"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --draw-grid -If set, draw the grid at start-up. -@end ftable -%end-doc -*/ - BSET(DrawGrid, 1, "draw-grid", "If set, draw the grid at start-up"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --clear-line -If set, new lines clear polygons. -@end ftable -%end-doc -*/ - BSET(ClearLine, 1, "clear-line", "If set, new lines clear polygons"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --full-poly -If set, new polygons are full ones. -@end ftable -%end-doc -*/ - BSET(FullPoly, 0, "full-poly", 0), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --unique-names -If set, you will not be permitted to change the name of an component to match that -of another component. -@end ftable -%end-doc -*/ - BSET(UniqueNames, 1, "unique-names", "Prevents identical component names"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --snap-pin -If set, pin centers and pad end points are treated as additional grid points -that the cursor can snap to. -@end ftable -%end-doc -*/ - BSET(SnapPin, 1, "snap-pin", - "If set, the cursor snaps to pads and pin centers"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --snap-offgrid-line -If set, the cursor snaps at sensible points along a line -@end ftable -%end-doc -*/ - BSET(SnapOffGridLine, 1, "snap-offgrid-line", - "If set, the cursor snaps at sensible points along a line"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --highlight-on-point -If set, highlights lines and arcs when the crosshair is on one of their -two (end) points. -@end ftable -%end-doc -*/ - BSET(HighlightOnPoint, 0, "highlight-on-point", - "If set, highlights lines and arcs when the cursor is on their endpoints"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --save-last-command -If set, the last user command is saved. -@end ftable -%end-doc -*/ - BSET(SaveLastCommand, 0, "save-last-command", 0), - -/* %start-doc options "1 General Options" -@ftable @code -@item --save-in-tmp -If set, all data which would otherwise be lost are saved in a temporary file -@file{/tmp/PCB.%i.save} . Sequence @samp{%i} is replaced by the process ID. -@end ftable -%end-doc -*/ - BSET(SaveInTMP, 0, "save-in-tmp", - "When set, all data which would otherwise be lost are saved in /tmp"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --all-direction-lines -Allow all directions, when drawing new lines. -@end ftable -%end-doc -*/ - BSET(AllDirectionLines, 0, "all-direction-lines", - "Allow all directions, when drawing new lines"), - -/* %start-doc options "2 General GUI Options" -@ftable @code -@item --show-number -Pinout shows number. -@end ftable -%end-doc -*/ - BSET(ShowNumber, 0, "show-number", "Pinout shows number"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --reset-after-element -If set, all found connections are reset before a new component is scanned. -@end ftable -%end-doc -*/ - BSET(ResetAfterElement, 1, "reset-after-element", - "If set, all found connections are reset before a new component is scanned"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --ring-bell-finished -Execute the bell command when all rats are routed. -@end ftable -%end-doc -*/ - BSET(RingBellWhenFinished, 0, "ring-bell-finished", - "Execute the bell command when all rats are routed"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --enable-mincut -Whether to enable mincut (1=yes, 0=no); when disabled, it overrides the setting -read from the pcb. -@end ftable -%end-doc -*/ - ISET(EnableMincut, 1, "enable-mincut", "global enable mincut (1=yes, 0=no)"), - -/* %start-doc options "1 General Options" -@ftable @code -@item --enable-stroke -Whether to enable libstroke support (1=yes, 0=no); when disabled, it overrides the setting -read from the pcb. Will not really work unless the libstroke plugin is also loaded. -@end ftable -%end-doc -*/ - ISET(EnableStroke, 1, "enable-stroke", "global enable libstroke (1=yes, 0=no)"), - -}; - -REGISTER_ATTRIBUTES(main_attribute_list, NULL) /* ---------------------------------------------------------------------- - * post-process settings. - */ - static void settings_post_process() -{ - char *tmps; - - if (Settings.LineThickness > MAX_LINESIZE || Settings.LineThickness < MIN_LINESIZE) - Settings.LineThickness = MIL_TO_COORD(10); - - if (Settings.ViaThickness > MAX_PINORVIASIZE || Settings.ViaThickness < MIN_PINORVIASIZE) - Settings.ViaThickness = MIL_TO_COORD(40); - - if (Settings.ViaDrillingHole <= 0) - Settings.ViaDrillingHole = DEFAULT_DRILLINGHOLE * Settings.ViaThickness / 100; - - Settings.MaxWidth = PCB_CLAMP(Settings.MaxWidth, MIN_SIZE, MAX_COORD); - Settings.MaxHeight = PCB_CLAMP(Settings.MaxHeight, MIN_SIZE, MAX_COORD); - - if (Settings.Routes != NULL) - ParseRouteString(Settings.Routes, &Settings.RouteStyle[0], "cmil"); - - /* - * Make sure we have settings for some various programs we may wish - * to call - */ - if (Settings.MakeProgram == NULL) { - tmps = getenv("PCB_MAKE_PROGRAM"); - if (tmps != NULL) - Settings.MakeProgram = strdup(tmps); - } - if (Settings.MakeProgram == NULL) { - Settings.MakeProgram = strdup("make"); - } - - if (Settings.GnetlistProgram == NULL) { - tmps = getenv("PCB_GNETLIST"); - if (tmps != NULL) - Settings.GnetlistProgram = strdup(tmps); - } - if (Settings.GnetlistProgram == NULL) { - Settings.GnetlistProgram = strdup("gnetlist"); - } - - if (grid_units) - Settings.grid_unit = get_unit_struct(grid_units); - if (!grid_units || Settings.grid_unit == NULL) - Settings.grid_unit = get_unit_struct("mil"); - - Settings.increments = get_increments_struct(Settings.grid_unit->suffix); -} - -/* ---------------------------------------------------------------------- * Print help or version messages. */ @@ -1518,6 +365,8 @@ printf("pcblibdir = %s\n", pcblibdir); #endif +#warning TODO do we still need this or can we get it from the embedded lihata? +#if 0 l = sizeof(main_attribute_list) / sizeof(main_attribute_list[0]); for (i = 0; i < l; i++) { if (NSTRCMP(main_attribute_list[i].name, "lib-command-dir") == 0) { @@ -1529,8 +378,8 @@ || (NSTRCMP(main_attribute_list[i].name, "lib-path") == 0)) { main_attribute_list[i].default_val.str_value = pcblibdir; } - } +#endif paths_init_homedir(); @@ -1537,25 +386,6 @@ resolve_all_paths(fontfile_paths_in, fontfile_paths, 0); } -static void set_fontfile(void) -{ - if (Settings.FontFile == NULL) { - char **s; - for (s = fontfile_paths; *s != NULL; s++) { - fprintf(stderr, "font: '%s'\n", *s); - if (access(*s, R_OK) == 0) { - Settings.FontFile = *s; - break; - } - } - } - - if (Settings.FontFile == NULL) { - Message("Error: no font file found\n"); - exit(1); - } -} - /* ---------------------------------------------------------------------- * main program */ @@ -1586,7 +416,7 @@ events_uninit(); for (i = 0; i < MAX_LAYER; i++) - free(Settings.DefaultLayerName[i]); + free(conf_core.design.default_layer_name[i]); if (fontfile_paths != NULL) { for (s = fontfile_paths; *s != NULL; s++) @@ -1615,8 +445,6 @@ free0(bindir); free0(exec_prefix); free0(program_directory); - free0(Settings.MakeProgram); - free0(Settings.GnetlistProgram); #undef free0 @@ -1624,10 +452,17 @@ yylex_destroy(); } +static int arg_match(const char *in, const char *shrt, const char *lng) +{ + return (strcmp(in, shrt) == 0) || (strcmp(in, lng) == 0); +} + int main(int argc, char *argv[]) { - int i; + int i, n; + char *cmd, *arg, *stmp; +#warning TODO: update this comment /* init application: * - make program name available for error handlers * - evaluate special options @@ -1639,6 +474,28 @@ * - register 'call on exit()' function */ + conf_init(); + conf_core_init(); + + /* process arguments */ + for(n = 1; n < argc; n++) { + cmd = argv[n]; + arg = argv[n+1]; + if (*cmd == '-') { + cmd++; + if (arg_match(cmd, "c", "-conf")) { + if (conf_set_from_cli(arg, &stmp) != 0) { + fprintf(stderr, "Error: failed to set config %s: %s\n", arg, stmp); + exit(1); + } + } + } + } + conf_update(); + +#warning TODO: make this an optional action in a debug plugin + conf_dump(stdout, " ", 1); + setbuf(stdout, 0); InitPaths(argv[0]); @@ -1693,6 +550,9 @@ buildin_init(); plugins_init(); + +#warning TODO: move this in the cli arg proc loop + /* Print usage or version if requested. Then exit. */ if (argc > 1 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "-?") == 0 || strcmp(argv[1], "--help") == 0)) usage(); @@ -1742,18 +602,18 @@ one is registered (there can be only one GUI). */ #include "generated_lists.h" - +#warning TODO: this should be coming from config files /* Set up layers. */ for (i = 0; i < MAX_LAYER; i++) { char buf[20]; sprintf(buf, "signal%d", i + 1); - Settings.DefaultLayerName[i] = strdup(buf); - Settings.LayerColor[i] = "#c49350"; - Settings.LayerSelectedColor[i] = "#00ffff"; + conf_core.design.default_layer_name[i] = strdup(buf); } gui->parse_arguments(&argc, &argv); +#warning make these actions +#if 0 if (show_help || (argc > 1 && argv[1][0] == '-')) usage(); if (show_version) @@ -1762,10 +622,10 @@ print_defaults(); if (show_copyright) copyright(); +#endif - settings_post_process(); - - +#warning TODO: move this to actions +#if 0 if (show_actions) { print_actions(); exit(0); @@ -1776,14 +636,13 @@ dump_actions(); exit(0); } +#endif - set_fontfile(); - /* Create a new PCB object in memory */ PCB = CreateNewPCB(); if (PCB == NULL) { - Message("Can't load the default pcb (%s) for creating an empty layout\n", Settings.DefaultPcbFile); + Message("Can't load the default pcb (%s) for creating an empty layout\n", conf_core.rc.default_pcb_file); exit(1); } @@ -1808,8 +667,8 @@ PCB->Filename = strdup(command_line_pcb); } - if (Settings.InitialLayerStack && Settings.InitialLayerStack[0]) { - LayerStringToLayerStack(Settings.InitialLayerStack); + if (conf_core.design.initial_layer_stack && conf_core.design.initial_layer_stack[0]) { + LayerStringToLayerStack(conf_core.design.initial_layer_stack); } /* read the library file and display it if it's not empty @@ -1817,13 +676,13 @@ if (!fp_read_lib_all() && library.data.dir.children.used) hid_action("LibraryChanged"); - if (Settings.ScriptFilename) { - Message(_("Executing startup script file %s\n"), Settings.ScriptFilename); - hid_actionl("ExecuteFile", Settings.ScriptFilename, NULL); + if (conf_core.rc.script_filename) { + Message(_("Executing startup script file %s\n"), conf_core.rc.script_filename); + hid_actionl("ExecuteFile", conf_core.rc.script_filename, NULL); } - if (Settings.ActionString) { - Message(_("Executing startup action %s\n"), Settings.ActionString); - hid_parse_actions(Settings.ActionString); + if (conf_core.rc.action_string) { + Message(_("Executing startup action %s\n"), conf_core.rc.action_string); + hid_parse_actions(conf_core.rc.action_string); } if (gui->printer || gui->exporter) { @@ -1839,11 +698,12 @@ EnableAutosave(); +#warning TODO: update for new settings; also convert into a debug action #ifdef DEBUG printf("Settings.FontPath = \"%s\"\n", Settings.FontPath); - printf("Settings.ElementPath = \"%s\"\n", Settings.ElementPath); - printf("Settings.LibrarySearchPaths = \"%s\"\n", Settings.LibrarySearchPaths); - printf("Settings.LibraryShell = \"%s\"\n", Settings.LibraryShell); + printf("conf_core.appearance.color.elementPath = \"%s\"\n", conf_core.appearance.color.elementPath); + printf("conf_core.rc.library_search_paths = \"%s\"\n", conf_core.rc.library_search_paths); + printf("conf_core.rc.library_shell = \"%s\"\n", conf_core.rc.library_shell); printf("Settings.MakeProgram = \"%s\"\n", UNKNOWN(Settings.MakeProgram)); printf("Settings.GnetlistProgram = \"%s\"\n", UNKNOWN(Settings.GnetlistProgram)); #endif Index: trunk/src/misc.c =================================================================== --- trunk/src/misc.c (revision 1699) +++ trunk/src/misc.c (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -860,13 +861,12 @@ * comma separated Name, Dimension, Dimension, Dimension, Dimension * e.g. Signal,20,40,20,10:Power,40,60,28,10:... */ -int ParseRouteString(char *s, RouteStyleTypePtr routeStyle, const char *default_unit) +int ParseRoutingString1(char **str, RouteStyleTypePtr routeStyle, const char *default_unit) { - int i, style; + char *s = *str; char Name[256]; + int i; - memset(routeStyle, 0, NUM_STYLES * sizeof(RouteStyleType)); - for (style = 0; style < NUM_STYLES; style++, routeStyle++) { while (*s && isspace((int) *s)) s++; for (i = 0; *s && *s != ','; i++) @@ -908,6 +908,24 @@ while (*s && isspace((int) *s)) s++; } + + *str = s; + return 0; + error:; + *str = s; + return -1; +} + +int ParseRouteString(char *s, RouteStyleTypePtr routeStyle, const char *default_unit) +{ + int style; + + + memset(routeStyle, 0, NUM_STYLES * sizeof(RouteStyleType)); + for (style = 0; style < NUM_STYLES; style++, routeStyle++) { + + ParseRoutingString1(&s, routeStyle, default_unit); + if (style < NUM_STYLES - 1) { while (*s && isspace((int) *s)) s++; @@ -1021,7 +1039,7 @@ * via our atexit() registering of EmergencySave(). We presumeably wanted to * exit here and thus it is not an emergency. */ - if (PCB->Changed && Settings.SaveInTMP) + if (PCB->Changed && conf_core.editor.save_in_tmp) EmergencySave(); else DisableEmergencySave(); @@ -1044,7 +1062,7 @@ gds_t command; char *p; - if (Settings.verbose) { + if (conf_core.rc.verbose) { printf("EvaluateFilename:\n"); printf("\tTemplate: \033[33m%s\033[0m\n", Template); printf("\tPath: \033[33m%s\033[0m\n", Path); @@ -1072,7 +1090,7 @@ gds_append(&command, *p); } - if (Settings.verbose) + if (conf_core.rc.verbose) printf("EvaluateFilename: \033[32m%s\033[0m\n", command.array); return command.array; @@ -1125,7 +1143,7 @@ | thinks the are. */ - if (Settings.verbose) + if (conf_core.rc.verbose) printf("ChangeGroupVisibility(Layer=%d, On=%d, ChangeStackOrder=%d)\n", Layer, On, ChangeStackOrder); /* decrement 'i' to keep stack in order of layergroup */ @@ -1200,7 +1218,7 @@ PCB->ViaOn = false; PCB->RatOn = false; CLEAR_FLAG(SHOWMASKFLAG, PCB); - Settings.ShowSolderSide = 0; + conf_core.editor.show_solder_side = 0; for (i = argn - 1; i >= 0; i--) { if (strcasecmp(args[i], "rats") == 0) @@ -1216,7 +1234,7 @@ else if (strcasecmp(args[i], "mask") == 0) SET_FLAG(SHOWMASKFLAG, PCB); else if (strcasecmp(args[i], "solderside") == 0) - Settings.ShowSolderSide = 1; + conf_core.editor.show_solder_side = 1; else if (isdigit((int) args[i][0])) { lno = atoi(args[i]); ChangeGroupVisibility(lno, true, true); @@ -1620,10 +1638,10 @@ PCB->MaxHeight - (box->Y2 - Crosshair.AttachedObject.Y)); /* get all attached objects if necessary */ - if ((Settings.Mode != COPY_MODE) && TEST_FLAG(RUBBERBANDFLAG, PCB)) + if ((conf_core.editor.mode != COPY_MODE) && TEST_FLAG(RUBBERBANDFLAG, PCB)) LookupRubberbandLines(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3); - if (Settings.Mode != COPY_MODE && + if (conf_core.editor.mode != COPY_MODE && (Crosshair.AttachedObject.Type == ELEMENT_TYPE || Crosshair.AttachedObject.Type == VIA_TYPE || Crosshair.AttachedObject.Type == LINE_TYPE || Crosshair.AttachedObject.Type == LINEPOINT_TYPE)) @@ -1941,8 +1959,8 @@ const char *pcb_author(void) { - if (Settings.FabAuthor && Settings.FabAuthor[0]) - return Settings.FabAuthor; + if (conf_core.design.fab_author && conf_core.design.fab_author[0]) + return conf_core.design.fab_author; else return get_user_name(); } Index: trunk/src/misc.h =================================================================== --- trunk/src/misc.h (revision 1699) +++ trunk/src/misc.h (revision 1700) @@ -69,7 +69,12 @@ void SetFontInfo(FontTypePtr); char *make_route_string(RouteStyleType rs[], int n_styles); int ParseGroupString(char *, LayerGroupTypePtr, int /* LayerN */ ); + +/* Parse a single route string into one RouteStyleTypePtr slot */ +int ParseRoutingString1(char **str, RouteStyleTypePtr routeStyle, const char *default_unit); +/* Parse a ':' separated list of route strings into a full RouteStyleTypePtr array */ int ParseRouteString(char *, RouteStyleTypePtr, const char *); + void QuitApplication(void); char *EvaluateFilename(char *, char *, char *, char *); void SetTextBoundingBox(FontTypePtr, TextTypePtr); Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 1699) +++ trunk/src/move.c (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -462,7 +463,7 @@ else as before */ newone = CreateNewLineOnLayer(Dest, Rat->Point1.X, Rat->Point1.Y, - Rat->Point2.X, Rat->Point2.Y, Settings.LineThickness, 2 * Settings.Keepaway, Rat->Flags); + Rat->Point2.X, Rat->Point2.Y, conf_core.design.line_thickness, 2 * conf_core.design.keepaway, Rat->Flags); if (TEST_FLAG(CLEARNEWFLAG, PCB)) SET_FLAG(CLEARLINEFLAG, newone); if (!newone) @@ -492,7 +493,7 @@ if ((via = CreateNewVia(PCB->Data, i->X, i->Y, - Settings.ViaThickness, 2 * Settings.Keepaway, NOFLAG, Settings.ViaDrillingHole, NULL, NoFlags())) != NULL) { + conf_core.design.via_thickness, 2 * conf_core.design.keepaway, NOFLAG, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { AddObjectToCreateUndoList(VIA_TYPE, via, via, via); DrawVia(via); } @@ -537,7 +538,7 @@ sb.Y1 = newone->Point1.Y - newone->Thickness / 2; sb.Y2 = newone->Point1.Y + newone->Thickness / 2; if ((SearchObjectByLocation(PIN_TYPES, &ptr1, &ptr2, &ptr3, - newone->Point1.X, newone->Point1.Y, Settings.ViaThickness / 2) == NO_TYPE)) { + newone->Point1.X, newone->Point1.Y, conf_core.design.via_thickness / 2) == NO_TYPE)) { info.X = newone->Point1.X; info.Y = newone->Point1.Y; if (setjmp(info.env) == 0) @@ -549,7 +550,7 @@ sb.Y1 = newone->Point2.Y - newone->Thickness / 2; sb.Y2 = newone->Point2.Y + newone->Thickness / 2; if ((SearchObjectByLocation(PIN_TYPES, &ptr1, &ptr2, &ptr3, - newone->Point2.X, newone->Point2.Y, Settings.ViaThickness / 2) == NO_TYPE)) { + newone->Point2.X, newone->Point2.Y, conf_core.design.via_thickness / 2) == NO_TYPE)) { info.X = newone->Point2.X; info.Y = newone->Point2.Y; if (setjmp(info.env) == 0) @@ -875,8 +876,8 @@ memset(lp, 0, sizeof(LayerType)); lp->On = 1; lp->Name = strdup("New Layer"); - lp->Color = Settings.LayerColor[new_index]; - lp->SelectedColor = Settings.LayerSelectedColor[new_index]; + lp->Color = conf_core.appearance.color.layer[new_index]; + lp->SelectedColor = conf_core.appearance.color.layer_selected[new_index]; for (l = 0; l < max_copper_layer; l++) if (LayerStack[l] >= new_index) LayerStack[l]++; Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 1699) +++ trunk/src/object_act.c (revision 1700) @@ -25,6 +25,8 @@ * */ #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "action_helper.h" @@ -793,7 +795,7 @@ void *ptr1, *ptr2, *ptr3; if (SearchScreen(Crosshair.X, Crosshair.Y, ELEMENT_TYPE, &ptr1, &ptr2, &ptr3) != NO_TYPE) { - Note.Buffer = Settings.BufferNumber; + Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); ClearBuffer(PASTEBUFFER); CopyObjectToBuffer(PASTEBUFFER->Data, PCB->Data, ELEMENT_TYPE, ptr1, ptr2, ptr3); Index: trunk/src/parse_l.c =================================================================== --- trunk/src/parse_l.c (revision 1699) +++ trunk/src/parse_l.c (revision 1700) @@ -648,6 +648,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -708,7 +709,7 @@ */ static int Parse(FILE *, char *, char *, char *, char *); -#line 712 "lex.yy.c" +#line 713 "lex.yy.c" #define INITIAL 0 @@ -895,10 +896,10 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 103 "parse_l.l" +#line 104 "parse_l.l" -#line 902 "lex.yy.c" +#line 903 "lex.yy.c" if ( !(yy_init) ) { @@ -993,227 +994,227 @@ case 1: YY_RULE_SETUP -#line 105 "parse_l.l" +#line 106 "parse_l.l" { return(T_FILEVERSION); } YY_BREAK case 2: YY_RULE_SETUP -#line 106 "parse_l.l" +#line 107 "parse_l.l" { return(T_PCB); } YY_BREAK case 3: YY_RULE_SETUP -#line 107 "parse_l.l" +#line 108 "parse_l.l" { return(T_GRID); } YY_BREAK case 4: YY_RULE_SETUP -#line 108 "parse_l.l" +#line 109 "parse_l.l" { return(T_CURSOR); } YY_BREAK case 5: YY_RULE_SETUP -#line 109 "parse_l.l" +#line 110 "parse_l.l" { return(T_THERMAL); } YY_BREAK case 6: YY_RULE_SETUP -#line 110 "parse_l.l" +#line 111 "parse_l.l" { return(T_AREA); } YY_BREAK case 7: YY_RULE_SETUP -#line 111 "parse_l.l" +#line 112 "parse_l.l" { return(T_DRC); } YY_BREAK case 8: YY_RULE_SETUP -#line 112 "parse_l.l" +#line 113 "parse_l.l" { return(T_FLAGS); } YY_BREAK case 9: YY_RULE_SETUP -#line 113 "parse_l.l" +#line 114 "parse_l.l" { return(T_LAYER); } YY_BREAK case 10: YY_RULE_SETUP -#line 114 "parse_l.l" +#line 115 "parse_l.l" { return(T_PIN); } YY_BREAK case 11: YY_RULE_SETUP -#line 115 "parse_l.l" +#line 116 "parse_l.l" { return(T_PAD); } YY_BREAK case 12: YY_RULE_SETUP -#line 116 "parse_l.l" +#line 117 "parse_l.l" { return(T_VIA); } YY_BREAK case 13: YY_RULE_SETUP -#line 117 "parse_l.l" +#line 118 "parse_l.l" { return(T_LINE); } YY_BREAK case 14: YY_RULE_SETUP -#line 118 "parse_l.l" +#line 119 "parse_l.l" { return(T_RAT); } YY_BREAK case 15: YY_RULE_SETUP -#line 119 "parse_l.l" +#line 120 "parse_l.l" { return(T_RECTANGLE); } YY_BREAK case 16: YY_RULE_SETUP -#line 120 "parse_l.l" +#line 121 "parse_l.l" { return(T_TEXT); } YY_BREAK case 17: YY_RULE_SETUP -#line 121 "parse_l.l" +#line 122 "parse_l.l" { return(T_ELEMENTLINE); } YY_BREAK case 18: YY_RULE_SETUP -#line 122 "parse_l.l" +#line 123 "parse_l.l" { return(T_ELEMENTARC); } YY_BREAK case 19: YY_RULE_SETUP -#line 123 "parse_l.l" +#line 124 "parse_l.l" { return(T_ELEMENT); } YY_BREAK case 20: YY_RULE_SETUP -#line 124 "parse_l.l" +#line 125 "parse_l.l" { return(T_SYMBOLLINE); } YY_BREAK case 21: YY_RULE_SETUP -#line 125 "parse_l.l" +#line 126 "parse_l.l" { return(T_SYMBOL); } YY_BREAK case 22: YY_RULE_SETUP -#line 126 "parse_l.l" +#line 127 "parse_l.l" { return(T_MARK); } YY_BREAK case 23: YY_RULE_SETUP -#line 127 "parse_l.l" +#line 128 "parse_l.l" { return(T_GROUPS); } YY_BREAK case 24: YY_RULE_SETUP -#line 128 "parse_l.l" +#line 129 "parse_l.l" { return(T_STYLES); } YY_BREAK case 25: YY_RULE_SETUP -#line 129 "parse_l.l" +#line 130 "parse_l.l" { return(T_POLYGON); } YY_BREAK case 26: YY_RULE_SETUP -#line 130 "parse_l.l" +#line 131 "parse_l.l" { return(T_POLYGON_HOLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 131 "parse_l.l" +#line 132 "parse_l.l" { return(T_ARC); } YY_BREAK case 28: YY_RULE_SETUP -#line 132 "parse_l.l" +#line 133 "parse_l.l" { return(T_NETLIST); } YY_BREAK case 29: YY_RULE_SETUP -#line 133 "parse_l.l" +#line 134 "parse_l.l" { return(T_NET); } YY_BREAK case 30: YY_RULE_SETUP -#line 134 "parse_l.l" +#line 135 "parse_l.l" { return(T_CONN); } YY_BREAK case 31: YY_RULE_SETUP -#line 135 "parse_l.l" +#line 136 "parse_l.l" { return(T_NETLISTPATCH); } YY_BREAK case 32: YY_RULE_SETUP -#line 136 "parse_l.l" +#line 137 "parse_l.l" { return(T_ADD_CONN); } YY_BREAK case 33: YY_RULE_SETUP -#line 137 "parse_l.l" +#line 138 "parse_l.l" { return(T_DEL_CONN); } YY_BREAK case 34: YY_RULE_SETUP -#line 138 "parse_l.l" +#line 139 "parse_l.l" { return(T_CHANGE_ATTRIB); } YY_BREAK case 35: YY_RULE_SETUP -#line 139 "parse_l.l" +#line 140 "parse_l.l" { return(T_ATTRIBUTE); } YY_BREAK case 36: YY_RULE_SETUP -#line 141 "parse_l.l" +#line 142 "parse_l.l" { return T_NM; } YY_BREAK case 37: YY_RULE_SETUP -#line 142 "parse_l.l" +#line 143 "parse_l.l" { return T_UM; } YY_BREAK case 38: YY_RULE_SETUP -#line 143 "parse_l.l" +#line 144 "parse_l.l" { return T_MM; } YY_BREAK case 39: YY_RULE_SETUP -#line 144 "parse_l.l" +#line 145 "parse_l.l" { return T_M; } YY_BREAK case 40: YY_RULE_SETUP -#line 145 "parse_l.l" +#line 146 "parse_l.l" { return T_KM; } YY_BREAK case 41: YY_RULE_SETUP -#line 146 "parse_l.l" +#line 147 "parse_l.l" { return T_UMIL; } YY_BREAK case 42: YY_RULE_SETUP -#line 147 "parse_l.l" +#line 148 "parse_l.l" { return T_CMIL; } YY_BREAK case 43: YY_RULE_SETUP -#line 148 "parse_l.l" +#line 149 "parse_l.l" { return T_MIL; } YY_BREAK case 44: YY_RULE_SETUP -#line 149 "parse_l.l" +#line 150 "parse_l.l" { return T_IN; } YY_BREAK case 45: YY_RULE_SETUP -#line 151 "parse_l.l" +#line 152 "parse_l.l" { yylval.integer = (unsigned) *(yytext+1); return(CHAR_CONST); @@ -1221,17 +1222,17 @@ YY_BREAK case 46: YY_RULE_SETUP -#line 155 "parse_l.l" +#line 156 "parse_l.l" { return parse_number(); } YY_BREAK case 47: YY_RULE_SETUP -#line 156 "parse_l.l" +#line 157 "parse_l.l" { yylval.integer = round (strtod (yytext, NULL)); return INTEGER; } YY_BREAK case 48: YY_RULE_SETUP -#line 158 "parse_l.l" +#line 159 "parse_l.l" { unsigned n; sscanf((char *) yytext, "%x", &n); yylval.integer = n; @@ -1240,7 +1241,7 @@ YY_BREAK case 49: YY_RULE_SETUP -#line 163 "parse_l.l" +#line 164 "parse_l.l" { char *p1, *p2; @@ -1276,18 +1277,18 @@ YY_BREAK case 50: YY_RULE_SETUP -#line 195 "parse_l.l" +#line 196 "parse_l.l" {} YY_BREAK case 51: YY_RULE_SETUP -#line 196 "parse_l.l" +#line 197 "parse_l.l" {} YY_BREAK case 52: /* rule 52 can match eol */ YY_RULE_SETUP -#line 197 "parse_l.l" +#line 198 "parse_l.l" { #ifndef FLEX_SCANNER yylineno++; @@ -1296,20 +1297,20 @@ YY_BREAK case 53: YY_RULE_SETUP -#line 202 "parse_l.l" +#line 203 "parse_l.l" {} YY_BREAK case 54: YY_RULE_SETUP -#line 203 "parse_l.l" +#line 204 "parse_l.l" { return(*yytext); } YY_BREAK case 55: YY_RULE_SETUP -#line 205 "parse_l.l" +#line 206 "parse_l.l" ECHO; YY_BREAK -#line 1313 "lex.yy.c" +#line 1314 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2319,7 +2320,7 @@ #define YYTABLES_NAME "yytables" -#line 205 "parse_l.l" +#line 206 "parse_l.l" @@ -2358,6 +2359,7 @@ sprintf (tmps, "%s", Filename); yyin = fopen (tmps, "r"); +printf("OPENING: %s -> %p\n", tmps, yyin); if (!yyin) { /* Special case this one, we get it all the time... */ @@ -2441,7 +2443,7 @@ yyFont = &PCB->Font; yyElement = NULL; - f = fp_fopen(Settings.LibrarySearchPaths, name, &st); + f = fp_fopen(conf_core.rc.library_search_paths, name, &st); if (f == NULL) return -1; @@ -2464,7 +2466,7 @@ yyFont = NULL; yyElement = NULL; setlocale(LC_ALL, "C"); /* make sure numerics are read predictably */ - retval = Parse(NULL, Settings.FileCommand, Settings.FilePath, Filename, NULL); + retval = Parse(NULL, conf_core.rc.file_command, conf_core.rc.file_path, Filename, NULL); setlocale(LC_ALL, ""); return retval; } @@ -2480,31 +2482,12 @@ yyFont = Ptr; yyElement = NULL; - /* search through the font path for a font file */ - if ((Filename[0] == '/') || (strncmp(Filename, "./", 2) == 0) || (strncmp(Filename, "../", 2) == 0)) { - r = Parse(NULL, Settings.FontCommand, NULL, Filename, NULL); - if (r != 0) - return r; - } - - path = strdup (Settings.FontPath); - for (p = strtok (path, PCB_PATH_DELIMETER); p && *p; - p = strtok (NULL, PCB_PATH_DELIMETER)) - { + r = Parse(NULL, conf_core.rc.font_command, NULL, Filename, NULL); + if (r == 0) { #ifdef DEBUG - Message ("Looking for %s in %s\n", Filename, p); + Message ("Found %s in %s\n", Filename, p); #endif - r = Parse(NULL, Settings.FontCommand, p, Filename, NULL); - if (r == 0) - { -#ifdef DEBUG - Message ("Found %s in %s\n", Filename, p); -#endif - break; - } - } - free (path); - + } return r; } Index: trunk/src/parse_l.l =================================================================== --- trunk/src/parse_l.l (revision 1699) +++ trunk/src/parse_l.l (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -239,6 +240,7 @@ sprintf (tmps, "%s", Filename); yyin = fopen (tmps, "r"); +printf("OPENING: %s -> %p\n", tmps, yyin); if (!yyin) { /* Special case this one, we get it all the time... */ @@ -322,7 +324,7 @@ yyFont = &PCB->Font; yyElement = NULL; - f = fp_fopen(Settings.LibrarySearchPaths, name, &st); + f = fp_fopen(conf_core.rc.library_search_paths, name, &st); if (f == NULL) return -1; @@ -345,7 +347,7 @@ yyFont = NULL; yyElement = NULL; setlocale(LC_ALL, "C"); /* make sure numerics are read predictably */ - retval = Parse(NULL, Settings.FileCommand, Settings.FilePath, Filename, NULL); + retval = Parse(NULL, conf_core.rc.file_command, conf_core.rc.file_path, Filename, NULL); setlocale(LC_ALL, ""); return retval; } @@ -361,31 +363,12 @@ yyFont = Ptr; yyElement = NULL; - /* search through the font path for a font file */ - if ((Filename[0] == '/') || (strncmp(Filename, "./", 2) == 0) || (strncmp(Filename, "../", 2) == 0)) { - r = Parse(NULL, Settings.FontCommand, NULL, Filename, NULL); - if (r != 0) - return r; - } - - path = strdup (Settings.FontPath); - for (p = strtok (path, PCB_PATH_DELIMETER); p && *p; - p = strtok (NULL, PCB_PATH_DELIMETER)) - { + r = Parse(NULL, conf_core.rc.font_command, NULL, Filename, NULL); + if (r == 0) { #ifdef DEBUG - Message ("Looking for %s in %s\n", Filename, p); + Message ("Found %s in %s\n", Filename, p); #endif - r = Parse(NULL, Settings.FontCommand, p, Filename, NULL); - if (r == 0) - { -#ifdef DEBUG - Message ("Found %s in %s\n", Filename, p); -#endif - break; - } - } - free (path); - + } return r; } Index: trunk/src/parse_y.c =================================================================== --- trunk/src/parse_y.c (revision 1699) +++ trunk/src/parse_y.c (revision 1700) @@ -94,6 +94,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" #include "create.h" @@ -158,7 +159,7 @@ #include "parse_y.h" -#line 162 "parse_y.tab.c" /* yacc.c:339 */ +#line 163 "parse_y.tab.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -249,7 +250,7 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 110 "parse_y.y" /* yacc.c:355 */ +#line 111 "parse_y.y" /* yacc.c:355 */ int integer; double number; @@ -257,7 +258,7 @@ FlagType flagtype; PLMeasure measure; -#line 261 "parse_y.tab.c" /* yacc.c:355 */ +#line 262 "parse_y.tab.c" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -272,7 +273,7 @@ /* Copy the second part of user declarations. */ -#line 276 "parse_y.tab.c" /* yacc.c:358 */ +#line 277 "parse_y.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -574,28 +575,28 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 137, 137, 138, 139, 140, 164, 164, 222, 222, - 233, 233, 252, 253, 258, 258, 298, 300, 330, 336, - 342, 371, 372, 373, 376, 384, 397, 429, 435, 441, - 457, 459, 484, 486, 517, 519, 520, 521, 525, 535, - 546, 573, 577, 582, 610, 614, 658, 667, 676, 680, - 681, 685, 686, 690, 691, 691, 692, 693, 695, 695, - 702, 706, 707, 708, 709, 710, 746, 756, 767, 777, - 787, 823, 828, 860, 859, 887, 888, 892, 893, 897, - 898, 899, 900, 901, 902, 904, 909, 910, 911, 912, - 912, 913, 943, 952, 961, 1009, 1018, 1027, 1064, 1074, - 1092, 1142, 1141, 1180, 1182, 1187, 1186, 1193, 1195, 1200, - 1204, 1264, 1265, 1266, 1267, 1268, 1276, 1275, 1294, 1293, - 1312, 1311, 1332, 1330, 1354, 1352, 1433, 1434, 1438, 1439, - 1440, 1441, 1442, 1444, 1449, 1454, 1459, 1464, 1469, 1474, - 1474, 1478, 1479, 1483, 1484, 1485, 1486, 1488, 1494, 1501, - 1506, 1511, 1511, 1552, 1564, 1576, 1587, 1603, 1657, 1671, - 1684, 1695, 1706, 1707, 1711, 1712, 1734, 1736, 1752, 1771, - 1772, 1775, 1777, 1778, 1799, 1806, 1822, 1823, 1827, 1832, - 1833, 1837, 1838, 1862, 1861, 1871, 1872, 1876, 1877, 1896, - 1913, 1914, 1918, 1923, 1924, 1928, 1929, 1944, 1945, 1946, - 1973, 1981, 1982, 1986, 1987, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001 + 0, 138, 138, 139, 140, 141, 165, 165, 223, 223, + 234, 234, 253, 254, 259, 259, 299, 301, 331, 337, + 343, 372, 373, 374, 377, 385, 398, 430, 436, 442, + 458, 460, 485, 487, 518, 520, 521, 522, 526, 536, + 547, 574, 578, 583, 611, 615, 659, 668, 677, 681, + 682, 686, 687, 691, 692, 692, 693, 694, 696, 696, + 703, 707, 708, 709, 710, 711, 747, 757, 768, 778, + 788, 824, 829, 861, 860, 888, 889, 893, 894, 898, + 899, 900, 901, 902, 903, 905, 910, 911, 912, 913, + 913, 914, 944, 953, 962, 1010, 1019, 1028, 1065, 1075, + 1093, 1143, 1142, 1181, 1183, 1188, 1187, 1194, 1196, 1201, + 1205, 1265, 1266, 1267, 1268, 1269, 1277, 1276, 1295, 1294, + 1313, 1312, 1333, 1331, 1355, 1353, 1434, 1435, 1439, 1440, + 1441, 1442, 1443, 1445, 1450, 1455, 1460, 1465, 1470, 1475, + 1475, 1479, 1480, 1484, 1485, 1486, 1487, 1489, 1495, 1502, + 1507, 1512, 1512, 1553, 1565, 1577, 1588, 1604, 1658, 1672, + 1685, 1696, 1707, 1708, 1712, 1713, 1735, 1737, 1753, 1772, + 1773, 1776, 1778, 1779, 1800, 1807, 1823, 1824, 1828, 1833, + 1834, 1838, 1839, 1863, 1862, 1872, 1873, 1877, 1878, 1897, + 1914, 1915, 1919, 1924, 1925, 1929, 1930, 1945, 1946, 1947, + 1974, 1982, 1983, 1987, 1988, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002 }; #endif @@ -1772,13 +1773,13 @@ switch (yyn) { case 5: -#line 140 "parse_y.y" /* yacc.c:1646 */ +#line 141 "parse_y.y" /* yacc.c:1646 */ { YYABORT; } -#line 1778 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1779 "parse_y.tab.c" /* yacc.c:1646 */ break; case 6: -#line 164 "parse_y.y" /* yacc.c:1646 */ +#line 165 "parse_y.y" /* yacc.c:1646 */ { /* reset flags for 'used layers'; * init font and data pointers @@ -1799,16 +1800,16 @@ yyPCB->NetlistPatches = yyPCB->NetlistPatchLast = NULL; layer_group_string = NULL; } -#line 1803 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1804 "parse_y.tab.c" /* yacc.c:1646 */ break; case 7: -#line 198 "parse_y.y" /* yacc.c:1646 */ +#line 199 "parse_y.y" /* yacc.c:1646 */ { PCBTypePtr pcb_save = PCB; if (layer_group_string == NULL) - layer_group_string = strdup(Settings.Groups); + layer_group_string = strdup(conf_core.rc.groups); CreateNewPCBPost (yyPCB, 0); if (ParseGroupString(layer_group_string, &yyPCB->LayerGroups, yyData->LayerN)) { @@ -1827,28 +1828,28 @@ ENDALL_LOOP; PCB = pcb_save; } -#line 1831 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1832 "parse_y.tab.c" /* yacc.c:1646 */ break; case 8: -#line 222 "parse_y.y" /* yacc.c:1646 */ +#line 223 "parse_y.y" /* yacc.c:1646 */ { PreLoadElementPCB (); layer_group_string = NULL; } -#line 1838 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1839 "parse_y.tab.c" /* yacc.c:1646 */ break; case 9: -#line 225 "parse_y.y" /* yacc.c:1646 */ +#line 226 "parse_y.y" /* yacc.c:1646 */ { LayerFlag[0] = true; LayerFlag[1] = true; yyData->LayerN = 2; PostLoadElementPCB (); } -#line 1848 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1849 "parse_y.tab.c" /* yacc.c:1646 */ break; case 10: -#line 233 "parse_y.y" /* yacc.c:1646 */ +#line 234 "parse_y.y" /* yacc.c:1646 */ { /* reset flags for 'used layers'; * init font and data pointers @@ -1864,11 +1865,11 @@ LayerFlag[i] = false; yyData->LayerN = 0; } -#line 1868 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1869 "parse_y.tab.c" /* yacc.c:1646 */ break; case 14: -#line 258 "parse_y.y" /* yacc.c:1646 */ +#line 259 "parse_y.y" /* yacc.c:1646 */ { /* mark all symbols invalid */ int i; @@ -1883,20 +1884,20 @@ free (yyFont->Symbol[i].Line); bzero(yyFont->Symbol, sizeof(yyFont->Symbol)); } -#line 1887 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1888 "parse_y.tab.c" /* yacc.c:1646 */ break; case 15: -#line 273 "parse_y.y" /* yacc.c:1646 */ +#line 274 "parse_y.y" /* yacc.c:1646 */ { yyFont->Valid = true; SetFontInfo(yyFont); } -#line 1896 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1897 "parse_y.tab.c" /* yacc.c:1646 */ break; case 17: -#line 301 "parse_y.y" /* yacc.c:1646 */ +#line 302 "parse_y.y" /* yacc.c:1646 */ { if (check_file_version ((yyvsp[-1].integer)) != 0) { @@ -1903,116 +1904,116 @@ YYABORT; } } -#line 1907 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1908 "parse_y.tab.c" /* yacc.c:1646 */ break; case 18: -#line 331 "parse_y.y" /* yacc.c:1646 */ +#line 332 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-1].string); yyPCB->MaxWidth = MAX_COORD; yyPCB->MaxHeight = MAX_COORD; } -#line 1917 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1918 "parse_y.tab.c" /* yacc.c:1646 */ break; case 19: -#line 337 "parse_y.y" /* yacc.c:1646 */ +#line 338 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-3].string); yyPCB->MaxWidth = OU ((yyvsp[-2].measure)); yyPCB->MaxHeight = OU ((yyvsp[-1].measure)); } -#line 1927 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1928 "parse_y.tab.c" /* yacc.c:1646 */ break; case 20: -#line 343 "parse_y.y" /* yacc.c:1646 */ +#line 344 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-3].string); yyPCB->MaxWidth = NU ((yyvsp[-2].measure)); yyPCB->MaxHeight = NU ((yyvsp[-1].measure)); } -#line 1937 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1938 "parse_y.tab.c" /* yacc.c:1646 */ break; case 24: -#line 377 "parse_y.y" /* yacc.c:1646 */ +#line 378 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = OU ((yyvsp[-3].measure)); yyPCB->GridOffsetX = OU ((yyvsp[-2].measure)); yyPCB->GridOffsetY = OU ((yyvsp[-1].measure)); } -#line 1947 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1948 "parse_y.tab.c" /* yacc.c:1646 */ break; case 25: -#line 385 "parse_y.y" /* yacc.c:1646 */ +#line 386 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = OU ((yyvsp[-4].measure)); yyPCB->GridOffsetX = OU ((yyvsp[-3].measure)); yyPCB->GridOffsetY = OU ((yyvsp[-2].measure)); if ((yyvsp[-1].integer)) - Settings.DrawGrid = true; + conf_core.editor.draw_grid = true; else - Settings.DrawGrid = false; + conf_core.editor.draw_grid = false; } -#line 1961 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1962 "parse_y.tab.c" /* yacc.c:1646 */ break; case 26: -#line 398 "parse_y.y" /* yacc.c:1646 */ +#line 399 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = NU ((yyvsp[-4].measure)); yyPCB->GridOffsetX = NU ((yyvsp[-3].measure)); yyPCB->GridOffsetY = NU ((yyvsp[-2].measure)); if ((yyvsp[-1].integer)) - Settings.DrawGrid = true; + conf_core.editor.draw_grid = true; else - Settings.DrawGrid = false; + conf_core.editor.draw_grid = false; } -#line 1975 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1976 "parse_y.tab.c" /* yacc.c:1646 */ break; case 27: -#line 430 "parse_y.y" /* yacc.c:1646 */ +#line 431 "parse_y.y" /* yacc.c:1646 */ { yyPCB->CursorX = OU ((yyvsp[-3].measure)); yyPCB->CursorY = OU ((yyvsp[-2].measure)); yyPCB->Zoom = (yyvsp[-1].number)*2; } -#line 1985 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1986 "parse_y.tab.c" /* yacc.c:1646 */ break; case 28: -#line 436 "parse_y.y" /* yacc.c:1646 */ +#line 437 "parse_y.y" /* yacc.c:1646 */ { yyPCB->CursorX = NU ((yyvsp[-3].measure)); yyPCB->CursorY = NU ((yyvsp[-2].measure)); yyPCB->Zoom = (yyvsp[-1].number); } -#line 1995 "parse_y.tab.c" /* yacc.c:1646 */ +#line 1996 "parse_y.tab.c" /* yacc.c:1646 */ break; case 31: -#line 460 "parse_y.y" /* yacc.c:1646 */ +#line 461 "parse_y.y" /* yacc.c:1646 */ { /* Read in cmil^2 for now; in future this should be a noop. */ yyPCB->IsleArea = MIL_TO_COORD (MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0; } -#line 2004 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2005 "parse_y.tab.c" /* yacc.c:1646 */ break; case 33: -#line 487 "parse_y.y" /* yacc.c:1646 */ +#line 488 "parse_y.y" /* yacc.c:1646 */ { yyPCB->ThermScale = (yyvsp[-1].number); } -#line 2012 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2013 "parse_y.tab.c" /* yacc.c:1646 */ break; case 38: -#line 526 "parse_y.y" /* yacc.c:1646 */ +#line 527 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Bloat = NU ((yyvsp[-3].measure)); yyPCB->Shrink = NU ((yyvsp[-2].measure)); @@ -2019,11 +2020,11 @@ yyPCB->minWid = NU ((yyvsp[-1].measure)); yyPCB->minRing = NU ((yyvsp[-1].measure)); } -#line 2023 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2024 "parse_y.tab.c" /* yacc.c:1646 */ break; case 39: -#line 536 "parse_y.y" /* yacc.c:1646 */ +#line 537 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Bloat = NU ((yyvsp[-4].measure)); yyPCB->Shrink = NU ((yyvsp[-3].measure)); @@ -2031,11 +2032,11 @@ yyPCB->minSlk = NU ((yyvsp[-1].measure)); yyPCB->minRing = NU ((yyvsp[-2].measure)); } -#line 2035 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2036 "parse_y.tab.c" /* yacc.c:1646 */ break; case 40: -#line 547 "parse_y.y" /* yacc.c:1646 */ +#line 548 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Bloat = NU ((yyvsp[-6].measure)); yyPCB->Shrink = NU ((yyvsp[-5].measure)); @@ -2044,36 +2045,36 @@ yyPCB->minDrill = NU ((yyvsp[-2].measure)); yyPCB->minRing = NU ((yyvsp[-1].measure)); } -#line 2048 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2049 "parse_y.tab.c" /* yacc.c:1646 */ break; case 41: -#line 574 "parse_y.y" /* yacc.c:1646 */ +#line 575 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Flags = MakeFlags ((yyvsp[-1].integer) & PCB_FLAGS); } -#line 2056 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2057 "parse_y.tab.c" /* yacc.c:1646 */ break; case 42: -#line 578 "parse_y.y" /* yacc.c:1646 */ +#line 579 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Flags = string_to_pcbflags ((yyvsp[-1].string), yyerror); free((yyvsp[-1].string)); } -#line 2065 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2066 "parse_y.tab.c" /* yacc.c:1646 */ break; case 44: -#line 611 "parse_y.y" /* yacc.c:1646 */ +#line 612 "parse_y.y" /* yacc.c:1646 */ { layer_group_string = (yyvsp[-1].string); } -#line 2073 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2074 "parse_y.tab.c" /* yacc.c:1646 */ break; case 46: -#line 659 "parse_y.y" /* yacc.c:1646 */ +#line 660 "parse_y.y" /* yacc.c:1646 */ { if (ParseRouteString((yyvsp[-1].string), &yyPCB->RouteStyle[0], "mil")) { @@ -2082,11 +2083,11 @@ } free((yyvsp[-1].string)); } -#line 2086 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2087 "parse_y.tab.c" /* yacc.c:1646 */ break; case 47: -#line 668 "parse_y.y" /* yacc.c:1646 */ +#line 669 "parse_y.y" /* yacc.c:1646 */ { if (ParseRouteString((yyvsp[-1].string), &yyPCB->RouteStyle[0], "cmil")) { @@ -2095,17 +2096,17 @@ } free((yyvsp[-1].string)); } -#line 2099 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2100 "parse_y.tab.c" /* yacc.c:1646 */ break; case 54: -#line 691 "parse_y.y" /* yacc.c:1646 */ +#line 692 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyPCB->Attributes; } -#line 2105 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2106 "parse_y.tab.c" /* yacc.c:1646 */ break; case 58: -#line 695 "parse_y.y" /* yacc.c:1646 */ +#line 696 "parse_y.y" /* yacc.c:1646 */ { /* clear pointer to force memory allocation by * the appropriate subroutine @@ -2112,57 +2113,57 @@ */ yyElement = NULL; } -#line 2116 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2117 "parse_y.tab.c" /* yacc.c:1646 */ break; case 60: -#line 702 "parse_y.y" /* yacc.c:1646 */ +#line 703 "parse_y.y" /* yacc.c:1646 */ { YYABORT; } -#line 2122 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2123 "parse_y.tab.c" /* yacc.c:1646 */ break; case 66: -#line 747 "parse_y.y" /* yacc.c:1646 */ +#line 748 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-2].string), (yyvsp[-1].flagtype)); free ((yyvsp[-2].string)); } -#line 2132 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2133 "parse_y.tab.c" /* yacc.c:1646 */ break; case 67: -#line 757 "parse_y.y" /* yacc.c:1646 */ +#line 758 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2142 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2143 "parse_y.tab.c" /* yacc.c:1646 */ break; case 68: -#line 768 "parse_y.y" /* yacc.c:1646 */ +#line 769 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2152 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2153 "parse_y.tab.c" /* yacc.c:1646 */ break; case 69: -#line 778 "parse_y.y" /* yacc.c:1646 */ +#line 779 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, OU((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2162 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2163 "parse_y.tab.c" /* yacc.c:1646 */ break; case 70: -#line 788 "parse_y.y" /* yacc.c:1646 */ +#line 789 "parse_y.y" /* yacc.c:1646 */ { Coord hole = (OU((yyvsp[-3].measure)) * DEFAULT_DRILLINGHOLE); @@ -2175,29 +2176,29 @@ OU((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2179 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2180 "parse_y.tab.c" /* yacc.c:1646 */ break; case 71: -#line 824 "parse_y.y" /* yacc.c:1646 */ +#line 825 "parse_y.y" /* yacc.c:1646 */ { CreateNewRat(yyData, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), - Settings.RatThickness, (yyvsp[-1].flagtype)); + conf_core.design.rat_thickness, (yyvsp[-1].flagtype)); } -#line 2188 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2189 "parse_y.tab.c" /* yacc.c:1646 */ break; case 72: -#line 829 "parse_y.y" /* yacc.c:1646 */ +#line 830 "parse_y.y" /* yacc.c:1646 */ { CreateNewRat(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), - Settings.RatThickness, OldFlags((yyvsp[-1].integer))); + conf_core.design.rat_thickness, OldFlags((yyvsp[-1].integer))); } -#line 2197 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2198 "parse_y.tab.c" /* yacc.c:1646 */ break; case 73: -#line 860 "parse_y.y" /* yacc.c:1646 */ +#line 861 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > MAX_LAYER + 2) { @@ -2221,44 +2222,44 @@ if ((yyvsp[-2].string) != NULL) free((yyvsp[-2].string)); } -#line 2225 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2226 "parse_y.tab.c" /* yacc.c:1646 */ break; case 85: -#line 905 "parse_y.y" /* yacc.c:1646 */ +#line 906 "parse_y.y" /* yacc.c:1646 */ { CreateNewPolygonFromRectangle(Layer, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), OldFlags((yyvsp[-1].integer))); } -#line 2234 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2235 "parse_y.tab.c" /* yacc.c:1646 */ break; case 89: -#line 912 "parse_y.y" /* yacc.c:1646 */ +#line 913 "parse_y.y" /* yacc.c:1646 */ { attr_list = & Layer->Attributes; } -#line 2240 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2241 "parse_y.tab.c" /* yacc.c:1646 */ break; case 92: -#line 944 "parse_y.y" /* yacc.c:1646 */ +#line 945 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineOnLayer(Layer, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), (yyvsp[-1].flagtype)); } -#line 2249 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2250 "parse_y.tab.c" /* yacc.c:1646 */ break; case 93: -#line 953 "parse_y.y" /* yacc.c:1646 */ +#line 954 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineOnLayer(Layer, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OldFlags((yyvsp[-1].integer))); } -#line 2258 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2259 "parse_y.tab.c" /* yacc.c:1646 */ break; case 94: -#line 962 "parse_y.y" /* yacc.c:1646 */ +#line 963 "parse_y.y" /* yacc.c:1646 */ { /* eliminate old-style rat-lines */ if ((IV ((yyvsp[-1].measure)) & RATFLAG) == 0) @@ -2265,48 +2266,48 @@ CreateNewLineOnLayer(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), 200*GROUNDPLANEFRAME, OldFlags(IV ((yyvsp[-1].measure)))); } -#line 2269 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2270 "parse_y.tab.c" /* yacc.c:1646 */ break; case 95: -#line 1010 "parse_y.y" /* yacc.c:1646 */ +#line 1011 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, NU ((yyvsp[-9].measure)), NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-1].flagtype)); } -#line 2278 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2279 "parse_y.tab.c" /* yacc.c:1646 */ break; case 96: -#line 1019 "parse_y.y" /* yacc.c:1646 */ +#line 1020 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, OU ((yyvsp[-9].measure)), OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OldFlags((yyvsp[-1].integer))); } -#line 2287 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2288 "parse_y.tab.c" /* yacc.c:1646 */ break; case 97: -#line 1028 "parse_y.y" /* yacc.c:1646 */ +#line 1029 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number), OU ((yyvsp[-4].measure)), 200*GROUNDPLANEFRAME, OldFlags((yyvsp[-1].integer))); } -#line 2296 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2297 "parse_y.tab.c" /* yacc.c:1646 */ break; case 98: -#line 1065 "parse_y.y" /* yacc.c:1646 */ +#line 1066 "parse_y.y" /* yacc.c:1646 */ { /* use a default scale of 100% */ CreateNewText(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2306 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2307 "parse_y.tab.c" /* yacc.c:1646 */ break; case 99: -#line 1075 "parse_y.y" /* yacc.c:1646 */ +#line 1076 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-1].integer) & ONSILKFLAG) { @@ -2321,11 +2322,11 @@ OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2325 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2326 "parse_y.tab.c" /* yacc.c:1646 */ break; case 100: -#line 1093 "parse_y.y" /* yacc.c:1646 */ +#line 1094 "parse_y.y" /* yacc.c:1646 */ { /* FIXME: shouldn't know about .f */ /* I don't think this matters because anything with hi_format @@ -2345,19 +2346,19 @@ CreateNewText(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype)); free ((yyvsp[-2].string)); } -#line 2349 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2350 "parse_y.tab.c" /* yacc.c:1646 */ break; case 101: -#line 1142 "parse_y.y" /* yacc.c:1646 */ +#line 1143 "parse_y.y" /* yacc.c:1646 */ { Polygon = CreateNewPolygon(Layer, (yyvsp[-2].flagtype)); } -#line 2357 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2358 "parse_y.tab.c" /* yacc.c:1646 */ break; case 102: -#line 1147 "parse_y.y" /* yacc.c:1646 */ +#line 1148 "parse_y.y" /* yacc.c:1646 */ { Cardinal contour, contour_start, contour_end; bool bad_contour_found = false; @@ -2389,35 +2390,35 @@ r_insert_entry (Layer->polygon_tree, (BoxType *) Polygon, 0); } } -#line 2393 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2394 "parse_y.tab.c" /* yacc.c:1646 */ break; case 105: -#line 1187 "parse_y.y" /* yacc.c:1646 */ +#line 1188 "parse_y.y" /* yacc.c:1646 */ { CreateNewHoleInPolygon (Polygon); } -#line 2401 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2402 "parse_y.tab.c" /* yacc.c:1646 */ break; case 109: -#line 1201 "parse_y.y" /* yacc.c:1646 */ +#line 1202 "parse_y.y" /* yacc.c:1646 */ { CreateNewPointInPolygon(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2409 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2410 "parse_y.tab.c" /* yacc.c:1646 */ break; case 110: -#line 1205 "parse_y.y" /* yacc.c:1646 */ +#line 1206 "parse_y.y" /* yacc.c:1646 */ { CreateNewPointInPolygon(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2417 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2418 "parse_y.tab.c" /* yacc.c:1646 */ break; case 116: -#line 1276 "parse_y.y" /* yacc.c:1646 */ +#line 1277 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, NoFlags(), (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, NoFlags(), false); @@ -2425,19 +2426,19 @@ free ((yyvsp[-5].string)); pin_num = 1; } -#line 2429 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2430 "parse_y.tab.c" /* yacc.c:1646 */ break; case 117: -#line 1284 "parse_y.y" /* yacc.c:1646 */ +#line 1285 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2437 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2438 "parse_y.tab.c" /* yacc.c:1646 */ break; case 118: -#line 1294 "parse_y.y" /* yacc.c:1646 */ +#line 1295 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-9].integer)), (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), false); @@ -2445,19 +2446,19 @@ free ((yyvsp[-7].string)); pin_num = 1; } -#line 2449 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2450 "parse_y.tab.c" /* yacc.c:1646 */ break; case 119: -#line 1302 "parse_y.y" /* yacc.c:1646 */ +#line 1303 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2457 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2458 "parse_y.tab.c" /* yacc.c:1646 */ break; case 120: -#line 1312 "parse_y.y" /* yacc.c:1646 */ +#line 1313 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-10].integer)), (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), false); @@ -2466,19 +2467,19 @@ free ((yyvsp[-7].string)); pin_num = 1; } -#line 2470 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2471 "parse_y.tab.c" /* yacc.c:1646 */ break; case 121: -#line 1321 "parse_y.y" /* yacc.c:1646 */ +#line 1322 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2478 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2479 "parse_y.tab.c" /* yacc.c:1646 */ break; case 122: -#line 1332 "parse_y.y" /* yacc.c:1646 */ +#line 1333 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-12].integer)), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)), @@ -2489,19 +2490,19 @@ free ((yyvsp[-10].string)); free ((yyvsp[-9].string)); } -#line 2493 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2494 "parse_y.tab.c" /* yacc.c:1646 */ break; case 123: -#line 1343 "parse_y.y" /* yacc.c:1646 */ +#line 1344 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2501 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2502 "parse_y.tab.c" /* yacc.c:1646 */ break; case 124: -#line 1354 "parse_y.y" /* yacc.c:1646 */ +#line 1355 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, (yyvsp[-12].flagtype), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), NU ((yyvsp[-8].measure)) + NU ((yyvsp[-6].measure)), NU ((yyvsp[-7].measure)) + NU ((yyvsp[-5].measure)), @@ -2512,119 +2513,119 @@ free ((yyvsp[-10].string)); free ((yyvsp[-9].string)); } -#line 2516 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2517 "parse_y.tab.c" /* yacc.c:1646 */ break; case 125: -#line 1365 "parse_y.y" /* yacc.c:1646 */ +#line 1366 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2524 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2525 "parse_y.tab.c" /* yacc.c:1646 */ break; case 133: -#line 1445 "parse_y.y" /* yacc.c:1646 */ +#line 1446 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2532 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2533 "parse_y.tab.c" /* yacc.c:1646 */ break; case 134: -#line 1450 "parse_y.y" /* yacc.c:1646 */ +#line 1451 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2540 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2541 "parse_y.tab.c" /* yacc.c:1646 */ break; case 135: -#line 1455 "parse_y.y" /* yacc.c:1646 */ +#line 1456 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure))); } -#line 2548 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2549 "parse_y.tab.c" /* yacc.c:1646 */ break; case 136: -#line 1460 "parse_y.y" /* yacc.c:1646 */ +#line 1461 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure))); } -#line 2556 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2557 "parse_y.tab.c" /* yacc.c:1646 */ break; case 137: -#line 1465 "parse_y.y" /* yacc.c:1646 */ +#line 1466 "parse_y.y" /* yacc.c:1646 */ { yyElement->MarkX = NU ((yyvsp[-2].measure)); yyElement->MarkY = NU ((yyvsp[-1].measure)); } -#line 2565 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2566 "parse_y.tab.c" /* yacc.c:1646 */ break; case 138: -#line 1470 "parse_y.y" /* yacc.c:1646 */ +#line 1471 "parse_y.y" /* yacc.c:1646 */ { yyElement->MarkX = OU ((yyvsp[-2].measure)); yyElement->MarkY = OU ((yyvsp[-1].measure)); } -#line 2574 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2575 "parse_y.tab.c" /* yacc.c:1646 */ break; case 139: -#line 1474 "parse_y.y" /* yacc.c:1646 */ +#line 1475 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyElement->Attributes; } -#line 2580 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2581 "parse_y.tab.c" /* yacc.c:1646 */ break; case 147: -#line 1489 "parse_y.y" /* yacc.c:1646 */ +#line 1490 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, NU ((yyvsp[-5].measure)) + yyElement->MarkX, NU ((yyvsp[-4].measure)) + yyElement->MarkY, NU ((yyvsp[-3].measure)) + yyElement->MarkX, NU ((yyvsp[-2].measure)) + yyElement->MarkY, NU ((yyvsp[-1].measure))); } -#line 2590 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2591 "parse_y.tab.c" /* yacc.c:1646 */ break; case 148: -#line 1495 "parse_y.y" /* yacc.c:1646 */ +#line 1496 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, OU ((yyvsp[-5].measure)) + yyElement->MarkX, OU ((yyvsp[-4].measure)) + yyElement->MarkY, OU ((yyvsp[-3].measure)) + yyElement->MarkX, OU ((yyvsp[-2].measure)) + yyElement->MarkY, OU ((yyvsp[-1].measure))); } -#line 2600 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2601 "parse_y.tab.c" /* yacc.c:1646 */ break; case 149: -#line 1502 "parse_y.y" /* yacc.c:1646 */ +#line 1503 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, NU ((yyvsp[-7].measure)) + yyElement->MarkX, NU ((yyvsp[-6].measure)) + yyElement->MarkY, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure))); } -#line 2609 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2610 "parse_y.tab.c" /* yacc.c:1646 */ break; case 150: -#line 1507 "parse_y.y" /* yacc.c:1646 */ +#line 1508 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, OU ((yyvsp[-7].measure)) + yyElement->MarkX, OU ((yyvsp[-6].measure)) + yyElement->MarkY, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure))); } -#line 2618 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2619 "parse_y.tab.c" /* yacc.c:1646 */ break; case 151: -#line 1511 "parse_y.y" /* yacc.c:1646 */ +#line 1512 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyElement->Attributes; } -#line 2624 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2625 "parse_y.tab.c" /* yacc.c:1646 */ break; case 153: -#line 1553 "parse_y.y" /* yacc.c:1646 */ +#line 1554 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, NU ((yyvsp[-9].measure)) + yyElement->MarkX, NU ((yyvsp[-8].measure)) + yyElement->MarkY, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].string), @@ -2632,11 +2633,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2636 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2637 "parse_y.tab.c" /* yacc.c:1646 */ break; case 154: -#line 1565 "parse_y.y" /* yacc.c:1646 */ +#line 1566 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, OU ((yyvsp[-9].measure)) + yyElement->MarkX, OU ((yyvsp[-8].measure)) + yyElement->MarkY, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].string), @@ -2644,11 +2645,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2648 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2649 "parse_y.tab.c" /* yacc.c:1646 */ break; case 155: -#line 1577 "parse_y.y" /* yacc.c:1646 */ +#line 1578 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*GROUNDPLANEFRAME, OU ((yyvsp[-5].measure)) + 2*MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); @@ -2655,11 +2656,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2659 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2660 "parse_y.tab.c" /* yacc.c:1646 */ break; case 156: -#line 1588 "parse_y.y" /* yacc.c:1646 */ +#line 1589 "parse_y.y" /* yacc.c:1646 */ { char p_number[8]; @@ -2669,11 +2670,11 @@ free ((yyvsp[-2].string)); } -#line 2673 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2674 "parse_y.tab.c" /* yacc.c:1646 */ break; case 157: -#line 1604 "parse_y.y" /* yacc.c:1646 */ +#line 1605 "parse_y.y" /* yacc.c:1646 */ { Coord hole = OU ((yyvsp[-3].measure)) * DEFAULT_DRILLINGHOLE; char p_number[8]; @@ -2688,11 +2689,11 @@ OU ((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), p_number, OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2692 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2693 "parse_y.tab.c" /* yacc.c:1646 */ break; case 158: -#line 1658 "parse_y.y" /* yacc.c:1646 */ +#line 1659 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement, NU ((yyvsp[-10].measure)) + yyElement->MarkX, NU ((yyvsp[-9].measure)) + yyElement->MarkY, @@ -2702,11 +2703,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2706 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2707 "parse_y.tab.c" /* yacc.c:1646 */ break; case 159: -#line 1672 "parse_y.y" /* yacc.c:1646 */ +#line 1673 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement,OU ((yyvsp[-10].measure)) + yyElement->MarkX, OU ((yyvsp[-9].measure)) + yyElement->MarkY, OU ((yyvsp[-8].measure)) + yyElement->MarkX, @@ -2715,11 +2716,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2719 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2720 "parse_y.tab.c" /* yacc.c:1646 */ break; case 160: -#line 1685 "parse_y.y" /* yacc.c:1646 */ +#line 1686 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, OU ((yyvsp[-4].measure)) + 2*MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); @@ -2726,11 +2727,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2730 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2731 "parse_y.tab.c" /* yacc.c:1646 */ break; case 161: -#line 1696 "parse_y.y" /* yacc.c:1646 */ +#line 1697 "parse_y.y" /* yacc.c:1646 */ { char p_number[8]; @@ -2739,23 +2740,23 @@ OU ((yyvsp[-3].measure)) + 2*MASKFRAME, (yyvsp[-2].string),p_number, OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2743 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2744 "parse_y.tab.c" /* yacc.c:1646 */ break; case 162: -#line 1706 "parse_y.y" /* yacc.c:1646 */ +#line 1707 "parse_y.y" /* yacc.c:1646 */ { (yyval.flagtype) = OldFlags((yyvsp[0].integer)); } -#line 2749 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2750 "parse_y.tab.c" /* yacc.c:1646 */ break; case 163: -#line 1707 "parse_y.y" /* yacc.c:1646 */ +#line 1708 "parse_y.y" /* yacc.c:1646 */ { (yyval.flagtype) = string_to_flags ((yyvsp[0].string), yyerror); free((yyvsp[0].string)); } -#line 2755 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2756 "parse_y.tab.c" /* yacc.c:1646 */ break; case 167: -#line 1737 "parse_y.y" /* yacc.c:1646 */ +#line 1738 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > MAX_FONTPOSITION) { @@ -2771,11 +2772,11 @@ Symbol->Valid = true; Symbol->Delta = NU ((yyvsp[-2].measure)); } -#line 2775 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2776 "parse_y.tab.c" /* yacc.c:1646 */ break; case 168: -#line 1753 "parse_y.y" /* yacc.c:1646 */ +#line 1754 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > MAX_FONTPOSITION) { @@ -2791,158 +2792,158 @@ Symbol->Valid = true; Symbol->Delta = OU ((yyvsp[-2].measure)); } -#line 2795 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2796 "parse_y.tab.c" /* yacc.c:1646 */ break; case 174: -#line 1800 "parse_y.y" /* yacc.c:1646 */ +#line 1801 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInSymbol(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2803 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2804 "parse_y.tab.c" /* yacc.c:1646 */ break; case 175: -#line 1807 "parse_y.y" /* yacc.c:1646 */ +#line 1808 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInSymbol(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2811 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2812 "parse_y.tab.c" /* yacc.c:1646 */ break; case 183: -#line 1862 "parse_y.y" /* yacc.c:1646 */ +#line 1863 "parse_y.y" /* yacc.c:1646 */ { Menu = CreateNewNet((LibraryTypePtr)&yyPCB->NetlistLib, (yyvsp[-3].string), (yyvsp[-2].string)); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2821 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2822 "parse_y.tab.c" /* yacc.c:1646 */ break; case 189: -#line 1897 "parse_y.y" /* yacc.c:1646 */ +#line 1898 "parse_y.y" /* yacc.c:1646 */ { CreateNewConnection(Menu, (yyvsp[-1].string)); free ((yyvsp[-1].string)); } -#line 2830 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2831 "parse_y.tab.c" /* yacc.c:1646 */ break; case 197: -#line 1944 "parse_y.y" /* yacc.c:1646 */ +#line 1945 "parse_y.y" /* yacc.c:1646 */ { rats_patch_append(yyPCB, RATP_ADD_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2836 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2837 "parse_y.tab.c" /* yacc.c:1646 */ break; case 198: -#line 1945 "parse_y.y" /* yacc.c:1646 */ +#line 1946 "parse_y.y" /* yacc.c:1646 */ { rats_patch_append(yyPCB, RATP_DEL_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2842 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2843 "parse_y.tab.c" /* yacc.c:1646 */ break; case 199: -#line 1946 "parse_y.y" /* yacc.c:1646 */ +#line 1947 "parse_y.y" /* yacc.c:1646 */ { rats_patch_append(yyPCB, RATP_CHANGE_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string)); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2848 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2849 "parse_y.tab.c" /* yacc.c:1646 */ break; case 200: -#line 1974 "parse_y.y" /* yacc.c:1646 */ +#line 1975 "parse_y.y" /* yacc.c:1646 */ { CreateNewAttribute (attr_list, (yyvsp[-2].string), (yyvsp[-1].string) ? (yyvsp[-1].string) : (char *)""); free ((yyvsp[-2].string)); free ((yyvsp[-1].string)); } -#line 2858 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2859 "parse_y.tab.c" /* yacc.c:1646 */ break; case 201: -#line 1981 "parse_y.y" /* yacc.c:1646 */ +#line 1982 "parse_y.y" /* yacc.c:1646 */ { (yyval.string) = (yyvsp[0].string); } -#line 2864 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2865 "parse_y.tab.c" /* yacc.c:1646 */ break; case 202: -#line 1982 "parse_y.y" /* yacc.c:1646 */ +#line 1983 "parse_y.y" /* yacc.c:1646 */ { (yyval.string) = 0; } -#line 2870 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2871 "parse_y.tab.c" /* yacc.c:1646 */ break; case 203: -#line 1986 "parse_y.y" /* yacc.c:1646 */ +#line 1987 "parse_y.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].number); } -#line 2876 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2877 "parse_y.tab.c" /* yacc.c:1646 */ break; case 204: -#line 1987 "parse_y.y" /* yacc.c:1646 */ +#line 1988 "parse_y.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].integer); } -#line 2882 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2883 "parse_y.tab.c" /* yacc.c:1646 */ break; case 205: -#line 1992 "parse_y.y" /* yacc.c:1646 */ +#line 1993 "parse_y.y" /* yacc.c:1646 */ { do_measure(&(yyval.measure), (yyvsp[0].number), MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); } -#line 2888 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2889 "parse_y.tab.c" /* yacc.c:1646 */ break; case 206: -#line 1993 "parse_y.y" /* yacc.c:1646 */ +#line 1994 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); } -#line 2894 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2895 "parse_y.tab.c" /* yacc.c:1646 */ break; case 207: -#line 1994 "parse_y.y" /* yacc.c:1646 */ +#line 1995 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); } -#line 2900 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2901 "parse_y.tab.c" /* yacc.c:1646 */ break; case 208: -#line 1995 "parse_y.y" /* yacc.c:1646 */ +#line 1996 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MIL_TO_COORD ((yyvsp[-1].number))); } -#line 2906 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2907 "parse_y.tab.c" /* yacc.c:1646 */ break; case 209: -#line 1996 "parse_y.y" /* yacc.c:1646 */ +#line 1997 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), INCH_TO_COORD ((yyvsp[-1].number))); } -#line 2912 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2913 "parse_y.tab.c" /* yacc.c:1646 */ break; case 210: -#line 1997 "parse_y.y" /* yacc.c:1646 */ +#line 1998 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); } -#line 2918 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2919 "parse_y.tab.c" /* yacc.c:1646 */ break; case 211: -#line 1998 "parse_y.y" /* yacc.c:1646 */ +#line 1999 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); } -#line 2924 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2925 "parse_y.tab.c" /* yacc.c:1646 */ break; case 212: -#line 1999 "parse_y.y" /* yacc.c:1646 */ +#line 2000 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number))); } -#line 2930 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2931 "parse_y.tab.c" /* yacc.c:1646 */ break; case 213: -#line 2000 "parse_y.y" /* yacc.c:1646 */ +#line 2001 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); } -#line 2936 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2937 "parse_y.tab.c" /* yacc.c:1646 */ break; case 214: -#line 2001 "parse_y.y" /* yacc.c:1646 */ +#line 2002 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); } -#line 2942 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2943 "parse_y.tab.c" /* yacc.c:1646 */ break; -#line 2946 "parse_y.tab.c" /* yacc.c:1646 */ +#line 2947 "parse_y.tab.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3170,7 +3171,7 @@ #endif return yyresult; } -#line 2004 "parse_y.y" /* yacc.c:1906 */ +#line 2005 "parse_y.y" /* yacc.c:1906 */ /* --------------------------------------------------------------------------- Index: trunk/src/parse_y.h =================================================================== --- trunk/src/parse_y.h (revision 1699) +++ trunk/src/parse_y.h (revision 1700) @@ -101,7 +101,7 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 110 "parse_y.y" /* yacc.c:1909 */ +#line 111 "parse_y.y" /* yacc.c:1909 */ int integer; double number; Index: trunk/src/parse_y.y =================================================================== --- trunk/src/parse_y.y (revision 1699) +++ trunk/src/parse_y.y (revision 1700) @@ -39,6 +39,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" #include "create.h" @@ -199,7 +200,7 @@ PCBTypePtr pcb_save = PCB; if (layer_group_string == NULL) - layer_group_string = strdup(Settings.Groups); + layer_group_string = strdup(conf_core.rc.groups); CreateNewPCBPost (yyPCB, 0); if (ParseGroupString(layer_group_string, &yyPCB->LayerGroups, yyData->LayerN)) { @@ -387,9 +388,9 @@ yyPCB->GridOffsetX = OU ($4); yyPCB->GridOffsetY = OU ($5); if ($6) - Settings.DrawGrid = true; + conf_core.editor.draw_grid = true; else - Settings.DrawGrid = false; + conf_core.editor.draw_grid = false; } ; @@ -400,9 +401,9 @@ yyPCB->GridOffsetX = NU ($4); yyPCB->GridOffsetY = NU ($5); if ($6) - Settings.DrawGrid = true; + conf_core.editor.draw_grid = true; else - Settings.DrawGrid = false; + conf_core.editor.draw_grid = false; } ; @@ -823,12 +824,12 @@ : T_RAT '[' measure measure INTEGER measure measure INTEGER flags ']' { CreateNewRat(yyData, NU ($3), NU ($4), NU ($6), NU ($7), $5, $8, - Settings.RatThickness, $9); + conf_core.design.rat_thickness, $9); } | T_RAT '(' measure measure INTEGER measure measure INTEGER INTEGER ')' { CreateNewRat(yyData, OU ($3), OU ($4), OU ($6), OU ($7), $5, $8, - Settings.RatThickness, OldFlags($9)); + conf_core.design.rat_thickness, OldFlags($9)); } ; Index: trunk/src/plug_footprint_host.c =================================================================== --- trunk/src/plug_footprint_host.c (revision 1699) +++ trunk/src/plug_footprint_host.c (revision 1700) @@ -32,6 +32,8 @@ #include #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "file.h" @@ -41,7 +43,7 @@ const char *fp_get_library_shell(void) { - return Settings.LibraryShell; + return conf_core.rc.library_shell; } /* This function loads the newlib footprints into the Library. @@ -102,7 +104,7 @@ /* List all footprint libraries. Then sort the whole * library. */ - if (fp_read_lib_all_(Settings.LibrarySearchPaths) > 0 || resultFP != NULL) { + if (fp_read_lib_all_(conf_core.rc.library_search_paths) > 0 || resultFP != NULL) { fp_sort_children(&library); return 0; } Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 1699) +++ trunk/src/polygon.c (revision 1700) @@ -72,6 +72,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 1699) +++ trunk/src/polygon_act.c (revision 1700) @@ -25,6 +25,8 @@ * */ #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "action_helper.h" @@ -115,7 +117,7 @@ static int ActionPolygon(int argc, char **argv, Coord x, Coord y) { char *function = ACTION_ARG(0); - if (function && Settings.Mode == POLYGON_MODE) { + if (function && conf_core.editor.mode == POLYGON_MODE) { notify_crosshair_change(false); switch (funchash_get(function, NULL)) { /* close open polygon if possible */ Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 1699) +++ trunk/src/rats.c (revision 1700) @@ -35,6 +35,7 @@ /* rats nest routines */ #include "config.h" +#include "conf_core.h" #include #include @@ -625,7 +626,7 @@ if ((line = CreateNewRat(PCB->Data, firstpoint->X, firstpoint->Y, secondpoint->X, secondpoint->Y, - firstpoint->group, secondpoint->group, Settings.RatThickness, NoFlags())) != NULL) { + firstpoint->group, secondpoint->group, conf_core.design.rat_thickness, NoFlags())) != NULL) { if (distance == 0) SET_FLAG(VIAFLAG, line); AddObjectToCreateUndoList(RATLINE_TYPE, line, line, line); @@ -722,7 +723,7 @@ } if (Warned) - Settings.RatWarn = true; + conf_core.editor.rat_warn = true; if (changed) { IncrementUndoSerialNumber(); @@ -913,7 +914,7 @@ return (CreateNewRat(PCB->Data, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, - Crosshair.AttachedLine.Point2.Y, group1, group2, Settings.RatThickness, NoFlags())); + Crosshair.AttachedLine.Point2.Y, group1, group2, conf_core.design.rat_thickness, NoFlags())); } Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 1699) +++ trunk/src/rats_act.c (revision 1700) @@ -25,6 +25,8 @@ * */ #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "action_helper.h" @@ -72,7 +74,7 @@ float len, small; if (function) { - if (Settings.RatWarn) + if (conf_core.editor.rat_warn) ClearWarnings(); switch (funchash_get(function, NULL)) { case F_AllRats: @@ -193,7 +195,7 @@ { char *function = ACTION_ARG(0); if (function) { - if (Settings.RatWarn) + if (conf_core.editor.rat_warn) ClearWarnings(); switch (funchash_get(function, NULL)) { case F_AllRats: Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 1699) +++ trunk/src/remove.c (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 1699) +++ trunk/src/search.c (revision 1700) @@ -32,6 +32,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 1699) +++ trunk/src/select.c (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 1699) +++ trunk/src/select_act.c (revision 1700) @@ -25,6 +25,8 @@ * */ #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "action_helper.h" @@ -213,7 +215,7 @@ case F_Convert: { Coord x, y; - Note.Buffer = Settings.BufferNumber; + Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); ClearBuffer(PASTEBUFFER); gui->get_coords(_("Select the Element's Mark Location"), &x, &y); Index: trunk/src/set.c =================================================================== --- trunk/src/set.c (revision 1699) +++ trunk/src/set.c (revision 1700) @@ -32,6 +32,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -71,7 +72,7 @@ PCB->GridOffsetY = Crosshair.Y % Grid; } PCB->Grid = Grid; - if (Settings.DrawGrid) + if (conf_core.editor.draw_grid) Redraw(); } } @@ -82,7 +83,7 @@ void SetLineSize(Coord Size) { if (Size >= MIN_LINESIZE && Size <= MAX_LINESIZE) { - Settings.LineThickness = Size; + conf_core.design.line_thickness = Size; if (TEST_FLAG(AUTODRCFLAG, PCB)) FitCrosshairIntoGrid(Crosshair.X, Crosshair.Y); } @@ -93,8 +94,8 @@ */ void SetViaSize(Coord Size, bool Force) { - if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIASIZE && Size >= Settings.ViaDrillingHole + MIN_PINORVIACOPPER)) { - Settings.ViaThickness = Size; + if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIASIZE && Size >= conf_core.design.via_drilling_hole + MIN_PINORVIACOPPER)) { + conf_core.design.via_thickness = Size; } } @@ -103,17 +104,17 @@ */ void SetViaDrillingHole(Coord Size, bool Force) { - if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIAHOLE && Size <= Settings.ViaThickness - MIN_PINORVIACOPPER)) { - Settings.ViaDrillingHole = Size; + if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIAHOLE && Size <= conf_core.design.via_thickness - MIN_PINORVIACOPPER)) { + conf_core.design.via_drilling_hole = Size; } } void pcb_use_route_style(RouteStyleType * rst) { - Settings.LineThickness = rst->Thick; - Settings.ViaThickness = rst->Diameter; - Settings.ViaDrillingHole = rst->Hole; - Settings.Keepaway = rst->Keepaway; + conf_core.design.line_thickness = rst->Thick; + conf_core.design.via_thickness = rst->Diameter; + conf_core.design.via_drilling_hole = rst->Hole; + conf_core.design.keepaway = rst->Keepaway; } /* --------------------------------------------------------------------------- @@ -122,7 +123,7 @@ void SetKeepawayWidth(Coord Width) { if (Width <= MAX_LINESIZE) { - Settings.Keepaway = Width; + conf_core.design.keepaway = Width; } } @@ -132,7 +133,7 @@ void SetTextScale(int Scale) { if (Scale <= MAX_TEXTSCALE && Scale >= MIN_TEXTSCALE) { - Settings.TextScale = Scale; + conf_core.design.text_scale = Scale; } } @@ -152,7 +153,7 @@ */ void SetCrosshairRangeToBuffer(void) { - if (Settings.Mode == PASTEBUFFER_MODE) { + if (conf_core.editor.mode == PASTEBUFFER_MODE) { SetBufferBoundingBox(PASTEBUFFER); SetCrosshairRange(PASTEBUFFER->X - PASTEBUFFER->BoundingBox.X1, PASTEBUFFER->Y - PASTEBUFFER->BoundingBox.Y1, @@ -168,7 +169,7 @@ void SetBufferNumber(int Number) { if (Number >= 0 && Number < MAX_BUFFER) { - Settings.BufferNumber = Number; + conf_core.editor.buffer_number = Number; /* do an update on the crosshair range */ SetCrosshairRangeToBuffer(); @@ -180,7 +181,7 @@ void SaveMode(void) { - mode_stack[mode_position] = Settings.Mode; + mode_stack[mode_position] = conf_core.editor.mode; if (mode_position < MAX_MODESTACK_DEPTH - 1) mode_position++; } @@ -221,7 +222,7 @@ Mode = NO_MODE; } } - if (Settings.Mode == LINE_MODE && Mode == ARC_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { + if (conf_core.editor.mode == LINE_MODE && Mode == ARC_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { Crosshair.AttachedLine.State = STATE_FIRST; Crosshair.AttachedBox.State = STATE_SECOND; Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Crosshair.AttachedLine.Point1.X; @@ -228,16 +229,16 @@ Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = Crosshair.AttachedLine.Point1.Y; AdjustAttachedObjects(); } - else if (Settings.Mode == ARC_MODE && Mode == LINE_MODE && Crosshair.AttachedBox.State != STATE_FIRST) { + else if (conf_core.editor.mode == ARC_MODE && Mode == LINE_MODE && Crosshair.AttachedBox.State != STATE_FIRST) { Crosshair.AttachedBox.State = STATE_FIRST; Crosshair.AttachedLine.State = STATE_SECOND; Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = Crosshair.AttachedBox.Point1.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = Crosshair.AttachedBox.Point1.Y; - Settings.Mode = Mode; + conf_core.editor.mode = Mode; AdjustAttachedObjects(); } else { - if (Settings.Mode == ARC_MODE || Settings.Mode == LINE_MODE) + if (conf_core.editor.mode == ARC_MODE || conf_core.editor.mode == LINE_MODE) SetLocalRef(0, 0, false); Crosshair.AttachedBox.State = STATE_FIRST; Crosshair.AttachedLine.State = STATE_FIRST; @@ -249,7 +250,7 @@ } } - Settings.Mode = Mode; + conf_core.editor.mode = Mode; if (Mode == PASTEBUFFER_MODE) /* do an update on the crosshair range */ Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 1699) +++ trunk/src/undo_act.c (revision 1700) @@ -25,6 +25,8 @@ * */ #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "action_helper.h" @@ -129,20 +131,20 @@ char *function = ACTION_ARG(0); if (!function || !*function) { /* don't allow undo in the middle of an operation */ - if (Settings.Mode != POLYGONHOLE_MODE && Crosshair.AttachedObject.State != STATE_FIRST) + if (conf_core.editor.mode != POLYGONHOLE_MODE && Crosshair.AttachedObject.State != STATE_FIRST) return 1; - if (Crosshair.AttachedBox.State != STATE_FIRST && Settings.Mode != ARC_MODE) + if (Crosshair.AttachedBox.State != STATE_FIRST && conf_core.editor.mode != ARC_MODE) return 1; /* undo the last operation */ notify_crosshair_change(false); - if ((Settings.Mode == POLYGON_MODE || Settings.Mode == POLYGONHOLE_MODE) && Crosshair.AttachedPolygon.PointN) { + if ((conf_core.editor.mode == POLYGON_MODE || conf_core.editor.mode == POLYGONHOLE_MODE) && Crosshair.AttachedPolygon.PointN) { GoToPreviousPoint(); notify_crosshair_change(true); return 0; } /* move anchor point if undoing during line creation */ - if (Settings.Mode == LINE_MODE) { + if (conf_core.editor.mode == LINE_MODE) { if (Crosshair.AttachedLine.State == STATE_SECOND) { if (TEST_FLAG(AUTODRCFLAG, PCB)) Undo(true); /* undo the connection find */ @@ -207,7 +209,7 @@ return 0; } } - if (Settings.Mode == ARC_MODE) { + if (conf_core.editor.mode == ARC_MODE) { if (Crosshair.AttachedBox.State == STATE_SECOND) { Crosshair.AttachedBox.State = STATE_FIRST; notify_crosshair_change(true); @@ -266,13 +268,13 @@ int ActionRedo(int argc, char **argv, Coord x, Coord y) { - if (((Settings.Mode == POLYGON_MODE || - Settings.Mode == POLYGONHOLE_MODE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == STATE_SECOND) + if (((conf_core.editor.mode == POLYGON_MODE || + conf_core.editor.mode == POLYGONHOLE_MODE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == STATE_SECOND) return 1; notify_crosshair_change(false); if (Redo(true)) { SetChangedFlag(true); - if (Settings.Mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { + if (conf_core.editor.mode == LINE_MODE && Crosshair.AttachedLine.State != STATE_FIRST) { LineType *line = linelist_last(&CURRENT->Line); Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = line->Point2.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = line->Point2.Y; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 1699) +++ trunk/src_plugins/autoroute/autoroute.c (revision 1700) @@ -53,6 +53,7 @@ */ #define NET_HEAP 1 #include "config.h" +#include "conf_core.h" #include "global.h" @@ -892,12 +893,12 @@ rd = (routedata_t *) malloc(sizeof(*rd)); memset((void *) rd, 0, sizeof(*rd)); /* create default style */ - rd->defaultstyle.Thick = Settings.LineThickness; - rd->defaultstyle.Diameter = Settings.ViaThickness; - rd->defaultstyle.Hole = Settings.ViaDrillingHole; - rd->defaultstyle.Keepaway = Settings.Keepaway; + rd->defaultstyle.Thick = conf_core.design.line_thickness; + rd->defaultstyle.Diameter = conf_core.design.via_thickness; + rd->defaultstyle.Hole = conf_core.design.via_drilling_hole; + rd->defaultstyle.Keepaway = conf_core.design.keepaway; rd->max_bloat = BLOAT(&rd->defaultstyle); - rd->max_keep = Settings.Keepaway; + rd->max_keep = conf_core.design.keepaway; /* create styles structures */ bbox.X1 = bbox.Y1 = 0; bbox.X2 = PCB->MaxWidth; @@ -1307,7 +1308,7 @@ #ifdef ROUTE_DEBUG /* only for debugging expansion areas */ /* makes a line on the solder layer silk surrounding the box */ -void showbox(BoxType b, Dimension thickness, int group) +void showbox(BoxType b, dimension_t thickness, int group) { LineTypePtr line; LayerTypePtr SLayer = LAYER_PTR(group); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 1699) +++ trunk/src_plugins/djopt/djopt.c (revision 1700) @@ -27,6 +27,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" @@ -276,7 +277,7 @@ { if (n <= 0) return 0; - return n - n % (Settings.Grid); + return n - n % (conf_core.editor.grid); } /* Avoid commonly used names. */ @@ -1437,9 +1438,9 @@ len = c->x + max; break; } - if (snap && max > Settings.Grid) { + if (snap && max > conf_core.editor.grid) { if (pull < 0) - len += Settings.Grid - 1; + len += conf_core.editor.grid - 1; len = gridsnap(len); } if ((fdir == RIGHT && len == cs[0]->y) || (fdir == DOWN && len == cs[0]->x)) @@ -2069,13 +2070,13 @@ } #if 0 - if (dist < Settings.Grid) { + if (dist < conf_core.editor.grid) { c->miter = 0; progress = 1; continue; } - dist -= dist % Settings.Grid; + dist -= dist % conf_core.editor.grid; #endif if (dist <= 0) { c->miter = 0; @@ -2587,7 +2588,7 @@ corner_s *c; #ifdef ENDIF - SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, Settings.ShowSolderSide, false); + SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, false); #endif hid_action("Busy"); Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 1699) +++ trunk/src_plugins/export_bom/bom.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -91,8 +92,8 @@ static int last_unit_value = -1; if (bom_options[HA_unit].default_val.int_value == last_unit_value) { - if (Settings.grid_unit) - bom_options[HA_unit].default_val.int_value = Settings.grid_unit->index; + if (conf_core.editor.grid_unit) + bom_options[HA_unit].default_val.int_value = conf_core.editor.grid_unit->index; else bom_options[HA_unit].default_val.int_value = get_unit_struct("mil")->index; last_unit_value = bom_options[HA_unit].default_val.int_value; Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 1699) +++ trunk/src_plugins/export_gcode/gcode.c (revision 1700) @@ -33,6 +33,7 @@ */ #include "config.h" +#include "conf_core.h" #include "plugins.h" #include @@ -230,8 +231,8 @@ static int last_unit_value = -1; if (gcode_attribute_list[HA_unit].default_val.int_value == last_unit_value) { - if (Settings.grid_unit) - gcode_attribute_list[HA_unit].default_val.int_value = Settings.grid_unit->index; + if (conf_core.editor.grid_unit) + gcode_attribute_list[HA_unit].default_val.int_value = conf_core.editor.grid_unit->index; else gcode_attribute_list[HA_unit].default_val.int_value = get_unit_struct("mil")->index; last_unit_value = gcode_attribute_list[HA_unit].default_val.int_value; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 1699) +++ trunk/src_plugins/export_png/png.c (revision 1700) @@ -25,6 +25,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -457,12 +458,13 @@ memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); save_flags = PCB->Flags; - saved_show_solder_side = Settings.ShowSolderSide; + saved_show_solder_side = conf_core.editor.show_solder_side; as_shown = options[HA_as_shown].int_value; if (!options[HA_as_shown].int_value) { CLEAR_FLAG(SHOWMASKFLAG, PCB); - Settings.ShowSolderSide = 0; +#warning TODO: this should not happen here + conf_core.editor.show_solder_side = 0; comp_layer = GetLayerGroupNumberByNumber(component_silk_layer); solder_layer = GetLayerGroupNumberByNumber(solder_silk_layer); @@ -506,11 +508,11 @@ lastbrush = (gdImagePtr) ((void *) -1); lastcap = -1; lastgroup = -1; - show_solder_side = Settings.ShowSolderSide; + show_solder_side = conf_core.editor.show_solder_side; in_mono = options[HA_mono].int_value; - if (!photo_mode && Settings.ShowSolderSide) { + if (!photo_mode && conf_core.editor.show_solder_side) { int i, j; for (i = 0, j = max_copper_layer - 1; i < j; i++, j--) { int k = LayerStack[i]; @@ -523,7 +525,7 @@ memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); PCB->Flags = save_flags; - Settings.ShowSolderSide = saved_show_solder_side; + conf_core.editor.show_solder_side = saved_show_solder_side; } static void blend(color_struct * dest, float a_amount, color_struct * a, color_struct * b) Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 1699) +++ trunk/src_plugins/export_ps/eps.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -275,7 +276,7 @@ fprintf(f, "1 dup neg scale\n"); fprintf(f, "%g dup scale\n", options[HA_scale].real_value); pcb_fprintf(f, "%mi %mi translate\n", -bounds->X1, -bounds->Y2); - if (options[HA_as_shown].int_value && Settings.ShowSolderSide) + if (options[HA_as_shown].int_value && conf_core.editor.show_solder_side) pcb_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2); linewidth = -1; lastcap = -1; Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 1699) +++ trunk/src_plugins/fontmode/fontmode.c (revision 1700) @@ -27,6 +27,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" @@ -81,11 +82,12 @@ if (hid_actionl("New", "Font", 0)) return 1; - Settings.grid_unit = get_unit_struct("mil"); - Settings.Bloat = PCB->Bloat = 1; - Settings.Shrink = PCB->Shrink = 1; - Settings.minWid = PCB->minWid = 1; - Settings.minSlk = PCB->minSlk = 1; +#warning TODO is this a good idea? + conf_core.editor.grid_unit = get_unit_struct("mil"); + conf_core.design.bloat = PCB->Bloat = 1; + conf_core.design.shrink = PCB->Shrink = 1; + conf_core.design.min_wid = PCB->minWid = 1; + conf_core.design.min_slk = PCB->minSlk = 1; MoveLayerToGroup(max_copper_layer + COMPONENT_LAYER, 0); MoveLayerToGroup(max_copper_layer + SOLDER_LAYER, 1); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/coord.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/coord.c (revision 1699) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/coord.c (revision 1700) @@ -1,5 +1,6 @@ #include "layout.h" #include "src/pcb-printf.h" +#include "src/conf_core.h" double mil2pcb_multiplier() { @@ -13,7 +14,7 @@ const char *current_grid_unit() { - const Unit *u = Settings.grid_unit; + const Unit *u = conf_core.editor.grid_unit; if (u == NULL) return ""; return u->suffix; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c (revision 1699) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c (revision 1700) @@ -2,6 +2,7 @@ #include #include "layout.h" #include "src/undo.h" +#include "src/conf_core.h" typedef struct flag_tr_s { Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 1699) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 1700) @@ -3,6 +3,7 @@ #include "layout.h" #include "src/misc.h" #include "src/draw.h" +#include "src/conf_core.h" #define layer_check(layer) \ if ((layer < 0) || (layer >= MAX_LAYER+2)) \ Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 1699) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 1700) @@ -4,6 +4,7 @@ #include "src/change.h" #include "src/misc.h" #include "src/move.h" +#include "src/conf_core.h" int layout_obj_coord(layout_object_t *obj, layout_object_coord_t coord) { Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 1699) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 1700) @@ -2,6 +2,7 @@ #include #include #include +#include "src/conf_core.h" #include "layout.h" #include "config.h" Index: trunk/src_plugins/hid_gtk/ghid-route-style-selector.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-route-style-selector.c (revision 1699) +++ trunk/src_plugins/hid_gtk/ghid-route-style-selector.c (revision 1700) @@ -10,6 +10,7 @@ #include #include "global.h" +#include "conf_core.h" #include "gtkhid.h" #include "gui.h" #include "pcb-printf.h" @@ -127,7 +128,7 @@ GtkWidget *label_w = gtk_label_new(label); gtk_misc_set_alignment(GTK_MISC(label_w), 1.0, 0.5); - *entry = ghid_coord_entry_new(min, max, 0, Settings.grid_unit, CE_SMALL); + *entry = ghid_coord_entry_new(min, max, 0, conf_core.editor.grid_unit, CE_SMALL); gtk_table_attach(GTK_TABLE(table), label_w, 0, 1, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2); gtk_table_attach(GTK_TABLE(table), *entry, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2); } Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include @@ -117,7 +118,7 @@ rv = g_new0(hid_gc_struct, 1); rv->me_pointer = &ghid_hid; - rv->colorname = g_strdup(Settings.BackgroundColor); + rv->colorname = g_strdup(conf_core.appearance.color.background); return rv; } @@ -140,12 +141,12 @@ int n, i; render_priv *priv = gport->render_priv; - if (!Settings.DrawGrid) + if (!conf_core.editor.draw_grid) return; if (Vz(PCB->Grid) < MIN_GRID_DISTANCE) return; if (!priv->grid_gc) { - if (gdk_color_parse(Settings.GridColor, &gport->grid_color)) { + if (gdk_color_parse(conf_core.appearance.color.grid, &gport->grid_color)) { gport->grid_color.red ^= gport->bg_color.red; gport->grid_color.green ^= gport->bg_color.green; gport->grid_color.blue ^= gport->bg_color.blue; @@ -924,7 +925,7 @@ gdk_gc_set_clip_origin(xor_gc, 0, 0); set_clip(priv, xor_gc); /* FIXME: when CrossColor changed from config */ - ghid_map_color_string(Settings.CrossColor, &cross_color); + ghid_map_color_string(conf_core.appearance.color.cross, &cross_color); } x = DRAW_X(gport->crosshair_x); y = DRAW_Y(gport->crosshair_y); Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 1700) @@ -172,7 +172,7 @@ rv = g_new0(hid_gc_struct, 1); rv->me_pointer = &ghid_hid; - rv->colorname = Settings.BackgroundColor; + rv->colorname = conf_core.appearance.color.background; rv->alpha_mult = 1.0; return rv; } @@ -182,7 +182,7 @@ if (Vz(PCB->Grid) < MIN_GRID_DISTANCE) return; - if (gdk_color_parse(Settings.GridColor, &gport->grid_color)) { + if (gdk_color_parse(conf_core.appearance.color.grid, &gport->grid_color)) { gport->grid_color.red ^= gport->bg_color.red; gport->grid_color.green ^= gport->bg_color.green; gport->grid_color.blue ^= gport->bg_color.blue; @@ -685,7 +685,7 @@ if (!done_once) { done_once = 1; /* FIXME: when CrossColor changed from config */ - ghid_map_color_string(Settings.CrossColor, &cross_color); + ghid_map_color_string(conf_core.appearance.color.cross, &cross_color); } x = gport->crosshair_x; y = gport->crosshair_y; Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -352,7 +353,7 @@ static gboolean ghid_timer(GuiTimer * timer) { (*timer->func) (timer->user_data); - ghid_mode_cursor(Settings.Mode); + ghid_mode_cursor(conf_core.editor.mode); return FALSE; /* Turns timer off */ } @@ -403,7 +404,7 @@ x.ptr = (void *) watch; watch->func(x, watch->fd, pcb_condition, watch->user_data); - ghid_mode_cursor(Settings.Mode); + ghid_mode_cursor(conf_core.editor.mode); return TRUE; /* Leave watch on */ } @@ -1008,7 +1009,7 @@ if (argc > 0) ghid_point_cursor(); else - ghid_mode_cursor(Settings.Mode); + ghid_mode_cursor(conf_core.editor.mode); return 0; } @@ -1021,7 +1022,7 @@ ghid_route_style_selector_sync (GHID_ROUTE_STYLE_SELECTOR(ghidgui->route_style_selector), - Settings.LineThickness, Settings.ViaDrillingHole, Settings.ViaThickness, Settings.Keepaway); + conf_core.design.line_thickness, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.keepaway); return 0; } @@ -1102,20 +1103,20 @@ function = argc ? argv[0] : (char *) "Layout"; if (strcasecmp(function, "Netlist") == 0) { - name = ghid_dialog_file_select_open(_("Load netlist file"), ¤t_netlist_dir, Settings.FilePath); + name = ghid_dialog_file_select_open(_("Load netlist file"), ¤t_netlist_dir, conf_core.rc.file_path); } else if (strcasecmp(function, "ElementToBuffer") == 0) { - name = ghid_dialog_file_select_open(_("Load element to buffer"), ¤t_element_dir, Settings.LibrarySearchPaths); + name = ghid_dialog_file_select_open(_("Load element to buffer"), ¤t_element_dir, conf_core.rc.library_search_paths); } else if (strcasecmp(function, "LayoutToBuffer") == 0) { - name = ghid_dialog_file_select_open(_("Load layout file to buffer"), ¤t_layout_dir, Settings.FilePath); + name = ghid_dialog_file_select_open(_("Load layout file to buffer"), ¤t_layout_dir, conf_core.rc.file_path); } else if (strcasecmp(function, "Layout") == 0) { - name = ghid_dialog_file_select_open(_("Load layout file"), ¤t_layout_dir, Settings.FilePath); + name = ghid_dialog_file_select_open(_("Load layout file"), ¤t_layout_dir, conf_core.rc.file_path); } if (name) { - if (Settings.verbose) + if (conf_core.rc.verbose) fprintf(stderr, "%s: Calling LoadFrom(%s, %s)\n", __FUNCTION__, function, name); hid_actionl("LoadFrom", function, name, NULL); g_free(name); @@ -1166,10 +1167,10 @@ else prompt = _("Save layout as"); - name = ghid_dialog_file_select_save(prompt, ¤t_dir, PCB->Filename, Settings.FilePath); + name = ghid_dialog_file_select_save(prompt, ¤t_dir, PCB->Filename, conf_core.rc.file_path); if (name) { - if (Settings.verbose) + if (conf_core.rc.verbose) fprintf(stderr, "%s: Calling SaveTo(%s, %s)\n", __FUNCTION__, function, name); if (strcasecmp(function, "PasteBuffer") == 0) @@ -1255,7 +1256,7 @@ case 'r': case 'R': ghid_flip_view(gport->pcb_x, gport->pcb_y, true, true); - Settings.ShowSolderSide = !Settings.ShowSolderSide; /* Swapped back below */ + conf_core.editor.show_solder_side = !conf_core.editor.show_solder_side; /* Swapped back below */ break; default: return 1; @@ -1262,10 +1263,10 @@ } } - Settings.ShowSolderSide = !Settings.ShowSolderSide; + conf_core.editor.show_solder_side = !conf_core.editor.show_solder_side; if ((active_group == comp_group && comp_on && !solder_on) || (active_group == solder_group && solder_on && !comp_on)) { - bool new_solder_vis = Settings.ShowSolderSide; + bool new_solder_vis = conf_core.editor.show_solder_side; ChangeGroupVisibility(PCB->LayerGroups.Entries[comp_group][0], !new_solder_vis, !new_solder_vis); ChangeGroupVisibility(PCB->LayerGroups.Entries[solder_group][0], new_solder_vis, new_solder_vis); @@ -1615,8 +1616,11 @@ new_unit = get_unit_struct(argv[0]); if (new_unit != NULL && new_unit->allow != NO_PRINT) { - Settings.grid_unit = new_unit; + conf_core.editor.grid_unit = new_unit; +#warning TODO +#if 0 Settings.increments = get_increments_struct(Settings.grid_unit->suffix); +#endif AttributePut(PCB, "PCB::grid::unit", argv[0]); } @@ -1781,7 +1785,7 @@ return 1; - name = ghid_dialog_file_select_open(_("Load schematics"), ¤t_layout_dir, Settings.FilePath); + name = ghid_dialog_file_select_open(_("Load schematics"), ¤t_layout_dir, conf_core.rc.file_path); #ifdef DEBUG printf("File selected = %s\n", name); Index: trunk/src_plugins/hid_gtk/gui-command-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-command-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-command-window.c (revision 1700) @@ -29,6 +29,7 @@ /* This file written by Bill Wilson for the PCB Gtk port */ #include "config.h" +#include "conf_core.h" #include "gui.h" #include @@ -414,7 +415,7 @@ if (ghidgui->use_command_window) ghid_command_window_show(raise); else { - command = ghid_command_entry_get(_("Enter command:"), (Settings.SaveLastCommand && previous) ? previous : (gchar *) ""); + command = ghid_command_entry_get(_("Enter command:"), (conf_core.editor.save_last_command && previous) ? previous : (gchar *) ""); if (command != NULL) { /* copy new comand line to save buffer */ g_free(previous); Index: trunk/src_plugins/hid_gtk/gui-config.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-config.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-config.c (revision 1700) @@ -26,8 +26,8 @@ */ #include "config.h" +#include "conf_core.h" - #ifdef HAVE_STDLIB_H #include #endif @@ -619,7 +619,7 @@ if (!f) return; - if (Settings.verbose) + if (conf_core.rc.verbose) printf("Loading pcbrc file: %s\n", path); while (fgets(buf, sizeof(buf), f)) { argv = &(av[0]); @@ -666,18 +666,20 @@ (*argv)++; parse_optionv(argc, argv, TRUE); +#warning TODO: check why we write conf_core here if (board_size_override && sscanf(board_size_override, "%dx%d", &width, &height) == 2) { - Settings.MaxWidth = TO_PCB_UNITS(width); - Settings.MaxHeight = TO_PCB_UNITS(height); + conf_core.design.max_width = TO_PCB_UNITS(width); + conf_core.design.max_height = TO_PCB_UNITS(height); } if (lib_newlib_config && *lib_newlib_config) add_to_paths_list(&lib_newlib_list, lib_newlib_config); +#warning TODO: check why we write conf_core here for (list = lib_newlib_list; list; list = list->next) { - str = Settings.LibrarySearchPaths; + str = conf_core.rc.library_search_paths; dir = expand_dir((gchar *) list->data); - Settings.LibrarySearchPaths = g_strconcat(str, PCB_PATH_DELIMETER, dir, NULL); + conf_core.rc.library_search_paths = g_strconcat(str, PCB_PATH_DELIMETER, dir, NULL); g_free(dir); g_free(str); } @@ -777,7 +779,8 @@ static void config_backup_spin_button_cb(GtkSpinButton * spin_button, gpointer data) { - Settings.BackupInterval = gtk_spin_button_get_value_as_int(spin_button); +#warning TODO: this should be more generic and not write this value directly + conf_core.rc.backup_interval = gtk_spin_button_get_value_as_int(spin_button); EnableAutosave(); ghidgui->config_modified = TRUE; } @@ -811,11 +814,12 @@ _("Alternate window layout to allow smaller vertical size")); vbox = ghid_category_vbox(tab_vbox, _("Backups"), 4, 2, TRUE, TRUE); - ghid_check_button_connected(vbox, NULL, Settings.SaveInTMP, +#warning this all should be more generic code... + ghid_check_button_connected(vbox, NULL, conf_core.editor.save_in_tmp, TRUE, FALSE, FALSE, 2, - config_general_toggle_cb, &Settings.SaveInTMP, + config_general_toggle_cb, &conf_core.editor.save_in_tmp, _("If layout is modified at exit, save into PCB.%i.save")); - ghid_spin_button(vbox, NULL, Settings.BackupInterval, 0.0, 60 * 60, 60.0, + ghid_spin_button(vbox, NULL, conf_core.rc.backup_interval, 0.0, 60 * 60, 60.0, 600.0, 0, 0, config_backup_spin_button_cb, NULL, FALSE, _("Seconds between auto backups\n" "(set to zero to disable auto backups)")); @@ -848,20 +852,22 @@ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(use_board_size_default_button)); if (active) { - Settings.MaxWidth = new_board_width; - Settings.MaxHeight = new_board_height; +#warning TODO: no direct overwrite + conf_core.design.max_width = new_board_width; + conf_core.design.max_height = new_board_height; ghidgui->config_modified = TRUE; } active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(use_drc_sizes_default_button)); if (active) { - Settings.Bloat = PCB->Bloat; - Settings.Shrink = PCB->Shrink; - Settings.minWid = PCB->minWid; - Settings.minSlk = PCB->minSlk; - Settings.IsleArea = PCB->IsleArea; - Settings.minDrill = PCB->minDrill; - Settings.minRing = PCB->minRing; +#warning TODO: no direct overwrite + conf_core.design.bloat = PCB->Bloat; + conf_core.design.shrink = PCB->Shrink; + conf_core.design.min_wid = PCB->minWid; + conf_core.design.min_slk = PCB->minSlk; + conf_core.design.poly_isle_area = PCB->IsleArea; + conf_core.design.min_drill = PCB->minDrill; + conf_core.design.min_ring = PCB->minRing; ghidgui->config_modified = TRUE; } @@ -924,10 +930,10 @@ gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0); gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 3); - +#warning TODO: more generic code ghid_table_spin_button(table, 0, 0, &config_text_spin_button, - Settings.TextScale, - MIN_TEXTSCALE, MAX_TEXTSCALE, 10.0, 10.0, 0, 0, text_spin_button_cb, &Settings.TextScale, FALSE, "%"); + conf_core.design.text_scale, + MIN_TEXTSCALE, MAX_TEXTSCALE, 10.0, 10.0, 0, 0, text_spin_button_cb, &conf_core.design.text_scale, FALSE, "%"); /* ---- DRC Sizes ---- */ @@ -998,6 +1004,8 @@ config_increments_tab_vbox = tab_vbox; } +#warning TODO: increment is disbaled in conf_core - figure how to do this +#if 0 /* ---- Grid Increment/Decrement ---- */ vbox = ghid_category_vbox(config_increments_vbox, _("Grid Increment/Decrement"), 4, 2, TRUE, TRUE); @@ -1008,7 +1016,6 @@ Settings.increments->grid_max, CE_SMALL, 0, increment_spin_button_cb, target, FALSE, _("For 'g' and 'g' grid change actions")); - /* ---- Size Increment/Decrement ---- */ vbox = ghid_category_vbox(config_increments_vbox, _("Size Increment/Decrement"), 4, 2, TRUE, TRUE); @@ -1045,6 +1052,7 @@ target, FALSE, _("For 'k' and 'k' line clearance inside polygon size\n" "change actions")); gtk_widget_show_all(config_increments_vbox); +#endif } /* -------------- The Library config page ---------------- @@ -1221,7 +1229,7 @@ if (dup_string(&layer->Name, s)) layers_modified = TRUE; /* FIXME */ - if (use_as_default && dup_string(&Settings.DefaultLayerName[i], s)) + if (use_as_default && dup_string(&conf_core.design.default_layer_name[i], s)) ghidgui->config_modified = TRUE; } @@ -1266,12 +1274,15 @@ groups_modified = FALSE; } if (use_as_default) { +#warning TODO: this should happen here, should be done centrally, pcb->lihata +#if 0 s = make_layer_group_string(&PCB->LayerGroups); - if (dup_string(&Settings.Groups, s)) { - ParseGroupString(Settings.Groups, &Settings.LayerGroups, max_copper_layer); + if (dup_string(&conf_core.design.groups, s)) { + ParseGroupString(conf_core.design.groups, &Settings.LayerGroups, max_copper_layer); ghidgui->config_modified = TRUE; } g_free(s); +#endif } } @@ -1752,7 +1763,7 @@ void ghid_config_handle_units_changed(void) { char *text = pcb_strdup_printf("%s", - Settings.grid_unit->in_suffix); + conf_core.editor.grid_unit->in_suffix); ghid_set_cursor_position_labels(); gtk_label_set_markup(GTK_LABEL(ghidgui->grid_units_label), text); free(text); @@ -1773,7 +1784,7 @@ void ghid_config_text_scale_update(void) { if (config_window) - gtk_spin_button_set_value(GTK_SPIN_BUTTON(config_text_spin_button), (gdouble) Settings.TextScale); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(config_text_spin_button), (gdouble) conf_core.design.text_scale); } static void config_close_cb(gpointer data) Index: trunk/src_plugins/hid_gtk/gui-dialog-print.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-dialog-print.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-dialog-print.c (revision 1700) @@ -29,6 +29,7 @@ /* This file written by Bill Wilson for the PCB Gtk port. */ #include "config.h" +#include "conf_core.h" #ifdef HAVE_STDLIB_H #include @@ -156,7 +157,7 @@ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); entry = ghid_coord_entry_new(attrs[j].min_val, attrs[j].max_val, - attrs[j].default_val.coord_value, Settings.grid_unit, CE_SMALL); + attrs[j].default_val.coord_value, conf_core.editor.grid_unit, CE_SMALL); gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); if (attrs[j].default_val.str_value != NULL) gtk_entry_set_text(GTK_ENTRY(entry), attrs[j].default_val.str_value); Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 1700) @@ -27,6 +27,7 @@ */ #include "config.h" +#include "conf_core.h" #include "error.h" #include "search.h" @@ -534,7 +535,7 @@ " \n" "Required: %$mS" "", - Settings.grid_unit->allow, + conf_core.editor.grid_unit->allow, renderer->violation->title, renderer->violation->measured_value, renderer->violation->explanation, renderer->violation->required_value); @@ -547,7 +548,7 @@ " \n" "Required: %$mS" "", - Settings.grid_unit->allow, + conf_core.editor.grid_unit->allow, renderer->violation->title, renderer->violation->explanation, renderer->violation->required_value); } @@ -776,7 +777,7 @@ gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); gtk_widget_realize(drc_window); - if (Settings.AutoPlace) + if (conf_core.editor.auto_place) gtk_window_move(GTK_WINDOW(drc_window), 10, 10); gtk_widget_show_all(drc_window); } Index: trunk/src_plugins/hid_gtk/gui-library-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-library-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-library-window.c (revision 1700) @@ -54,6 +54,7 @@ */ #include "config.h" +#include "conf_core.h" #include "gui.h" #include "global.h" @@ -157,7 +158,7 @@ gtk_window_set_wmclass(GTK_WINDOW(library_window), "PCB_Library", "PCB"); gtk_widget_realize(library_window); - if (Settings.AutoPlace) + if (conf_core.editor.auto_place) gtk_window_move(GTK_WINDOW(library_window), 10, 10); gtk_editable_select_region(GTK_EDITABLE(GHID_LIBRARY_WINDOW(library_window)->entry_filter), 0, -1); Index: trunk/src_plugins/hid_gtk/gui-log-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-log-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-log-window.c (revision 1700) @@ -30,6 +30,7 @@ */ #include "config.h" +#include "conf_core.h" #include "gui.h" #include "pcb-printf.h" @@ -92,7 +93,7 @@ gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); gtk_widget_realize(log_window); - if (Settings.AutoPlace) + if (conf_core.editor.auto_place) gtk_window_move(GTK_WINDOW(log_window), 10, 10); } Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-misc.c (revision 1700) @@ -25,6 +25,7 @@ /* This file was originally written by Bill Wilson for the PCB Gtk port */ #include "config.h" +#include "conf_core.h" #include "global.h" #include "crosshair.h" @@ -362,16 +363,16 @@ "line=%mS " "via=%mS (%mS) %s" "clearance=%mS " "text=%i%% " "buffer=#%i"), - Settings.grid_unit->allow, - Settings.ShowSolderSide ? _("solder") : _("component"), + conf_core.editor.grid_unit->allow, + conf_core.editor.show_solder_side ? _("solder") : _("component"), PCB->Grid, flag, TEST_FLAG(RUBBERBANDFLAG, PCB) ? ",R " : " ", - Settings.LineThickness, - Settings.ViaThickness, - Settings.ViaDrillingHole, + conf_core.design.line_thickness, + conf_core.design.via_thickness, + conf_core.design.via_drilling_hole, ghidgui->compact_horizontal ? "\n" : "", - Settings.Keepaway, - Settings.TextScale, Settings.BufferNumber + 1); + conf_core.design.keepaway, + conf_core.design.text_scale, conf_core.editor.buffer_number + 1); ghid_status_line_set_text(text); free(text); @@ -390,7 +391,7 @@ Coord r = Distance(Crosshair.X, Crosshair.Y, Marked.X, Marked.Y); double a = atan2(dy, dx) * RAD_TO_DEG; - text = pcb_strdup_printf("%m+r %-mS; phi %-.1f; %-mS %-mS", Settings.grid_unit->allow, r, a, dx, dy); + text = pcb_strdup_printf("%m+r %-mS; phi %-.1f; %-mS %-mS", conf_core.editor.grid_unit->allow, r, a, dx, dy); ghid_cursor_position_relative_label_set_text(text); free(text); } @@ -398,7 +399,7 @@ ghid_cursor_position_relative_label_set_text("r __.__; phi __._; __.__ __.__"); - text = pcb_strdup_printf("%m+%-mS %-mS", Settings.grid_unit->allow, Crosshair.X, Crosshair.Y); + text = pcb_strdup_printf("%m+%-mS %-mS", conf_core.editor.grid_unit->allow, Crosshair.X, Crosshair.Y); ghid_cursor_position_label_set_text(text); free(text); } Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 1700) @@ -31,6 +31,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -764,7 +765,7 @@ gtk_widget_realize(netlist_window); - if (Settings.AutoPlace) + if (conf_core.editor.auto_place) gtk_window_move(GTK_WINDOW(netlist_window), 10, 10); } Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 1700) @@ -27,6 +27,7 @@ /* This file written by Bill Wilson for the PCB Gtk port */ #include "config.h" +#include "conf_core.h" #include "gui.h" #include "gtkhid.h" @@ -130,13 +131,13 @@ static gboolean ghid_idle_cb(gpointer data) { - if (Settings.Mode == NO_MODE) + if (conf_core.editor.mode == NO_MODE) SetMode(ARROW_MODE); - ghid_mode_cursor(Settings.Mode); - if (ghidgui->settings_mode != Settings.Mode) { + ghid_mode_cursor(conf_core.editor.mode); + if (ghidgui->settings_mode != conf_core.editor.mode) { ghid_mode_buttons_update(); } - ghidgui->settings_mode = Settings.Mode; + ghidgui->settings_mode = conf_core.editor.mode; ghid_update_toggle_flags(); return FALSE; @@ -259,12 +260,12 @@ if (!first_time_done) { gport->colormap = gtk_widget_get_colormap(gport->top_window); - if (gdk_color_parse(Settings.BackgroundColor, &gport->bg_color)) + if (gdk_color_parse(conf_core.appearance.color.background, &gport->bg_color)) gdk_color_alloc(gport->colormap, &gport->bg_color); else gdk_color_white(gport->colormap, &gport->bg_color); - if (gdk_color_parse(Settings.OffLimitColor, &gport->offlimits_color)) + if (gdk_color_parse(conf_core.appearance.color.off_limit, &gport->offlimits_color)) gdk_color_alloc(gport->colormap, &gport->offlimits_color); else gdk_color_white(gport->colormap, &gport->offlimits_color); Index: trunk/src_plugins/hid_gtk/gui-pinout-preview.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-pinout-preview.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-pinout-preview.c (revision 1700) @@ -30,6 +30,7 @@ * gui-pinout-window.c, written by Bill Wilson for the PCB Gtk port */ #include "config.h" +#include "conf_core.h" #include "global.h" @@ -52,8 +53,8 @@ { float scale = SENSIBLE_VIEW_SCALE; - pinout->x_max = pinout->element.BoundingBox.X2 + Settings.PinoutOffsetX; - pinout->y_max = pinout->element.BoundingBox.Y2 + Settings.PinoutOffsetY; + pinout->x_max = pinout->element.BoundingBox.X2 + conf_core.appearance.pinout.offset_x; + pinout->y_max = pinout->element.BoundingBox.Y2 + conf_core.appearance.pinout.offset_y; pinout->w_pixels = scale * (pinout->element.BoundingBox.X2 - pinout->element.BoundingBox.X1); pinout->h_pixels = scale * (pinout->element.BoundingBox.Y2 - pinout->element.BoundingBox.Y1); } @@ -89,8 +90,8 @@ MoveElementLowLevel(NULL, &pinout->element, - Settings.PinoutOffsetX - - pinout->element.BoundingBox.X1, Settings.PinoutOffsetY - pinout->element.BoundingBox.Y1); + conf_core.appearance.pinout.offset_x - + pinout->element.BoundingBox.X1, conf_core.appearance.pinout.offset_y - pinout->element.BoundingBox.Y1); pinout_set_view(pinout); Index: trunk/src_plugins/hid_gtk/gui-pinout-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-pinout-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-pinout-window.c (revision 1700) @@ -29,6 +29,7 @@ /* This file written by Bill Wilson for the PCB Gtk port */ #include "config.h" +#include "conf_core.h" #include "global.h" @@ -89,7 +90,7 @@ gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); gtk_widget_realize(top_window); - if (Settings.AutoPlace) + if (conf_core.editor.auto_place) gtk_window_move(GTK_WINDOW(top_window), 10, 10); gtk_widget_show_all(top_window); } Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 1700) @@ -35,7 +35,7 @@ -what about stuff like this: /* Set to ! because ActionDisplay toggles it */ -Settings.DrawGrid = !gtk_toggle_action_get_active(action); +conf_core.editor.draw_grid = !gtk_toggle_action_get_active(action); ghidgui->config_modified = TRUE; hid_actionl("Display", "Grid", "", NULL); ghid_set_status_line_label(); @@ -59,6 +59,8 @@ | there in ghid_port_key_press_cb(). */ #include "config.h" +#include "conf_core.h" + #include #ifdef HAVE_LOCALE_H #include @@ -400,37 +402,37 @@ switch (i) { case LAYER_BUTTON_SILK: - *color_string = Settings.ElementColor; + *color_string = conf_core.appearance.color.element; *text = _("silk"); *set = PCB->ElementOn; break; case LAYER_BUTTON_RATS: - *color_string = Settings.RatColor; + *color_string = conf_core.appearance.color.rat; *text = _("rat lines"); *set = PCB->RatOn; break; case LAYER_BUTTON_PINS: - *color_string = Settings.PinColor; + *color_string = conf_core.appearance.color.pin; *text = _("pins/pads"); *set = PCB->PinOn; break; case LAYER_BUTTON_VIAS: - *color_string = Settings.ViaColor; + *color_string = conf_core.appearance.color.via; *text = _("vias"); *set = PCB->ViaOn; break; case LAYER_BUTTON_FARSIDE: - *color_string = Settings.InvisibleObjectsColor; + *color_string = conf_core.appearance.color.invisible_objects; *text = _("far side"); *set = PCB->InvisibleObjectsOn; break; case LAYER_BUTTON_MASK: - *color_string = Settings.MaskColor; + *color_string = conf_core.appearance.color.mask; *text = _("solder mask"); *set = TEST_FLAG(SHOWMASKFLAG, PCB); break; default: /* layers */ - *color_string = Settings.LayerColor[i]; + *color_string = conf_core.appearance.color.layer[i]; *text = (char *) UNKNOWN(PCB->Data->Layer[i].Name); *set = PCB->Data->Layer[i].On; break; @@ -570,7 +572,7 @@ static void grid_units_button_cb(GtkWidget * widget, gpointer data) { /* Button only toggles between mm and mil */ - if (Settings.grid_unit == get_unit_struct("mm")) + if (conf_core.editor.grid_unit == get_unit_struct("mm")) hid_actionl("SetUnits", "mil", NULL); else hid_actionl("SetUnits", "mm", NULL); @@ -609,7 +611,7 @@ */ ghidgui->grid_units_button = gtk_button_new(); label = gtk_label_new(""); - gtk_label_set_markup(GTK_LABEL(label), Settings.grid_unit->in_suffix); + gtk_label_set_markup(GTK_LABEL(label), conf_core.editor.grid_unit->in_suffix); ghidgui->grid_units_label = label; gtk_label_set_use_markup(GTK_LABEL(label), TRUE); gtk_container_add(GTK_CONTAINER(ghidgui->grid_units_button), label); @@ -732,8 +734,9 @@ static void route_styles_edited_cb(GHidRouteStyleSelector * rss, gboolean save, gpointer data) { if (save) { - g_free(Settings.Routes); - Settings.Routes = make_route_string(PCB->RouteStyle, NUM_STYLES); +#warning TODO: shouldn't write directly +// g_free(conf_core.design.routes); + conf_core.rc.routes = make_route_string(PCB->RouteStyle, NUM_STYLES); ghidgui->config_modified = TRUE; ghid_config_files_write(); } @@ -834,7 +837,7 @@ for (i = 0; i < n_mode_buttons; ++i) { mb = &mode_buttons[i]; - if (Settings.Mode == mb->mode) { + if (conf_core.editor.mode == mb->mode) { g_signal_handler_block(mb->button, mb->button_cb_id); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->button), TRUE); g_signal_handler_unblock(mb->button, mb->button_cb_id); @@ -1421,7 +1424,8 @@ sprintf(libdir, "%s%s", tmps, REST_OF_PATH); free(tmps); - Settings.LibraryTree = libdir; +#warning TODO: why do we write it here? + conf_core.rc.library_tree = libdir; #undef REST_OF_PATH @@ -1461,10 +1465,11 @@ ghid_config_files_read(argc, argv); - Settings.AutoPlace = 0; +#warning TODO: don't write conf_core + conf_core.editor.auto_place = 0; for (i = 0; i < *argc; i++) { if (strcmp((*argv)[i], "-auto-place") == 0) - Settings.AutoPlace = 1; + conf_core.editor.auto_place = 1; } #ifdef ENABLE_NLS @@ -1482,7 +1487,7 @@ gtk_window_set_title(GTK_WINDOW(window), "PCB"); gtk_window_set_default_size(GTK_WINDOW(window), ghidgui->top_window_width, ghidgui->top_window_height); - if (Settings.AutoPlace) + if (conf_core.editor.auto_place) gtk_window_move(GTK_WINDOW(window), 10, 10); gtk_widget_show_all(gport->top_window); Index: trunk/src_plugins/hid_gtk/gui-utils.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-utils.c (revision 1699) +++ trunk/src_plugins/hid_gtk/gui-utils.c (revision 1700) @@ -29,6 +29,7 @@ */ #include "config.h" +#include "conf_core.h" #include "gui.h" #include @@ -244,7 +245,7 @@ box = hbox; } - entry_widget = ghid_coord_entry_new(low, high, value, Settings.grid_unit, step_size); + entry_widget = ghid_coord_entry_new(low, high, value, conf_core.editor.grid_unit, step_size); if (coord_entry) *coord_entry = entry_widget; if (width > 0) @@ -324,7 +325,7 @@ if (!table) return; - entry_widget = ghid_coord_entry_new(low, high, value, Settings.grid_unit, step_size); + entry_widget = ghid_coord_entry_new(low, high, value, conf_core.editor.grid_unit, step_size); if (coord_entry) *coord_entry = entry_widget; if (width > 0) Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 1699) +++ trunk/src_plugins/hid_gtk/gui.h (revision 1700) @@ -61,8 +61,8 @@ | PCB keeps values internally higher precision, but gui | widgets (spin buttons, labels, etc) need mils or millimeters. */ -#define FROM_PCB_UNITS(v) coord_to_unit (Settings.grid_unit, v) -#define TO_PCB_UNITS(v) unit_to_coord (Settings.grid_unit, v) +#define FROM_PCB_UNITS(v) coord_to_unit (conf_core.editor.grid_unit, v) +#define TO_PCB_UNITS(v) unit_to_coord (conf_core.editor.grid_unit, v) #define SIDE_X(x) ((gport->view.flip_x ? PCB->MaxWidth - (x) : (x))) #define SIDE_Y(y) ((gport->view.flip_y ? PCB->MaxHeight - (y) : (y))) Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 1699) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -1037,7 +1038,7 @@ char *buf = XmTextGetString(w); if (!pcbu) return strtol(buf, NULL, 0); - return GetValueEx(buf, NULL, NULL, NULL, Settings.grid_unit->suffix); + return GetValueEx(buf, NULL, NULL, NULL, conf_core.editor.grid_unit->suffix); } static void sz_val2str(Widget w, Coord u, int pcbu) @@ -1044,7 +1045,7 @@ { static char buf[40]; if (pcbu) - pcb_sprintf(buf, "%m+%.2mS", Settings.grid_unit->allow, u); + pcb_sprintf(buf, "%m+%.2mS", conf_core.editor.grid_unit->allow, u); else pcb_snprintf(buf, sizeof(buf), "%#mS %%", u); XmTextSetString(w, buf); @@ -1060,14 +1061,15 @@ PCB->minSlk = sz_str2val(sz_drc_slk, 1); PCB->minDrill = sz_str2val(sz_drc_drill, 1); PCB->minRing = sz_str2val(sz_drc_ring, 1); - Settings.TextScale = sz_str2val(sz_text, 0); +#warning do not directly modify these + conf_core.design.text_scale = sz_str2val(sz_text, 0); - Settings.Bloat = PCB->Bloat; - Settings.Shrink = PCB->Shrink; - Settings.minWid = PCB->minWid; - Settings.minSlk = PCB->minSlk; - Settings.minDrill = PCB->minDrill; - Settings.minRing = PCB->minRing; + conf_core.design.bloat = PCB->Bloat; + conf_core.design.shrink = PCB->Shrink; + conf_core.design.min_wid = PCB->minWid; + conf_core.design.min_slk = PCB->minSlk; + conf_core.design.min_drill = PCB->minDrill; + conf_core.design.min_ring = PCB->minRing; SetCrosshairRange(0, 0, PCB->MaxWidth, PCB->MaxHeight); lesstif_pan_fixup(); @@ -1086,9 +1088,9 @@ sz_val2str(sz_drc_slk, PCB->minSlk, 1); sz_val2str(sz_drc_drill, PCB->minDrill, 1); sz_val2str(sz_drc_ring, PCB->minRing, 1); - sz_val2str(sz_text, Settings.TextScale, 0); + sz_val2str(sz_text, conf_core.design.text_scale, 0); - ls = pcb_strdup_printf(_("Units are %s."), Settings.grid_unit->in_suffix); + ls = pcb_strdup_printf(_("Units are %s."), conf_core.editor.grid_unit->in_suffix); stdarg_n = 0; stdarg(XmNlabelString, XmStringCreatePCB(ls)); XtSetValues(sz_units, stdarg_args, stdarg_n); Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 1699) +++ trunk/src_plugins/hid_lesstif/library.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 1699) +++ trunk/src_plugins/hid_lesstif/main.c (revision 1700) @@ -2,6 +2,7 @@ /* 15 Oct 2008 Ineiev: add different crosshair shapes */ #include "config.h" +#include "conf_core.h" #include #include @@ -58,7 +59,7 @@ /* How big the viewport can be relative to the pcb size. */ #define MAX_ZOOM_SCALE 10 -#define UUNIT Settings.grid_unit->allow +#define UUNIT conf_core.editor.grid_unit->allow typedef struct hid_gc_struct { HID *me_pointer; @@ -411,8 +412,12 @@ return 0; new_unit = get_unit_struct(argv[0]); if (new_unit != NULL && new_unit->allow != NO_PRINT) { - Settings.grid_unit = new_unit; +#warning TODO: do not modify directly + conf_core.editor.grid_unit = new_unit; +#warning TODO: figure what to do with increments +#if 0 Settings.increments = get_increments_struct(Settings.grid_unit->suffix); +#endif AttributePut(PCB, "PCB::grid::unit", argv[0]); } lesstif_sizes_reset(); @@ -577,7 +582,7 @@ static int SwapSides(int argc, char **argv, Coord x, Coord y) { - int old_shown_side = Settings.ShowSolderSide; + int old_shown_side = conf_core.editor.show_solder_side; int comp_group = GetLayerGroupNumberByNumber(component_silk_layer); int solder_group = GetLayerGroupNumberByNumber(solder_silk_layer); int active_group = GetLayerGroupNumberByNumber(LayerStack[0]); @@ -605,7 +610,7 @@ return 1; } /* SwapSides will swap this */ - Settings.ShowSolderSide = (flip_x == flip_y); + conf_core.editor.show_solder_side = (flip_x == flip_y); } stdarg_n = 0; @@ -622,7 +627,7 @@ stdarg(XmNprocessingDirection, XmMAX_ON_BOTTOM); XtSetValues(vscroll, stdarg_args, stdarg_n); - Settings.ShowSolderSide = !Settings.ShowSolderSide; + conf_core.editor.show_solder_side = !conf_core.editor.show_solder_side; /* The idea is that if we're looking at the front side and the front layer is active (or visa versa), switching sides should switch @@ -629,8 +634,8 @@ layers too. We used to only do this if the other layer wasn't shown, but we now do it always. Change it back if users get confused. */ - if (Settings.ShowSolderSide != old_shown_side) { - if (Settings.ShowSolderSide) { + if (conf_core.editor.show_solder_side != old_shown_side) { + if (conf_core.editor.show_solder_side) { if (active_group == comp_group) { if (comp_showing && !solder_showing) ChangeGroupVisibility(comp_layer, 0, 0); @@ -1486,7 +1491,7 @@ if (!crosshair_in_window || !window) return; if (xor_gc == 0) { - crosshair_color = lesstif_parse_color(Settings.CrosshairColor) ^ bgcolor; + crosshair_color = lesstif_parse_color(conf_core.appearance.color.crosshair) ^ bgcolor; xor_gc = XCreateGC(display, window, 0, 0); XSetFunction(display, xor_gc, GXxor); XSetForeground(display, xor_gc, crosshair_color); @@ -1614,8 +1619,8 @@ view_width = width; view_height = height; - offlimit_color = lesstif_parse_color(Settings.OffLimitColor); - grid_color = lesstif_parse_color(Settings.GridColor); + offlimit_color = lesstif_parse_color(conf_core.appearance.color.off_limit); + grid_color = lesstif_parse_color(conf_core.appearance.color.grid); bg_gc = XCreateGC(display, window, 0, 0); XSetForeground(display, bg_gc, bgcolor); @@ -1758,7 +1763,7 @@ XtManageChild(work_area_frame); stdarg_n = 0; - stdarg_do_color(Settings.BackgroundColor, XmNbackground); + stdarg_do_color(conf_core.appearance.color.background, XmNbackground); work_area = XmCreateDrawingArea(work_area_frame, "work_area", stdarg_args, stdarg_n); XtManageChild(work_area); XtAddCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_first_expose, 0); @@ -2185,7 +2190,7 @@ int n; static GC grid_gc = 0; - if (!Settings.DrawGrid) + if (!conf_core.editor.draw_grid) return; if (Vz(PCB->Grid) < MIN_GRID_DISTANCE) return; @@ -2253,7 +2258,7 @@ static void mark_delta_to_widget(Coord dx, Coord dy, Widget w) { char *buf; - double g = coord_to_unit(Settings.grid_unit, PCB->Grid); + double g = coord_to_unit(conf_core.editor.grid_unit, PCB->Grid); int prec; XmString ms; @@ -2261,7 +2266,7 @@ if (((int) (g * 10000 + 0.5) % 10000) == 0) prec = 0; else - prec = Settings.grid_unit->default_prec; + prec = conf_core.editor.grid_unit->default_prec; if (dx == 0 && dy == 0) buf = pcb_strdup_printf("%m+%+.*mS, %+.*mS", UUNIT, prec, dx, prec, dy); @@ -2283,7 +2288,7 @@ { int this_state = prev_state; char *buf, *empty = ""; - double g = coord_to_unit(Settings.grid_unit, PCB->Grid); + double g = coord_to_unit(conf_core.editor.grid_unit, PCB->Grid); XmString ms; int prec; @@ -2291,11 +2296,11 @@ * on the user's grid setting */ if (((int) (g * 10000 + 0.5) % 10000) == 0) { prec = 0; - this_state = Settings.grid_unit->allow; + this_state = conf_core.editor.grid_unit->allow; } else { - prec = Settings.grid_unit->default_prec; - this_state = -Settings.grid_unit->allow; + prec = conf_core.editor.grid_unit->default_prec; + this_state = -conf_core.editor.grid_unit->allow; } if (x < 0) @@ -2312,8 +2317,6 @@ return this_state; } -#define S Settings - void lesstif_update_status_line() { char *empty = ""; @@ -2321,20 +2324,20 @@ char *s45 = cur_clip(); XmString xs; - switch (Settings.Mode) { + switch (conf_core.editor.mode) { case VIA_MODE: - buf = pcb_strdup_printf("%m+%.2mS/%.2mS \370=%.2mS", UUNIT, S.ViaThickness, S.Keepaway, S.ViaDrillingHole); + buf = pcb_strdup_printf("%m+%.2mS/%.2mS \370=%.2mS", UUNIT, conf_core.design.via_thickness, conf_core.design.keepaway, conf_core.design.via_drilling_hole); break; case LINE_MODE: case ARC_MODE: - buf = pcb_strdup_printf("%m+%.2mS/%.2mS %s", UUNIT, S.LineThickness, S.Keepaway, s45); + buf = pcb_strdup_printf("%m+%.2mS/%.2mS %s", UUNIT, conf_core.design.line_thickness, conf_core.design.keepaway, s45); break; case RECTANGLE_MODE: case POLYGON_MODE: - buf = pcb_strdup_printf("%m+%.2mS %s", UUNIT, S.Keepaway, s45); + buf = pcb_strdup_printf("%m+%.2mS %s", UUNIT, conf_core.design.keepaway, s45); break; case TEXT_MODE: - buf = pcb_strdup_printf("%d %%", S.TextScale); + buf = pcb_strdup_printf("%d %%", conf_core.design.text_scale); break; case MOVE_MODE: case COPY_MODE: @@ -2365,8 +2368,6 @@ free(buf); } -#undef S - static int idle_proc_set = 0; static int need_redraw = 0; @@ -2462,7 +2463,7 @@ static MarkType saved_mark; static const Unit *old_grid_unit = NULL; if (crosshair_x != c_x || crosshair_y != c_y - || Settings.grid_unit != old_grid_unit || memcmp(&saved_mark, &Marked, sizeof(MarkType))) { + || conf_core.editor.grid_unit != old_grid_unit || memcmp(&saved_mark, &Marked, sizeof(MarkType))) { static int last_state = 0; static int this_state = 0; @@ -2492,8 +2493,8 @@ } memcpy(&saved_mark, &Marked, sizeof(MarkType)); - if (old_grid_unit != Settings.grid_unit) { - old_grid_unit = Settings.grid_unit; + if (old_grid_unit != conf_core.editor.grid_unit) { + old_grid_unit = conf_core.editor.grid_unit; /* Force a resize on units change. */ last_state++; } @@ -2531,10 +2532,10 @@ static Coord old_gx, old_gy; static const Unit *old_unit; XmString ms; - if (PCB->Grid != old_grid || PCB->GridOffsetX != old_gx || PCB->GridOffsetY != old_gy || Settings.grid_unit != old_unit) { + if (PCB->Grid != old_grid || PCB->GridOffsetX != old_gx || PCB->GridOffsetY != old_gy || conf_core.editor.grid_unit != old_unit) { static char buf[100]; old_grid = PCB->Grid; - old_unit = Settings.grid_unit; + old_unit = conf_core.editor.grid_unit; old_gx = PCB->GridOffsetX; old_gy = PCB->GridOffsetY; if (old_grid == 1) { @@ -2556,13 +2557,13 @@ { static double old_zoom = -1; static const Unit *old_grid_unit = NULL; - if (view_zoom != old_zoom || Settings.grid_unit != old_grid_unit) { + if (view_zoom != old_zoom || conf_core.editor.grid_unit != old_grid_unit) { char *buf = pcb_strdup_printf("%m+%$mS/pix", - Settings.grid_unit->allow, (Coord) view_zoom); + conf_core.editor.grid_unit->allow, (Coord) view_zoom); XmString ms; old_zoom = view_zoom; - old_grid_unit = Settings.grid_unit; + old_grid_unit = conf_core.editor.grid_unit; ms = XmStringCreatePCB(buf); stdarg_n = 0; @@ -2573,14 +2574,14 @@ } { - if (old_cursor_mode != Settings.Mode) { + if (old_cursor_mode != conf_core.editor.mode) { char *s = "None"; XmString ms; int cursor = -1; static int free_cursor = 0; - old_cursor_mode = Settings.Mode; - switch (Settings.Mode) { + old_cursor_mode = conf_core.editor.mode; + switch (conf_core.editor.mode) { case NO_MODE: s = "None"; cursor = XC_X_cursor; @@ -2695,10 +2696,10 @@ static int old_tscale = -1; char *new_clip = cur_clip(); - if (new_clip != old_clip || Settings.TextScale != old_tscale) { + if (new_clip != old_clip || conf_core.design.text_scale != old_tscale) { lesstif_update_status_line(); old_clip = new_clip; - old_tscale = Settings.TextScale; + old_tscale = conf_core.design.text_scale; } } Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 1699) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -101,18 +102,18 @@ fg_colors[LB_VIAS] = lesstif_parse_color(PCB->ViaColor); fg_colors[LB_BACK] = lesstif_parse_color(PCB->InvisibleObjectsColor); fg_colors[LB_MASK] = lesstif_parse_color(PCB->MaskColor); - bg_color = lesstif_parse_color(Settings.BackgroundColor); + bg_color = lesstif_parse_color(conf_core.appearance.color.background); } else { for (i = 0; i < MAX_LAYER; i++) - fg_colors[i] = lesstif_parse_color(Settings.LayerColor[i]); - fg_colors[LB_SILK] = lesstif_parse_color(Settings.ElementColor); - fg_colors[LB_RATS] = lesstif_parse_color(Settings.RatColor); - fg_colors[LB_PINS] = lesstif_parse_color(Settings.PinColor); - fg_colors[LB_VIAS] = lesstif_parse_color(Settings.ViaColor); - fg_colors[LB_BACK] = lesstif_parse_color(Settings.InvisibleObjectsColor); - fg_colors[LB_MASK] = lesstif_parse_color(Settings.MaskColor); - bg_color = lesstif_parse_color(Settings.BackgroundColor); + fg_colors[i] = lesstif_parse_color(conf_core.appearance.color.layer[i]); + fg_colors[LB_SILK] = lesstif_parse_color(conf_core.appearance.color.element); + fg_colors[LB_RATS] = lesstif_parse_color(conf_core.appearance.color.rat); + fg_colors[LB_PINS] = lesstif_parse_color(conf_core.appearance.color.pin); + fg_colors[LB_VIAS] = lesstif_parse_color(conf_core.appearance.color.via); + fg_colors[LB_BACK] = lesstif_parse_color(conf_core.appearance.color.invisible_objects); + fg_colors[LB_MASK] = lesstif_parse_color(conf_core.appearance.color.mask); + bg_color = lesstif_parse_color(conf_core.appearance.color.background); } if (PCB->RatDraw) Index: trunk/src_plugins/hid_lesstif/styles.c =================================================================== --- trunk/src_plugins/hid_lesstif/styles.c (revision 1699) +++ trunk/src_plugins/hid_lesstif/styles.c (revision 1700) @@ -1,6 +1,7 @@ /* $Id$ */ #include "config.h" +#include "conf_core.h" #include #include @@ -27,11 +28,11 @@ /* There are three places where styles are kept: - First, the "active" style is in Settings.LineThickness et al. + First, the "active" style is in conf_core.design.line_thickness et al. Second, there are NUM_STYLES styles in PCB->RouteStyle[]. - Third, there are NUM_STYLES styles in Settings.RouteStyle[] + (not anymore: Third, there are NUM_STYLES styles in conf_core.design.RouteStyle[]) Selecting a style copies its values to the active style. We also need a way to modify the active style, copy the active style to @@ -98,10 +99,10 @@ static void update_values() { local_update = 1; - update_one_value(SSthick, Settings.LineThickness); - update_one_value(SSdiam, Settings.ViaThickness); - update_one_value(SShole, Settings.ViaDrillingHole); - update_one_value(SSkeep, Settings.Keepaway); + update_one_value(SSthick, conf_core.design.line_thickness); + update_one_value(SSdiam, conf_core.design.via_thickness); + update_one_value(SShole, conf_core.design.via_drilling_hole); + update_one_value(SSkeep, conf_core.design.keepaway); local_update = 0; lesstif_update_status_line(); } @@ -112,8 +113,8 @@ lesstif_update_status_line(); return; } - unit = Settings.grid_unit; - ustr = XmStringCreateLocalized((char *) Settings.grid_unit->suffix); + unit = conf_core.editor.grid_unit; + ustr = XmStringCreateLocalized((char *) conf_core.editor.grid_unit->suffix); update_values(); } @@ -147,18 +148,19 @@ return; s = XmTextGetString(w); n = GetValueEx(s, NULL, NULL, NULL, unit->suffix); +#warning TODO: shouldn't write conf_core directly switch (i) { case SSthick: - Settings.LineThickness = n; + conf_core.design.line_thickness = n; break; case SSdiam: - Settings.ViaThickness = n; + conf_core.design.via_thickness = n; break; case SShole: - Settings.ViaDrillingHole = n; + conf_core.design.via_drilling_hole = n; break; case SSkeep: - Settings.Keepaway = n; + conf_core.design.keepaway = n; break; } update_style_buttons(); @@ -225,10 +227,10 @@ static void style_set_cb(Widget w, int i, XmToggleButtonCallbackStruct * cbs) { - PCB->RouteStyle[i].Thick = Settings.LineThickness; - PCB->RouteStyle[i].Diameter = Settings.ViaThickness; - PCB->RouteStyle[i].Hole = Settings.ViaDrillingHole; - PCB->RouteStyle[i].Keepaway = Settings.Keepaway; + PCB->RouteStyle[i].Thick = conf_core.design.line_thickness; + PCB->RouteStyle[i].Diameter = conf_core.design.via_thickness; + PCB->RouteStyle[i].Hole = conf_core.design.via_drilling_hole; + PCB->RouteStyle[i].Keepaway = conf_core.design.keepaway; update_style_buttons(); } @@ -317,7 +319,7 @@ if (style_dialog == 0) { int i; - unit = Settings.grid_unit; + unit = conf_core.editor.grid_unit; ustr = XmStringCreateLocalized((char *) unit->suffix); stdarg_n = 0; Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 1699) +++ trunk/src_plugins/import_sch/import_sch.c (revision 1700) @@ -25,6 +25,8 @@ * */ #include "config.h" +#include "conf_core.h" + #include "global.h" #include "data.h" #include "action_helper.h" @@ -105,7 +107,10 @@ If a temporary file is needed the @code{TMPDIR} environment variable is used to select its location. +*/ +#warning TODO: update this para +/* Note that the programs @code{gnetlist} and @code{make} may be overridden by the user via the @code{make-program} and @code{gnetlist} @code{pcb} settings (i.e. in @code{~/.pcb/settings} or on the command @@ -305,7 +310,7 @@ } cmd = (char **) malloc((7 + nsources) * sizeof(char *)); - cmd[0] = Settings.GnetlistProgram; + cmd[0] = conf_core.rc.gnetlist_program; cmd[1] = "-g"; cmd[2] = "pcbfwd"; cmd[3] = "-o"; @@ -376,7 +381,7 @@ strcat(srclist, sources[i]); } - cmd[0] = Settings.MakeProgram; + cmd[0] = conf_core.rc.make_program; cmd[1] = "-s"; cmd[2] = Concat("PCB=", PCB->Filename, NULL); cmd[3] = srclist; Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 1699) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 1700) @@ -26,6 +26,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -114,7 +115,7 @@ if (!TEST_FLAG(ENABLEMINCUTFLAG, PCB)) return bad_gr; - if (!Settings.EnableMincut) + if (!conf_core.editor.enable_mincut) return bad_gr; /* only one should be set, but one must be set */ Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 1699) +++ trunk/src_plugins/puller/puller.c (revision 1700) @@ -47,6 +47,7 @@ */ #include "config.h" +#include "conf_core.h" #include "global.h" Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 1699) +++ trunk/src_plugins/report/report.c (revision 1700) @@ -28,6 +28,7 @@ #include "config.h" +#include "conf_core.h" #include @@ -63,7 +64,7 @@ #endif -#define USER_UNITMASK (Settings.grid_unit->allow) +#define USER_UNITMASK (conf_core.editor.grid_unit->allow) static int ReportDrills(int argc, char **argv, Coord x, Coord y) { @@ -89,7 +90,7 @@ sprintf(stringlist, "There are %d different drill sizes used in this layout, %d holes total\n\n" "Drill Diam. (%s)\t# of Pins\t# of Vias\t# of Elements\t# Unplated\n", - AllDrills->DrillN, total_drills, Settings.grid_unit->suffix); + AllDrills->DrillN, total_drills, conf_core.editor.grid_unit->suffix); thestring = stringlist; while (*thestring != '\0') thestring++; @@ -96,7 +97,7 @@ for (n = 0; n < AllDrills->DrillN; n++) { pcb_sprintf(thestring, "%10m*\t\t%d\t\t%d\t\t%d\t\t%d\n", - Settings.grid_unit->suffix, + conf_core.editor.grid_unit->suffix, AllDrills->Drill[n].DrillSize, AllDrills->Drill[n].PinCount, AllDrills->Drill[n].ViaCount, AllDrills->Drill[n].ElementN, AllDrills->Drill[n].UnplatedCount); @@ -607,7 +608,7 @@ Coord length; if (argc < 1) - units_name = Settings.grid_unit->suffix; + units_name = conf_core.editor.grid_unit->suffix; length = XYtoNetLength(x, y, &found); @@ -705,7 +706,7 @@ { char buf[50]; - pcb_snprintf(buf, sizeof(buf), "%$m*", Settings.grid_unit->suffix, length); + pcb_snprintf(buf, sizeof(buf), "%$m*", conf_core.editor.grid_unit->suffix, length); if (netname) gui->log("Net \"%s\" length: %s\n", netname, buf); else @@ -845,7 +846,7 @@ { char buf[50]; - pcb_snprintf(buf, sizeof(buf), "%$m*", Settings.grid_unit->suffix, length); + pcb_snprintf(buf, sizeof(buf), "%$m*", conf_core.editor.grid_unit->suffix, length); if (netname) gui->log("Net \"%s\" length: %s\n", netname, buf); else Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 1699) +++ trunk/src_plugins/shand_cmd/command.c (revision 1700) @@ -30,6 +30,7 @@ */ #include "config.h" +#include "conf_core.h" #include #ifdef HAVE_STRING_H Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 1699) +++ trunk/src_plugins/vendordrill/vendor.c (revision 1700) @@ -23,6 +23,7 @@ */ #include "config.h" +#include "conf_core.h" #include #include @@ -473,8 +474,10 @@ Message(_("Updated %d drill sizes out of %d total\n"), changed, tot); +#warning TODO: this should not happen; modify some local setting? +#if 0 /* Update the current Via */ - if (Settings.ViaDrillingHole != vendorDrillMap(Settings.ViaDrillingHole)) { + if (conf_core.design.via_drilling_hole != vendorDrillMap(Settings.ViaDrillingHole)) { changed++; Settings.ViaDrillingHole = vendorDrillMap(Settings.ViaDrillingHole); Message(_("Adjusted active via hole size to be %6.2f mils\n"), 0.01 * Settings.ViaDrillingHole); @@ -496,7 +499,7 @@ } } } - +#endif /* * if we've changed anything, indicate that we need to save the * file, redraw things, and make sure we can undo.