Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6702) +++ trunk/scconfig/Rev.h (revision 6703) @@ -1 +1 @@ -static const int myrev = 6701; +static const int myrev = 6703; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6702) +++ trunk/scconfig/Rev.tab (revision 6703) @@ -1,4 +1,4 @@ -6701 configure gtk splitup +6703 configure gtk splitup 6392 configure draw cross section plugin (gtk and lesstif depend on it) 6365 configure gtk splitup 6111 configure layer vs. layer group code split Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 6702) +++ trunk/src/Makefile.dep (revision 6703) @@ -811,8 +811,8 @@ ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \ - conf_core.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ @@ -847,8 +847,8 @@ ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \ - conf_core.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ @@ -887,8 +887,8 @@ ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \ - conf_core.h event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ @@ -900,41 +900,6 @@ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h misc_util.h \ error.h ../src_plugins/hid_gtk/gschem_accel_label.h -../src_plugins/lib_gtk_common/wt_route_style.o: \ - ../src_plugins/lib_gtk_common/wt_route_style.c ../config.h \ - conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ - ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ - ../src_3rd/genvector/vtp0.h list_conf.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h ../src_plugins/hid_gtk/gui.h \ - board.h const.h macro.h vtroutestyle.h attrib.h layer.h obj_all_list.h \ - obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \ - ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ - obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ - obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ - obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h library.h \ - rats_patch.h board.h font.h box.h math_helper.h move.h misc_util.h hid.h \ - error.h drc.h hid_cfg.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ - vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ - ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \ - compat_misc.h ../src_plugins/hid_gtk/colors.h \ - ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ - ../src_plugins/lib_gtk_common/bu_box.h \ - ../src_plugins/lib_gtk_common/bu_text_view.h \ - ../src_plugins/lib_gtk_common/bu_check_button.h \ - ../src_plugins/lib_gtk_common/bu_spin_button.h \ - ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h \ - ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h compat_nls.h ../src_plugins/hid_gtk/gschem_accel_label.o: \ ../src_plugins/hid_gtk/gschem_accel_label.c ../config.h \ ../src_plugins/hid_gtk/gschem_accel_label.h compat_nls.h @@ -1027,8 +992,12 @@ hid_flags.h hid_actions.h plug_footprint.h vtlibrary.h plug_io.h \ misc_util.h layer.h compat_nls.h layer_vis.h \ ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \ + ../src_plugins/lib_gtk_common/util_block_hook.h \ + ../src_plugins/lib_gtk_common/util_timer.h \ + ../src_plugins/lib_gtk_common/util_watch.h \ ../src_plugins/lib_gtk_common/dlg_about.h \ ../src_plugins/lib_gtk_common/dlg_attribute.h \ + ../src_plugins/lib_gtk_common/dlg_confirm.h \ ../src_plugins/lib_gtk_common/dlg_export.h \ ../src_plugins/lib_gtk_common/dlg_input.h \ ../src_plugins/lib_gtk_common/dlg_message.h \ @@ -1326,22 +1295,23 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h \ - ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \ - vtroutestyle.h attrib.h ../src_plugins/hid_gtk/gui.h board.h const.h \ - macro.h layer.h obj_all_list.h obj_arc_list.h obj_common.h \ - ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ - obj_arc.h obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h \ - obj_pad_list.h obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h \ - ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h \ - polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \ - library.h rats_patch.h board.h font.h box.h math_helper.h move.h \ - misc_util.h hid.h error.h drc.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/genlist/gendlist.h globalconst.h ../src_plugins/hid_gtk/gui.h \ + board.h const.h macro.h vtroutestyle.h attrib.h layer.h obj_all_list.h \ + obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \ + ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ + obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ + obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ + obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h library.h \ + rats_patch.h board.h font.h box.h math_helper.h move.h misc_util.h hid.h \ + error.h drc.h hid_cfg.h hid_cfg_input.h \ ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ - ../src_plugins/lib_gtk_common/wt_layer_selector.h event.h compat_misc.h \ - ../src_plugins/hid_gtk/colors.h ../src_plugins/hid_gtk/hid_gtk_conf.h \ - conf.h ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ + ../src_plugins/lib_gtk_common/wt_layer_selector.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \ + compat_misc.h ../src_plugins/hid_gtk/colors.h \ + ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ @@ -2142,6 +2112,23 @@ polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \ pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h compat_misc.h \ compat_nls.h ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h +../src_plugins/lib_gtk_common/dlg_confirm.o: \ + ../src_plugins/lib_gtk_common/dlg_confirm.c ../config.h \ + ../src_plugins/lib_gtk_common/dlg_confirm.h compat_nls.h board.h const.h \ + macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \ + ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \ + obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ + obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \ + math_helper.h move.h misc_util.h hid_actions.h hid.h error.h drc.h \ + ../src_plugins/lib_gtk_common/dlg_message.h ../src_plugins/lib_gtk_common/dlg_export.o: \ ../src_plugins/lib_gtk_common/dlg_export.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -2187,9 +2174,8 @@ hid_cfg.h data.h crosshair.h vtonpoint.h hid.h buffer.h \ ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/../lib_gtk_common/wt_route_style.h \ - route_style.h conf_core.h event.h compat_misc.h \ - ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + event.h compat_misc.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ @@ -2273,11 +2259,10 @@ vtonpoint.h hid.h buffer.h \ ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/../lib_gtk_common/wt_route_style.h \ - route_style.h conf_core.h conf.h pcb-printf.h \ - ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/genvector/vtp0.h list_conf.h event.h \ - ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ + event.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ @@ -2340,11 +2325,10 @@ vtonpoint.h hid.h buffer.h \ ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/../lib_gtk_common/wt_route_style.h \ - route_style.h conf_core.h conf.h pcb-printf.h \ - ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/genvector/vtp0.h list_conf.h event.h compat_misc.h \ - ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ + event.h compat_misc.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ @@ -2379,11 +2363,10 @@ error.h drc.h hid_cfg.h data.h crosshair.h vtonpoint.h hid.h buffer.h \ ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/../lib_gtk_common/wt_route_style.h \ - route_style.h conf_core.h conf.h pcb-printf.h \ - ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/genvector/vtp0.h list_conf.h event.h compat_misc.h \ - ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ + event.h compat_misc.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ @@ -2423,9 +2406,60 @@ compat_misc.h compat_nls.h draw.h hid.h error.h drc.h data.h crosshair.h \ vtonpoint.h buffer.h layer_vis.h \ ../src_plugins/lib_gtk_common/bu_status_line.h +../src_plugins/lib_gtk_common/util_block_hook.o: \ + ../src_plugins/lib_gtk_common/util_block_hook.c ../config.h \ + ../src_plugins/lib_gtk_common/util_block_hook.h hid.h error.h drc.h \ + unit.h global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \ + obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ + obj_rat.h layer_grp.h ../src_plugins/lib_gtk_common/util_str.o: \ ../src_plugins/lib_gtk_common/util_str.c ../config.h \ ../src_plugins/lib_gtk_common/util_str.h +../src_plugins/lib_gtk_common/util_timer.o: \ + ../src_plugins/lib_gtk_common/util_timer.c ../config.h \ + ../src_plugins/lib_gtk_common/util_timer.h hid.h error.h drc.h unit.h \ + global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \ + obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ + obj_rat.h layer_grp.h conf_core.h conf.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h +../src_plugins/lib_gtk_common/util_watch.o: \ + ../src_plugins/lib_gtk_common/util_watch.c ../config.h \ + ../src_plugins/lib_gtk_common/util_watch.h hid.h error.h drc.h unit.h \ + global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \ + obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ + obj_rat.h layer_grp.h ../src_plugins/lib_gtk_common/in_mouse.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/htip.h \ + hid_cfg.h conf_core.h conf.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/genvector/vtp0.h list_conf.h ../src_plugins/lib_gtk_common/win_place.o: \ ../src_plugins/lib_gtk_common/win_place.c ../config.h \ ../src_plugins/lib_gtk_common/win_place.h conf_core.h conf.h \ @@ -2467,8 +2501,8 @@ ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \ - conf_core.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \ + conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ @@ -2503,6 +2537,44 @@ data.h crosshair.h vtonpoint.h hid.h buffer.h draw.h move.h rotate.h \ obj_all.h macro.h ../src_plugins/lib_gtk_common/in_mouse.h \ hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h +../src_plugins/lib_gtk_common/wt_route_style.o: \ + ../src_plugins/lib_gtk_common/wt_route_style.c ../config.h conf_core.h \ + conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + ../src_3rd/genvector/vtp0.h list_conf.h \ + ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h globalconst.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \ + vtroutestyle.h attrib.h ../src_plugins/lib_gtk_common/../hid_gtk/gui.h \ + board.h const.h macro.h layer.h obj_all_list.h obj_arc_list.h \ + obj_common.h ../src_3rd/liblihata/genht/hash.h \ + ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ + obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ + obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ + obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h library.h \ + rats_patch.h board.h font.h box.h math_helper.h move.h misc_util.h hid.h \ + error.h drc.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ + vtonpoint.h hid.h buffer.h \ + ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \ + ../src_plugins/lib_gtk_common/wt_layer_selector.h \ + ../src_plugins/lib_gtk_common/wt_route_style.h event.h compat_misc.h \ + ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ + ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ + ../src_plugins/lib_gtk_common/bu_box.h \ + ../src_plugins/lib_gtk_common/bu_text_view.h \ + ../src_plugins/lib_gtk_common/bu_check_button.h \ + ../src_plugins/lib_gtk_common/bu_spin_button.h \ + ../src_plugins/lib_gtk_common/bu_status_line.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h compat_nls.h ../src_plugins/lib_legacy_func/lib_legacy_func.o: \ ../src_plugins/lib_legacy_func/lib_legacy_func.c \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6702) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6703) @@ -37,6 +37,7 @@ #include "../src_plugins/lib_gtk_common/util_watch.h" #include "../src_plugins/lib_gtk_common/dlg_about.h" #include "../src_plugins/lib_gtk_common/dlg_attribute.h" +#include "../src_plugins/lib_gtk_common/dlg_confirm.h" #include "../src_plugins/lib_gtk_common/dlg_export.h" #include "../src_plugins/lib_gtk_common/dlg_input.h" #include "../src_plugins/lib_gtk_common/dlg_message.h" @@ -200,83 +201,17 @@ int ghid_confirm_dialog(const char *msg, ...) { - int rv = 0; + int res; va_list ap; - const char *cancelmsg = NULL, *okmsg = NULL; - static gint x = -1, y = -1; - GtkWidget *dialog; - GHidPort *out = &ghid_port; - va_start(ap, msg); - cancelmsg = va_arg(ap, char *); - okmsg = va_arg(ap, char *); + res = pcb_gtk_dlg_confirm_open(ghid_port.top_window, msg, ap); va_end(ap); - - if (!cancelmsg) { - cancelmsg = _("_Cancel"); - okmsg = _("_OK"); - } - - dialog = gtk_message_dialog_new(GTK_WINDOW(out->top_window), - (GtkDialogFlags) (GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT), - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg); - gtk_dialog_add_button(GTK_DIALOG(dialog), cancelmsg, GTK_RESPONSE_CANCEL); - if (okmsg) { - gtk_dialog_add_button(GTK_DIALOG(dialog), okmsg, GTK_RESPONSE_OK); - } - - if (x != -1) { - gtk_window_move(GTK_WINDOW(dialog), x, y); - } - - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) - rv = 1; - - gtk_window_get_position(GTK_WINDOW(dialog), &x, &y); - - gtk_widget_destroy(dialog); - return rv; + return res; } -int ghid_close_confirm_dialog() +int ghid_close_confirm_dialog(void) { - gchar *bold_text; - gchar *str; - const char *msg; - - if (PCB->Filename == NULL) { - bold_text = g_strdup_printf(_("Save the changes to layout before closing?")); - } - else { - bold_text = g_strdup_printf(_("Save the changes to layout \"%s\" before closing?"), PCB->Filename); - } - str = g_strconcat("", bold_text, "", NULL); - g_free(bold_text); - msg = _("If you don't save, all your changes will be permanently lost."); - str = g_strconcat(str, "\n\n", msg, NULL); - - switch (pcb_gtk_dlg_message(str, GTK_WINDOW(ghid_port.top_window))) { - case GTK_RESPONSE_YES: - { - if (pcb_hid_actionl("Save", NULL)) { /* Save failed */ - return 0; /* Cancel */ - } - else { - return 1; /* Close */ - } - } - case GTK_RESPONSE_NO: - { - return 1; /* Close */ - } - case GTK_RESPONSE_CANCEL: - default: - { - return 0; /* Cancel */ - } - } - g_free(str); + return pcb_gtk_dlg_confirm_close(ghid_port.top_window); } void ghid_report_dialog(const char *title, const char *msg) Index: trunk/src_plugins/lib_gtk_common/Plug.tmpasm =================================================================== --- trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 6702) +++ trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 6703) @@ -14,6 +14,7 @@ $(PLUGDIR)/lib_gtk_common/bu_text_view.o $(PLUGDIR)/lib_gtk_common/dlg_about.o $(PLUGDIR)/lib_gtk_common/dlg_attribute.o + $(PLUGDIR)/lib_gtk_common/dlg_confirm.o $(PLUGDIR)/lib_gtk_common/dlg_export.o $(PLUGDIR)/lib_gtk_common/dlg_file_chooser.o $(PLUGDIR)/lib_gtk_common/dlg_input.o Index: trunk/src_plugins/lib_gtk_common/dlg_confirm.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_confirm.c (nonexistent) +++ trunk/src_plugins/lib_gtk_common/dlg_confirm.c (revision 6703) @@ -0,0 +1,107 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#include "config.h" +#include "dlg_confirm.h" +#include "compat_nls.h" +#include "board.h" +#include "hid_actions.h" + +#include "dlg_message.h" + +int pcb_gtk_dlg_confirm_open(GtkWidget *top_window, const char *msg, va_list ap) +{ + int rv = 0; + const char *cancelmsg = NULL, *okmsg = NULL; + static gint x = -1, y = -1; + GtkWidget *dialog; + + cancelmsg = va_arg(ap, char *); + okmsg = va_arg(ap, char *); + + if (!cancelmsg) { + cancelmsg = _("_Cancel"); + okmsg = _("_OK"); + } + + dialog = gtk_message_dialog_new(GTK_WINDOW(top_window), + (GtkDialogFlags) (GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg); + gtk_dialog_add_button(GTK_DIALOG(dialog), cancelmsg, GTK_RESPONSE_CANCEL); + if (okmsg) { + gtk_dialog_add_button(GTK_DIALOG(dialog), okmsg, GTK_RESPONSE_OK); + } + + if (x != -1) { + gtk_window_move(GTK_WINDOW(dialog), x, y); + } + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) + rv = 1; + + gtk_window_get_position(GTK_WINDOW(dialog), &x, &y); + + gtk_widget_destroy(dialog); + return rv; +} + +int pcb_gtk_dlg_confirm_close(GtkWidget *top_window) +{ + gchar *bold_text; + gchar *str; + const char *msg; + + if (PCB->Filename == NULL) { + bold_text = g_strdup_printf(_("Save the changes to layout before closing?")); + } + else { + bold_text = g_strdup_printf(_("Save the changes to layout \"%s\" before closing?"), PCB->Filename); + } + str = g_strconcat("", bold_text, "", NULL); + g_free(bold_text); + msg = _("If you don't save, all your changes will be permanently lost."); + str = g_strconcat(str, "\n\n", msg, NULL); + + switch (pcb_gtk_dlg_message(str, GTK_WINDOW(top_window))) { + case GTK_RESPONSE_YES: + { + if (pcb_hid_actionl("Save", NULL)) { /* Save failed */ + return 0; /* Cancel */ + } + else { + return 1; /* Close */ + } + } + case GTK_RESPONSE_NO: + { + return 1; /* Close */ + } + case GTK_RESPONSE_CANCEL: + default: + { + return 0; /* Cancel */ + } + } + g_free(str); +} Index: trunk/src_plugins/lib_gtk_common/dlg_confirm.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_confirm.h (nonexistent) +++ trunk/src_plugins/lib_gtk_common/dlg_confirm.h (revision 6703) @@ -0,0 +1,6 @@ +#include +#include + +int pcb_gtk_dlg_confirm_open(GtkWidget *top_window, const char *msg, va_list ap); +int pcb_gtk_dlg_confirm_close(GtkWidget *top_window); +