Index: trunk/src/action_funclist.h
===================================================================
--- trunk/src/action_funclist.h	(revision 1351)
+++ trunk/src/action_funclist.h	(nonexistent)
@@ -1,126 +0,0 @@
-/*
-	Central list of function IDs
-	The core and core plugins use these from a single, central hash
-	This list is used to cpp-generate the F_* constants in enum FunctionID
-*/
-action_entry(AddSelected)
-action_entry(All)
-action_entry(AllConnections)
-action_entry(AllRats)
-action_entry(AllUnusedPins)
-action_entry(Arc)
-action_entry(Arrow)
-action_entry(Block)
-action_entry(Description)
-action_entry(Cancel)
-action_entry(Center)
-action_entry(Clear)
-action_entry(ClearAndRedraw)
-action_entry(ClearList)
-action_entry(Close)
-action_entry(Connection)
-action_entry(Convert)
-action_entry(Copy)
-action_entry(CycleClip)
-action_entry(CycleCrosshair)
-action_entry(DeleteRats)
-action_entry(Drag)
-action_entry(DrillReport)
-action_entry(Element)
-action_entry(ElementByName)
-action_entry(ElementConnections)
-action_entry(ElementToBuffer)
-action_entry(Escape)
-action_entry(Find)
-action_entry(FlipElement)
-action_entry(FoundPins)
-action_entry(Grid)
-action_entry(InsertPoint)
-action_entry(Layer)
-action_entry(Layout)
-action_entry(LayoutAs)
-action_entry(LayoutToBuffer)
-action_entry(Line)
-action_entry(LineSize)
-action_entry(Lock)
-action_entry(Mirror)
-action_entry(Move)
-action_entry(NameOnPCB)
-action_entry(Netlist)
-action_entry(NetByName)
-action_entry(None)
-action_entry(Notify)
-action_entry(Object)
-action_entry(ObjectByName)
-action_entry(PasteBuffer)
-action_entry(PadByName)
-action_entry(PinByName)
-action_entry(PinOrPadName)
-action_entry(Pinout)
-action_entry(Polygon)
-action_entry(PolygonHole)
-action_entry(PreviousPoint)
-action_entry(RatsNest)
-action_entry(Rectangle)
-action_entry(Redraw)
-action_entry(Release)
-action_entry(Revert)
-action_entry(Remove)
-action_entry(RemoveSelected)
-action_entry(Report)
-action_entry(Reset)
-action_entry(ResetLinesAndPolygons)
-action_entry(ResetPinsViasAndPads)
-action_entry(Restore)
-action_entry(Rotate)
-action_entry(Save)
-action_entry(Selected)
-action_entry(SelectedArcs)
-action_entry(SelectedElements)
-action_entry(SelectedLines)
-action_entry(SelectedNames)
-action_entry(SelectedObjects)
-action_entry(SelectedPads)
-action_entry(SelectedPins)
-action_entry(SelectedTexts)
-action_entry(SelectedVias)
-action_entry(SelectedRats)
-action_entry(Stroke)
-action_entry(Text)
-action_entry(TextByName)
-action_entry(TextScale)
-action_entry(Thermal)
-action_entry(ToLayout)
-action_entry(ToggleAllDirections)
-action_entry(ToggleAutoDRC)
-action_entry(ToggleClearLine)
-action_entry(ToggleFullPoly)
-action_entry(ToggleGrid)
-action_entry(ToggleHideNames)
-action_entry(ToggleMinCut)
-action_entry(ToggleMask)
-action_entry(ToggleName)
-action_entry(ToggleObject)
-action_entry(ToggleShowDRC)
-action_entry(ToggleLiveRoute)
-action_entry(ToggleRubberBandMode)
-action_entry(ToggleStartDirection)
-action_entry(ToggleSnapPin)
-action_entry(ToggleSnapOffGridLine)
-action_entry(ToggleHighlightOnPoint)
-action_entry(ToggleThindraw)
-action_entry(ToggleLockNames)
-action_entry(ToggleOnlyNames)
-action_entry(ToggleThindrawPoly)
-action_entry(ToggleOrthoMove)
-action_entry(ToggleLocalRef)
-action_entry(ToggleCheckPlanes)
-action_entry(ToggleUniqueNames)
-action_entry(ToggleStroke)
-action_entry(Via)
-action_entry(ViaByName)
-action_entry(Value)
-action_entry(ViaDrillingHole)
-action_entry(ViaSize)
-action_entry(Zoom)
-
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 1351)
+++ trunk/src/Makefile.dep	(revision 1352)
@@ -12,7 +12,7 @@
  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
+ stub_stroke.h funchash_core.h funchash.h funchash_core_list.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 \
@@ -25,7 +25,7 @@
  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 \
- action_funclist.h
+ funchash_core_list.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 \
  global_objs.h ../src_3rd/genlist/gendlist.h polyarea.h list_common.h \
@@ -47,8 +47,8 @@
  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 data.h funchash_core.h funchash.h \
- action_funclist.h action.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 \
+ funchash_core_list.h action.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
 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 \
@@ -206,7 +206,9 @@
  list_element.h libpcb_fp.h data.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h
 free_atexit.o: free_atexit.c
-funchash.o: funchash.c action_funclist.h
+funchash.o: funchash.c ../src_3rd/genht/htsi.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/ht_inlines.h ../src_3rd/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 \
@@ -216,8 +218,8 @@
  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 data.h action.h change.h error.h undo.h \
- funchash_core.h funchash.h action_funclist.h draw.h search.h crosshair.h \
- find.h set.h misc.h ../src_3rd/genvector/gds_char.h mymem.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
 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 \
@@ -381,7 +383,7 @@
  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 data.h action.h change.h error.h undo.h \
- funchash_core.h funchash.h action_funclist.h search.h move.h draw.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
 paths.o: paths.c paths.h error.h
@@ -433,8 +435,8 @@
  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 data.h action.h change.h error.h undo.h \
- funchash_core.h funchash.h action_funclist.h polygon.h draw.h search.h \
- crosshair.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 \
@@ -467,7 +469,7 @@
  ../src_3rd/genvector/genvector_undef.h hid.h global_element.h \
  list_element.h libpcb_fp.h data.h action.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 action_funclist.h rats.h draw.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 \
@@ -499,7 +501,7 @@
  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 data.h action.h change.h error.h undo.h set.h \
- remove.h funchash_core.h funchash.h action_funclist.h
+ remove.h funchash_core.h funchash.h funchash_core_list.h
 report.o: report.c ../config.h ../config.manual.h ../config.auto.h \
  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 \
@@ -571,7 +573,7 @@
  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 data.h action.h change.h error.h undo.h \
- funchash_core.h funchash.h action_funclist.h search.h select.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
 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 \
@@ -653,7 +655,7 @@
  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 data.h action.h change.h error.h \
- funchash_core.h funchash.h action_funclist.h crosshair.h undo.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
 vtonpoint.o: vtonpoint.c vtonpoint.h global_objs.h \
@@ -803,6 +805,9 @@
 htsp.o: ../src_3rd/genht/htsp.c ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/ht_inlines.h \
  ../src_3rd/genht/ht.c
+htsi.o: ../src_3rd/genht/htsi.c ../src_3rd/genht/htsi.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht_inlines.h \
+ ../src_3rd/genht/ht.c
 gds_char.o: ../src_3rd/genvector/gds_char.c \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h \
Index: trunk/src/funchash.c
===================================================================
--- trunk/src/funchash.c	(revision 1351)
+++ trunk/src/funchash.c	(revision 1352)
@@ -32,7 +32,7 @@
 
 #define action_entry(x) { #x, F_ ## x},
 static funchash_table_t Functions[] = {
-#include "action_funclist.h"
+#include "funchash_core_list.h"
 	{"F_END", F_END}
 };
 
Index: trunk/src/funchash_core.h
===================================================================
--- trunk/src/funchash_core.h	(revision 1351)
+++ trunk/src/funchash_core.h	(revision 1352)
@@ -4,7 +4,7 @@
 
 #define action_entry(x) F_ ## x,
 typedef enum {
-#include "action_funclist.h"
+#include "funchash_core_list.h"
 F_END
 } FunctionID;
 #undef action_entry
Index: trunk/src/funchash_core_list.h
===================================================================
--- trunk/src/funchash_core_list.h	(nonexistent)
+++ trunk/src/funchash_core_list.h	(revision 1352)
@@ -0,0 +1,126 @@
+/*
+	Central list of function IDs
+	The core and core plugins use these from a single, central hash
+	This list is used to cpp-generate the F_* constants in enum FunctionID
+*/
+action_entry(AddSelected)
+action_entry(All)
+action_entry(AllConnections)
+action_entry(AllRats)
+action_entry(AllUnusedPins)
+action_entry(Arc)
+action_entry(Arrow)
+action_entry(Block)
+action_entry(Description)
+action_entry(Cancel)
+action_entry(Center)
+action_entry(Clear)
+action_entry(ClearAndRedraw)
+action_entry(ClearList)
+action_entry(Close)
+action_entry(Connection)
+action_entry(Convert)
+action_entry(Copy)
+action_entry(CycleClip)
+action_entry(CycleCrosshair)
+action_entry(DeleteRats)
+action_entry(Drag)
+action_entry(DrillReport)
+action_entry(Element)
+action_entry(ElementByName)
+action_entry(ElementConnections)
+action_entry(ElementToBuffer)
+action_entry(Escape)
+action_entry(Find)
+action_entry(FlipElement)
+action_entry(FoundPins)
+action_entry(Grid)
+action_entry(InsertPoint)
+action_entry(Layer)
+action_entry(Layout)
+action_entry(LayoutAs)
+action_entry(LayoutToBuffer)
+action_entry(Line)
+action_entry(LineSize)
+action_entry(Lock)
+action_entry(Mirror)
+action_entry(Move)
+action_entry(NameOnPCB)
+action_entry(Netlist)
+action_entry(NetByName)
+action_entry(None)
+action_entry(Notify)
+action_entry(Object)
+action_entry(ObjectByName)
+action_entry(PasteBuffer)
+action_entry(PadByName)
+action_entry(PinByName)
+action_entry(PinOrPadName)
+action_entry(Pinout)
+action_entry(Polygon)
+action_entry(PolygonHole)
+action_entry(PreviousPoint)
+action_entry(RatsNest)
+action_entry(Rectangle)
+action_entry(Redraw)
+action_entry(Release)
+action_entry(Revert)
+action_entry(Remove)
+action_entry(RemoveSelected)
+action_entry(Report)
+action_entry(Reset)
+action_entry(ResetLinesAndPolygons)
+action_entry(ResetPinsViasAndPads)
+action_entry(Restore)
+action_entry(Rotate)
+action_entry(Save)
+action_entry(Selected)
+action_entry(SelectedArcs)
+action_entry(SelectedElements)
+action_entry(SelectedLines)
+action_entry(SelectedNames)
+action_entry(SelectedObjects)
+action_entry(SelectedPads)
+action_entry(SelectedPins)
+action_entry(SelectedTexts)
+action_entry(SelectedVias)
+action_entry(SelectedRats)
+action_entry(Stroke)
+action_entry(Text)
+action_entry(TextByName)
+action_entry(TextScale)
+action_entry(Thermal)
+action_entry(ToLayout)
+action_entry(ToggleAllDirections)
+action_entry(ToggleAutoDRC)
+action_entry(ToggleClearLine)
+action_entry(ToggleFullPoly)
+action_entry(ToggleGrid)
+action_entry(ToggleHideNames)
+action_entry(ToggleMinCut)
+action_entry(ToggleMask)
+action_entry(ToggleName)
+action_entry(ToggleObject)
+action_entry(ToggleShowDRC)
+action_entry(ToggleLiveRoute)
+action_entry(ToggleRubberBandMode)
+action_entry(ToggleStartDirection)
+action_entry(ToggleSnapPin)
+action_entry(ToggleSnapOffGridLine)
+action_entry(ToggleHighlightOnPoint)
+action_entry(ToggleThindraw)
+action_entry(ToggleLockNames)
+action_entry(ToggleOnlyNames)
+action_entry(ToggleThindrawPoly)
+action_entry(ToggleOrthoMove)
+action_entry(ToggleLocalRef)
+action_entry(ToggleCheckPlanes)
+action_entry(ToggleUniqueNames)
+action_entry(ToggleStroke)
+action_entry(Via)
+action_entry(ViaByName)
+action_entry(Value)
+action_entry(ViaDrillingHole)
+action_entry(ViaSize)
+action_entry(Zoom)
+