Index: src/Makefile.dep =================================================================== --- src/Makefile.dep (revision 6684) +++ src/Makefile.dep (revision 6685) @@ -827,30 +827,30 @@ ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.o: \ ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.c ../config.h \ - ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h global_typedefs.h \ - pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ + ../src_plugins/hid_gtk/gui.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 ../src_3rd/liblihata/lihata.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.h error.h drc.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 \ - ../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 error.h ../src_plugins/hid_gtk/gui.h \ - board.h const.h macro.h vtroutestyle.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 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 drc.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/ht.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/hid_gtk/ghid-route-style-selector.h route_style.h \ - conf_core.h event.h compat_misc.h ../src_plugins/hid_gtk/colors.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 \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ @@ -868,7 +868,7 @@ ../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 \ - ../config.h ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h \ + ../config.h ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.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 \ @@ -910,17 +910,16 @@ ../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/gtkhid.h conf_hid.h error.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 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 \ @@ -1027,7 +1026,7 @@ hid_draw_helpers.h pcb-printf.h plugins.h hid_attrib.h hid_init.h \ 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.h conf_hid.h \ + ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \ ../src_plugins/lib_gtk_common/dlg_about.h \ ../src_plugins/lib_gtk_common/dlg_attribute.h \ ../src_plugins/lib_gtk_common/dlg_export.h \ @@ -1110,7 +1109,7 @@ ../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 \ - ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h change.h \ + ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h action_helper.h change.h \ plug_io.h error.h draw.h pcb-printf.h hid_attrib.h misc_util.h \ ../src_plugins/hid_gtk/gtk_conf_list.h paths.h plug_footprint.h \ vtlibrary.h stub_draw_csect.h compat_nls.h fptr_cast.h \ @@ -1236,7 +1235,8 @@ ../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 hid_actions.h \ - compat_nls.h ../src_plugins/lib_gtk_common/win_place.h + compat_nls.h ../src_plugins/hid_gtk/gtkhid-main.h \ + ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/hid_gtk/gui-netlist-window.o: \ ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -1310,10 +1310,10 @@ ../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 \ - ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h crosshair.h \ - draw.h error.h layer.h find.h search.h rats.h netlist.h route_style.h \ - rats.h ../src_plugins/lib_gtk_common/in_mouse.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h action_helper.h \ + crosshair.h draw.h error.h layer.h find.h search.h rats.h netlist.h \ + route_style.h rats.h ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \ + ../src_plugins/lib_gtk_common/in_mouse.h \ ../src_plugins/lib_gtk_common/in_keyboard.h \ ../src_plugins/lib_gtk_common/../hid_gtk/gui.h ../src_plugins/hid_gtk/gui-top-window.o: \ @@ -1328,9 +1328,8 @@ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h globalconst.h \ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h \ - vtroutestyle.h attrib.h ../src_plugins/hid_gtk/gtkhid.h conf_hid.h \ - error.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 \ + 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 \ @@ -1337,7 +1336,7 @@ 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 drc.h hid_cfg.h hid_cfg_input.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 \ @@ -1358,6 +1357,7 @@ ../src_plugins/hid_gtk/gui-icons-mode-buttons.data \ ../src_plugins/hid_gtk/gui-icons-misc.data hid_attrib.h hid_actions.h \ hid_flags.h compat_nls.h obj_line.h layer_vis.h \ + ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/in_mouse.h \ ../src_plugins/lib_gtk_common/win_place.h Index: src_plugins/hid_gtk/gtkhid.h =================================================================== --- src_plugins/hid_gtk/gtkhid.h (revision 6684) +++ src_plugins/hid_gtk/gtkhid.h (nonexistent) @@ -1,14 +0,0 @@ -#ifndef PCB_HID_GTK_GTKHID_H -#define PCB_HID_GTK_GTKHID_H - -#include "conf_hid.h" - -void ghid_notify_gui_is_up(void); - -extern int gtkhid_active; -void gtkhid_begin(void); -void gtkhid_end(void); - -extern conf_hid_id_t ghid_conf_id; - -#endif /* PCB_HID_GTK_GTKHID_H */ Index: src_plugins/hid_gtk/ghid-cell-renderer-visibility.c =================================================================== --- src_plugins/hid_gtk/ghid-cell-renderer-visibility.c (revision 6684) +++ src_plugins/hid_gtk/ghid-cell-renderer-visibility.c (revision 6685) @@ -11,7 +11,6 @@ #include #include "config.h" -#include "gtkhid.h" #include "gui.h" #include "compat_nls.h" Index: src_plugins/hid_gtk/ghid-main-menu.c =================================================================== --- src_plugins/hid_gtk/ghid-main-menu.c (revision 6684) +++ src_plugins/hid_gtk/ghid-main-menu.c (revision 6685) @@ -10,7 +10,7 @@ #include #include "config.h" -#include "gtkhid.h" +#include "gtkhid-main.h" #include "gui.h" #include "pcb-printf.h" #include "misc_util.h" Index: src_plugins/hid_gtk/ghid-route-style-selector.c =================================================================== --- src_plugins/hid_gtk/ghid-route-style-selector.c (revision 6684) +++ src_plugins/hid_gtk/ghid-route-style-selector.c (revision 6685) @@ -11,7 +11,6 @@ #include "config.h" #include "conf_core.h" -#include "gtkhid.h" #include "gui.h" #include "pcb-printf.h" #include "route_style.h" Index: src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- src_plugins/hid_gtk/gtkhid-main.c (revision 6684) +++ src_plugins/hid_gtk/gtkhid-main.c (revision 6685) @@ -28,7 +28,7 @@ #include "compat_nls.h" #include "layer_vis.h" -#include "gtkhid.h" +#include "gtkhid-main.h" /* AV: Care to circular includes !!!? */ #include "../src_plugins/lib_gtk_common/ui_zoompan.h" @@ -75,7 +75,7 @@ static int ghid_gui_is_up = 0; -void ghid_notify_gui_is_up() +void ghid_notify_gui_is_up(void) { ghid_gui_is_up = 1; } Index: src_plugins/hid_gtk/gtkhid-main.h =================================================================== --- src_plugins/hid_gtk/gtkhid-main.h (nonexistent) +++ src_plugins/hid_gtk/gtkhid-main.h (revision 6685) @@ -0,0 +1,14 @@ +#ifndef PCB_GTKHID_MAIN_H +#define PCB_GTKHID_MAIN_H + +#include "conf_hid.h" +extern conf_hid_id_t ghid_conf_id; + +void ghid_notify_gui_is_up(void); +extern int gtkhid_active; + +void gtkhid_begin(void); +void gtkhid_end(void); + + +#endif Index: src_plugins/hid_gtk/gui-config.c =================================================================== --- src_plugins/hid_gtk/gui-config.c (revision 6684) +++ src_plugins/hid_gtk/gui-config.c (revision 6685) @@ -31,7 +31,7 @@ #include "gui.h" #include "hid.h" -#include "gtkhid.h" +#include "gtkhid-main.h" #include "action_helper.h" #include "change.h" Index: src_plugins/hid_gtk/gui-log-window.c =================================================================== --- src_plugins/hid_gtk/gui-log-window.c (revision 6684) +++ src_plugins/hid_gtk/gui-log-window.c (revision 6685) @@ -36,6 +36,7 @@ #include "pcb-printf.h" #include "hid_actions.h" #include "compat_nls.h" +#include "gtkhid-main.h" #include "../src_plugins/lib_gtk_common/win_place.h" Index: src_plugins/hid_gtk/gui-output-events.c =================================================================== --- src_plugins/hid_gtk/gui-output-events.c (revision 6684) +++ src_plugins/hid_gtk/gui-output-events.c (revision 6685) @@ -30,7 +30,6 @@ #include "conf_core.h" #include "gui.h" -#include "gtkhid.h" #include "hid_cfg.h" #include @@ -43,6 +42,7 @@ #include "find.h" #include "search.h" #include "rats.h" +#include "gtkhid-main.h" #include "../src_plugins/lib_gtk_common/in_mouse.h" #include "../src_plugins/lib_gtk_common/in_keyboard.h" Index: src_plugins/hid_gtk/gui-top-window.c =================================================================== --- src_plugins/hid_gtk/gui-top-window.c (revision 6684) +++ src_plugins/hid_gtk/gui-top-window.c (revision 6685) @@ -55,7 +55,6 @@ #include "conf_core.h" #include #include "ghid-route-style-selector.h" -#include "gtkhid.h" #include "gui.h" #include "hid.h" #include "hid_cfg.h" @@ -93,6 +92,7 @@ #include "compat_misc.h" #include "obj_line.h" #include "layer_vis.h" +#include "gtkhid-main.h" #include "../src_plugins/lib_gtk_common/util_str.h" #include "../src_plugins/lib_gtk_common/in_mouse.h" #include "../src_plugins/lib_gtk_common/wt_layer_selector.h"