Index: trunk/doc-rnd/TODO
===================================================================
--- trunk/doc-rnd/TODO	(revision 1374)
+++ trunk/doc-rnd/TODO	(revision 1375)
@@ -1,9 +1,12 @@
 Cleanup #4:
-	- clean up rest of hid/common:
-		- hid/common/hidinit.[ch]: split, move to core
 	- check Makefile.in for hid/
 	- Makefile.in: local/pcb/hids (obsolete)
 	- remove Makefile.in.mod
+	- reduce
+		- hash in hid_attrib.c?
+		- hash in hid_color.c; test: eps
+	- get rid of extern c
+	- event.h: cookie should be const char *
 
 RELEASE: 
 	- mention the harmless gtk/lesstif uninit warnings in the release notes?
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 1374)
+++ trunk/src/Makefile.dep	(revision 1375)
@@ -173,7 +173,7 @@
  list_element.h libpcb_fp.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 \
- portability.h paths.h rats_patch.h stub_edif.h hid_actions.h
+ portability.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 \
@@ -185,7 +185,7 @@
  list_element.h libpcb_fp.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 \
- hid_actions.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 \
  global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \
@@ -322,7 +322,7 @@
  ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \
  list_element.h libpcb_fp.h hid_nogui.h compat.h error.h misc.h \
  ../src_3rd/genvector/gds_char.h mymem.h portability.h pcb-printf.h \
- plugins.h hid_attrib.h
+ plugins.h hid_attrib.h hid_flags.h
 hid_nogui.o: hid_nogui.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 \
@@ -340,7 +340,7 @@
  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 libpcb_fp.h resource.h hid_resource.h
+ list_element.h libpcb_fp.h resource.h hid_resource.h hid_actions.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 \
@@ -429,7 +429,7 @@
  error.h file.h set.h action_helper.h misc.h \
  ../src_3rd/genvector/gds_char.h mymem.h lrealpath.h free_atexit.h \
  polygon.h pcb-printf.h buildin.h paths.h strflags.h plugins.h event.h \
- funchash.h hid_actions.h hid_attrib.h dolists.h action_list.h
+ funchash.h hid_actions.h hid_attrib.h hid_init.h dolists.h action_list.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 \
@@ -452,7 +452,7 @@
  list_element.h libpcb_fp.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 action_helper.h portability.h hid_actions.h
+ set.h undo.h action_helper.h portability.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 \
@@ -944,7 +944,7 @@
  ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \
  list_element.h libpcb_fp.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 dolists.h
+ rtree.h strflags.h undo.h plugins.h hid_actions.h dolists.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 \
@@ -1024,7 +1024,7 @@
  ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \
  list_element.h libpcb_fp.h data.h global.h action_helper.h change.h \
  error.h undo.h misc.h ../src_3rd/genvector/gds_char.h mymem.h set.h \
- plugins.h pcb-printf.h dolists.h
+ plugins.h hid_actions.h pcb-printf.h dolists.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 \
@@ -1050,7 +1050,7 @@
  ../src_3rd/genvector/gds_char.h mymem.h error.h draw.h pcb-printf.h \
  plugins.h hid_helper.h hid.h hid_nogui.h hid_draw_helpers.h \
  ../src_plugins/export_ps/ps.h print.h hid_init.h hid_attrib.h \
- hid_flags.h dolists.h
+ hid_flags.h hid_actions.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 \
@@ -1076,7 +1076,7 @@
  list_element.h libpcb_fp.h data.h global.h misc.h \
  ../src_3rd/genvector/gds_char.h mymem.h plugins.h hid.h \
  ../src_plugins/export_lpr/../export_ps/ps.h hid_nogui.h hid_init.h \
- hid_attrib.h
+ hid_attrib.h hid_actions.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 \
@@ -1335,7 +1335,8 @@
  ../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 resource.h \
- ../src_plugins/hid_gtk/gui-pinout-preview.h pcb-printf.h hid_attrib.h
+ ../src_plugins/hid_gtk/gui-pinout-preview.h pcb-printf.h hid_attrib.h \
+ hid_init.h
 ../src_plugins/hid_gtk/gui-dialog.o: ../src_plugins/hid_gtk/gui-dialog.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 \
@@ -1538,7 +1539,8 @@
  rats.h remove.h report.h rotate.h rubberband.h search.h select.h set.h \
  undo.h event.h free_atexit.h paths.h \
  ../src_plugins/hid_gtk/gui-icons-mode-buttons.data \
- ../src_plugins/hid_gtk/gui-icons-misc.data hid_attrib.h hid_actions.h
+ ../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 \
@@ -1586,7 +1588,8 @@
  ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \
  list_element.h libpcb_fp.h data.h global.h crosshair.h misc.h \
  ../src_3rd/genvector/gds_char.h mymem.h pcb-printf.h hid.h \
- ../src_plugins/hid_lesstif/lesstif.h hid_attrib.h hid_actions.h
+ ../src_plugins/hid_lesstif/lesstif.h hid_attrib.h hid_actions.h \
+ hid_init.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.h \
@@ -1629,8 +1632,8 @@
  list_element.h libpcb_fp.h data.h global.h error.h misc.h \
  ../src_3rd/genvector/gds_char.h mymem.h pcb-printf.h hid.h \
  hid_resource.h resource.h resource.h \
- ../src_plugins/hid_lesstif/lesstif.h mymem.h paths.h pcb-menu.h \
- ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_plugins/hid_lesstif/lesstif.h mymem.h paths.h hid_actions.h \
+ hid_flags.h pcb-menu.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
  ../src_3rd/genht/ht_inlines.h ../src_3rd/genht/hash.h
 ../src_plugins/hid_lesstif/netlist.o: \
  ../src_plugins/hid_lesstif/netlist.c ../config.h ../config.manual.h \
@@ -1657,7 +1660,7 @@
  ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \
  list_element.h libpcb_fp.h data.h global.h set.h misc.h \
  ../src_3rd/genvector/gds_char.h mymem.h mymem.h pcb-printf.h hid.h \
- ../src_plugins/hid_lesstif/lesstif.h
+ ../src_plugins/hid_lesstif/lesstif.h hid_flags.h
 ../src_plugins/toporouter/toporouter.o: \
  ../src_plugins/toporouter/toporouter.c \
  ../src_plugins/toporouter/toporouter.h data.h global.h ../config.h \
Index: trunk/src/file.c
===================================================================
--- trunk/src/file.c	(revision 1374)
+++ trunk/src/file.c	(revision 1375)
@@ -101,6 +101,7 @@
 #include "rats_patch.h"
 #include "stub_edif.h"
 #include "hid_actions.h"
+#include "hid_flags.h"
 
 RCSID("$Id$");
 
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 1374)
+++ trunk/src/file_act.c	(revision 1375)
@@ -44,6 +44,7 @@
 #include "find.h"
 #include "search.h"
 #include "hid_actions.h"
+#include "hid_attrib.h"
 
 /* ---------------------------------------------------------------- */
 static const char execcommand_syntax[] = "ExecCommand(command)";
Index: trunk/src/hid_init.c
===================================================================
--- trunk/src/hid_init.c	(revision 1374)
+++ trunk/src/hid_init.c	(revision 1375)
@@ -33,8 +33,8 @@
 #include "pcb-printf.h"
 #include "plugins.h"
 #include "hid_attrib.h"
+#include "hid_flags.h"
 
-
 RCSID("$Id$");
 
 HID **hid_list = 0;
Index: trunk/src/hid_resource.c
===================================================================
--- trunk/src/hid_resource.c	(revision 1374)
+++ trunk/src/hid_resource.c	(revision 1375)
@@ -6,6 +6,7 @@
 #include "hid.h"
 #include "resource.h"
 #include "hid_resource.h"
+#include "hid_actions.h"
 
 /* #define DEBUG_HID_RESOURCE */
 
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 1374)
+++ trunk/src/main.c	(revision 1375)
@@ -65,6 +65,7 @@
 
 #include "hid_actions.h"
 #include "hid_attrib.h"
+#include "hid_init.h"
 
 #ifdef HAVE_DBUS
 #include "dbus.h"
Index: trunk/src/misc.c
===================================================================
--- trunk/src/misc.c	(revision 1374)
+++ trunk/src/misc.c	(revision 1375)
@@ -73,6 +73,7 @@
 #include "action_helper.h"
 #include "portability.h"
 #include "hid_actions.h"
+#include "hid_init.h"
 
 RCSID("$Id$");
 
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 1374)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 1375)
@@ -18,6 +18,7 @@
 #include "hid_nogui.h"
 #include "hid_init.h"
 #include "hid_attrib.h"
+#include "hid_actions.h"
 
 
 RCSID("$Id$");
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 1374)
+++ trunk/src_plugins/export_ps/ps.c	(revision 1375)
@@ -27,6 +27,7 @@
 #include "hid_attrib.h"
 #include "hid_helper.h"
 #include "hid_flags.h"
+#include "hid_actions.h"
 
 
 RCSID("$Id$");
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c	(revision 1374)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c	(revision 1375)
@@ -8,6 +8,7 @@
 #include "src/paths.h"
 #include "src/error.h"
 #include "src/plugins.h"
+#include "src/hid_actions.h"
 #include "scripts.h"
 #include "manage_scripts.h"
 
Index: trunk/src_plugins/hid_gtk/gui-dialog-print.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-dialog-print.c	(revision 1374)
+++ trunk/src_plugins/hid_gtk/gui-dialog-print.c	(revision 1375)
@@ -37,8 +37,8 @@
 #include "gui.h"
 #include "pcb-printf.h"
 #include "hid_attrib.h"
+#include "hid_init.h"
 
-
 RCSID("$Id$");
 
 static GtkWidget *export_dialog = NULL;
Index: trunk/src_plugins/hid_gtk/gui-top-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 1374)
+++ trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 1375)
@@ -105,6 +105,7 @@
 #include "gui-icons-misc.data"
 #include "hid_attrib.h"
 #include "hid_actions.h"
+#include "hid_flags.h"
 
 RCSID("$Id$");
 
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 1374)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 1375)
@@ -20,6 +20,7 @@
 #include "lesstif.h"
 #include "hid_attrib.h"
 #include "hid_actions.h"
+#include "hid_init.h"
 
 RCSID("$Id$");
 
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 1374)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 1375)
@@ -22,6 +22,8 @@
 #include "lesstif.h"
 #include "mymem.h"
 #include "paths.h"
+#include "hid_actions.h"
+#include "hid_flags.h"
 
 #include "pcb-menu.h"
 #include <genht/htsp.h>
Index: trunk/src_plugins/hid_lesstif/styles.c
===================================================================
--- trunk/src_plugins/hid_lesstif/styles.c	(revision 1374)
+++ trunk/src_plugins/hid_lesstif/styles.c	(revision 1375)
@@ -19,8 +19,10 @@
 
 #include "hid.h"
 #include "lesstif.h"
+#include "hid_flags.h"
 
 
+
 RCSID("$Id$");
 
 /* There are three places where styles are kept:
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 1374)
+++ trunk/src_plugins/puller/puller.c	(revision 1375)
@@ -67,8 +67,8 @@
 #include "strflags.h"
 #include "undo.h"
 #include "plugins.h"
+#include "hid_actions.h"
 
-
 RCSID("$Id$");
 
 #define abort1() fprintf(stderr, "abort at line %d\n", __LINE__), abort()
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 1374)
+++ trunk/src_plugins/renumber/renumber.c	(revision 1375)
@@ -34,6 +34,7 @@
 #include "misc.h"
 #include "set.h"
 #include "plugins.h"
+#include "hid_actions.h"
 
 #include "pcb-printf.h"