Index: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO	(revision 34612)
+++ trunk/doc/TODO	(revision 34613)
@@ -18,7 +18,7 @@
 		- make freq units pcb-rnd app specific, retest the openems exporter
 	- BUG: check all librnd calls to rnd_conf_get_project_conf_name(); hidlib->filename should be renamed and split to a load_name and a real_name, for project file use load_name (because of symlink designs)
 	- *BUG: sch-rnd critical: hid->attr_dlg_new() needs to get a void **hid_ctx_out argument so it can set hid_ctx before return; this is important because non-gtk HIDs will call back in sync during creating the dialog while core hid_dad will set hid_ctx only after this function returns (and the whole dialog is created); test: tree dialog {w t} in sch-rnd segfaults
-	- *BUG: sch-rnd critical: rnd_app.expose_main needs to get the rnd_hidlib_t to draw (multisheet GUI needs this, as a dialog may draw non-current-GUI)
+	- *BUG: sch-rnd critical: rnd_app.expose_main needs to get the rnd_design_t to draw (multisheet GUI needs this, as a dialog may draw non-current-GUI)
 	- CLEANUP/BUG: revise rnd_dad_tree_modify_cell() - previous cell[] should be free'd...
 		- apply librnd core patch TODO.hid_dad_tree
 		- make sure all callers strdup() all cells
@@ -51,7 +51,6 @@
 			- use /local/plugin for plugin states, like /local/pcb/hid_batch
 	- conf: plugins/hid_gtk/history_size should be non-gtk-specific
 		- apps may refer to it through preferences dialog
-	- rename hidlib_conf.[ch] to librnd_conf.[ch]
 	- multi design (multides.html):
 		- problem: rnd_conf_fields
 			- it hosts native (merged) config data
@@ -59,10 +58,9 @@
 			- but if a new plugin registers a new field, that needs to be done in every existing design!
 			- if a shared tree (project, user, sys) changes, we need to re-merge all design's rnd_conf_fields
 		- mark each event [local] or [global]
-		- rename rnd_hidlib_t to rnd_design_t (or to something better)
-			- rnd_hidlib_t must contain:
-				- real file name (realpath'd)
-				- original file name (short name, as the user called it)
+		- rnd_design_t must contain:
+			- real file name (realpath'd)
+			- original file name (short name, as the user called it)
 		- cleanup: extend callbacks in rnd_conf_hid_callbacks_t to pass hidlib (multiple callbacks with different designs if multiple open designs are changed!)
 		- rnd_conf_hid_callbacks_t needs a void *user_data so code that registers an event can save context for the callback; get callbacks to get rnd_conf_hid_callbacks_t, see mbtk menu.c librnd4 TODO
 		- switch over from rnd_conf and conf_core to per design conf
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 34612)
+++ trunk/src/Makefile.dep	(revision 34613)
@@ -7,7 +7,7 @@
  ../src/librnd/core/rnd_bool.h ../src/librnd/core/event.h ../src/librnd/core/unit.h \
  ../src/librnd/core/hidlib.h ../src/librnd/core/actions.h ../src_3rd/libfungw/fungw.h \
  ../src_3rd/genht/htpp.h ../src/librnd/core/compat_misc.h ../src/librnd/core/funchash.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h ../src/librnd/core/rnd_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 \
@@ -33,7 +33,7 @@
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/safe_fs.h \
  ../src/librnd/core/safe_fs_dir.h ../src/librnd/core/compat_inc.h ../src/librnd/core/hidlib.h \
  ../src/librnd/core/event.h ../src/librnd/core/paths.h ../src/librnd/core/misc_util.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/color.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/color.h \
  ../src/librnd/core/anyload.h
 ../src/librnd/core/base64.o: ../src/librnd/core/base64.c \
  ../src/librnd/core/base64.h
@@ -94,7 +94,7 @@
  ../src/librnd/core/paths.h ../src/librnd/core/compat_fs.h ../src/librnd/core/compat_misc.h \
  ../src/librnd/core/safe_fs.h ../src/librnd/core/file_loaded.h ../src/librnd/core/hidlib.h \
  ../src/librnd/core/fptr_cast.h ../src/librnd/core/safe_fs_dir.h \
- ../src/librnd/core/compat_inc.h ../src/librnd/core/event.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/compat_inc.h ../src/librnd/core/event.h ../src/librnd/core/rnd_conf.h \
  ../src_3rd/genvector/genvector_impl.c ../src/librnd/core/conf_regfile.c \
  ../src/librnd/core/conf_multi_temp.c \
  ../src/librnd/core/conf_multi_temp.h
@@ -102,7 +102,7 @@
  ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/actions.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/config.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/error.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
- ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h ../src/librnd/core/hidlib_conf.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/unit.h \
@@ -127,7 +127,7 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/error.h \
  ../src_3rd/genht/hash.h ../src_3rd/genht/htpp.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/color.h
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/color.h
 ../src/librnd/core/error.o: ../src/librnd/core/error.c \
  ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/actions.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/config.h ../src/librnd/core/rnd_bool.h \
@@ -146,7 +146,7 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
- ../src/librnd/core/hidlib_conf.h
+ ../src/librnd/core/rnd_conf.h
 ../src/librnd/core/event.o: ../src/librnd/core/event.c \
  ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/event.h ../src/librnd/config.h \
  ../src/librnd/core/unit.h ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
@@ -190,7 +190,7 @@
  ../src/librnd/core/actions.h ../src/librnd/core/error.h ../src_3rd/libfungw/fungw.h \
  ../src_3rd/genht/htpp.h ../src_3rd/liblihata/tree.h
 ../src/librnd/core/hidlib.o: ../src/librnd/core/hidlib.c \
- ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/conf.h ../src/librnd/config.h ../src/librnd/core/global_typedefs.h \
  ../src/librnd/core/rnd_bool.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
@@ -202,7 +202,7 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/color.h ../src/librnd/core/event.h \
  ../src/librnd/core/hidlib.h ../src/librnd/core/error.h
-../src/librnd/core/hidlib_conf.o: ../src/librnd/core/hidlib_conf.c \
+../src/librnd/core/rnd_conf.o: ../src/librnd/core/rnd_conf.c \
  ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/conf.h ../src/librnd/config.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
@@ -214,7 +214,7 @@
  ../src_3rd/genvector/vtp0.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/error.h ../src/librnd/core/color.h \
- ../src/librnd/core/hidlib.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/hidlib.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/hidlib_conf_fields.h
 ../src/librnd/core/list_conf.o: ../src/librnd/core/list_conf.c \
  ../src/librnd/core/conf.h ../src/librnd/config.h ../src/librnd/core/global_typedefs.h \
@@ -256,7 +256,7 @@
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/global_typedefs.h \
  ../src/librnd/config.h ../src/librnd/core/rnd_bool.h ../src/librnd/core/error.h \
- ../src/librnd/core/hidlib.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/hidlib.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/rnd_printf.h ../src/librnd/core/unit.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
@@ -358,7 +358,7 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/color.h ../src/librnd/core/conf_hid.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/color.h ../src/librnd/core/conf_hid.h \
  ../src/librnd/core/compat_misc.h
 ../src/librnd/hid/hid.o: ../src/librnd/hid/hid.c ../src/librnd/rnd_config.h \
  ../src/librnd/config.h ../src/librnd/hid/hid.h ../src_3rd/liblihata/dom.h \
@@ -375,7 +375,7 @@
  ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/actions.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/config.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/error.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
- ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h ../src/librnd/core/hidlib_conf.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/unit.h \
@@ -413,7 +413,7 @@
  ../src/librnd/hid/hid_menu.h ../src/librnd/hid/hid.h ../src_3rd/libfungw/fungw.h \
  ../src/librnd/core/error.h ../src/librnd/core/box.h ../src/librnd/core/math_helper.h \
  ../src/librnd/core/misc_util.h ../src/librnd/core/unit.h ../src_3rd/genvector/vtp0.h \
- ../src/librnd/core/hid_cfg_action.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/hid_cfg_action.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/color.h \
@@ -445,7 +445,7 @@
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/hid/hid_dad.h \
  ../src/librnd/core/compat_misc.h ../src/librnd/core/hid_cfg.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src/librnd/hid/hid_dad_spin.h \
- ../src/librnd/hid/hid_dad_unit.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/hid/hid_dad_unit.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h
@@ -513,7 +513,7 @@
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/compat_inc.h \
  ../src/librnd/core/compat_fs.h ../src/librnd/core/file_loaded.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/hid/grid.h ../src/librnd/core/funchash.h \
@@ -534,7 +534,7 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/hidlib.h ../src/librnd/core/actions.h \
  ../src/librnd/core/error.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
- ../src/librnd/core/file_loaded.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/color.h \
+ ../src/librnd/core/file_loaded.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/color.h \
  ../src/librnd/core/paths.h ../src/librnd/core/funchash_core.h ../src/librnd/core/funchash.h \
  ../src/librnd/core/funchash_core_list.h ../src/librnd/core/compat_misc.h \
  ../src/librnd/core/event.h ../src/librnd/core/conf_hid.h ../src/librnd/core/safe_fs.h \
@@ -548,7 +548,7 @@
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src/librnd/core/box.h \
  ../src/librnd/core/math_helper.h ../src/librnd/core/misc_util.h ../src/librnd/core/unit.h \
- ../src/librnd/core/compat_misc.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/compat_misc.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/rnd_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 \
@@ -568,7 +568,7 @@
  ../src/librnd/config.h ../src/librnd/hid/tool.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/global_typedefs.h \
- ../src/librnd/config.h ../src/librnd/core/rnd_bool.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/config.h ../src/librnd/core/rnd_bool.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src/librnd/core/unit.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -647,7 +647,7 @@
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
  ../src/librnd/core/compat_misc.h ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
@@ -656,7 +656,7 @@
  ../src_3rd/genlist/gendlist.h
 ../src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.o: \
  ../src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c ../config.h \
- ../src/librnd/config.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/config.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -731,7 +731,7 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h ../src/librnd/core/error.h \
  ../src/librnd/core/box.h ../src/librnd/core/math_helper.h ../src/librnd/core/misc_util.h \
- ../src/librnd/core/unit.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/unit.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
@@ -771,7 +771,7 @@
  ../src_3rd/genht/htpp.h ../src/librnd/core/error.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h ../src/librnd/core/box.h \
  ../src/librnd/core/math_helper.h ../src/librnd/core/misc_util.h ../src/librnd/core/unit.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
@@ -818,7 +818,7 @@
  ../src/librnd/plugins/lib_gtk_common/ui_zoompan.h \
  ../src/librnd/plugins/lib_gtk_common/gtk_gl_common.c ../config.h \
  ../src/librnd/core/color_cache.h ../src_3rd/genht/hash.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/hid/pixmap.h ../src/librnd/core/globalconst.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/hid/pixmap.h ../src/librnd/core/globalconst.h \
  ../src/librnd/plugins/lib_hid_common/clip.h \
  ../src/librnd/plugins/lib_gtk_common/hid_gtk_conf.h \
  ../src/librnd/plugins/lib_gtk_common/lib_gtk_config.h \
@@ -839,7 +839,7 @@
  ../src_3rd/genht/htpp.h ../src/librnd/core/error.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h ../src/librnd/core/box.h \
  ../src/librnd/core/math_helper.h ../src/librnd/core/misc_util.h ../src/librnd/core/unit.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
@@ -871,7 +871,7 @@
  ../src/librnd/plugins/hid_lesstif/dialogs.c \
  ../src/librnd/plugins/hid_lesstif/xincludes.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/rnd_config.h ../src/librnd/config.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h ../src/librnd/config.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h ../src/librnd/config.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -913,7 +913,7 @@
 ../src/librnd/plugins/hid_lesstif/main.o: \
  ../src/librnd/plugins/hid_lesstif/main.c \
  ../src/librnd/plugins/hid_lesstif/xincludes.h ../src/librnd/rnd_config.h \
- ../src/librnd/config.h ../src/librnd/core/math_helper.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/config.h ../src/librnd/core/math_helper.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/conf.h ../src/librnd/config.h ../src/librnd/core/global_typedefs.h \
  ../src/librnd/core/rnd_bool.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
@@ -1136,7 +1136,7 @@
  ../src/librnd/plugins/lib_exp_text/draw_svg.c ../src/librnd/config.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/math_helper.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src/librnd/core/unit.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -1216,7 +1216,7 @@
  ../src/librnd/core/compat_misc.h ../src/librnd/hid/hid_attrib.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/color.h \
  ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/actions.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/actions.h \
  ../src/librnd/plugins/lib_gtk_common/hid_gtk_conf.h \
  ../src/librnd/plugins/lib_hid_common/cli_history.h
 ../src/librnd/plugins/lib_gtk2_common/bu_dwg_tooltip.o: \
@@ -1302,7 +1302,7 @@
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/hid_cfg.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src/librnd/hid/hid_dad_spin.h ../src/librnd/plugins/lib_gtk_common/dlg_attribute.c \
- ../config.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../config.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
@@ -1361,7 +1361,7 @@
  ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
  ../src/librnd/plugins/lib_gtk_common/dlg_topwin.c ../src/librnd/rnd_config.h \
  ../src/librnd/config.h ../src/librnd/plugins/lib_gtk_common/dlg_topwin.h \
- ../src_3rd/genht/hash.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/actions.h \
+ ../src_3rd/genht/hash.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/actions.h \
  ../src/librnd/hid/tool.h ../src/librnd/hid/hid_menu.h \
  ../src/librnd/plugins/lib_gtk_common/bu_pixbuf.h \
  ../src/librnd/plugins/lib_gtk_common/dlg_attribute.h \
@@ -1433,7 +1433,7 @@
  ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
  ../src/librnd/core/actions.h ../src/librnd/hid/hid_menu.h ../src/librnd/hid/hid_nogui.h \
  ../src/librnd/hid/pixmap.h ../src/librnd/plugins/lib_gtk_common/coord_conv.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
  ../src/librnd/plugins/lib_gtk_common/ui_zoompan.h \
  ../src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.h \
  ../src/librnd/plugins/lib_gtk_common/ui_crosshair.h \
@@ -1603,7 +1603,7 @@
  ../src/librnd/core/compat_misc.h ../src/librnd/hid/hid_attrib.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/color.h \
  ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/plugins/lib_hid_common/lib_hid_common.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/plugins/lib_hid_common/lib_hid_common.h \
  ../src/librnd/plugins/lib_hid_common/dialogs_conf.h \
  ../src/librnd/plugins/lib_gtk_common/glue_common.h
 ../src/librnd/plugins/lib_gtk2_common/util_listener.o: \
@@ -1717,7 +1717,7 @@
  ../src/librnd/core/compat_misc.h ../src/librnd/hid/hid_attrib.h ../src/librnd/core/color.h \
  ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
  ../src/librnd/plugins/lib_gtk_common/wt_preview.c ../config.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
  ../src/librnd/plugins/lib_gtk_common/wt_preview.h ../src/librnd/core/globalconst.h
 ../src/librnd/plugins/lib_gtk4_common/bu_command.o: \
  ../src/librnd/plugins/lib_gtk4_common/bu_command.c \
@@ -1744,7 +1744,7 @@
  ../src/librnd/plugins/lib_gtk_common/dlg_topwin.h ../src/librnd/hid/hid_dad.h \
  ../src/librnd/hid/hid_attrib.h ../src_3rd/genlist/gendlist.h \
  ../src/librnd/core/color.h ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h \
- ../src/librnd/core/hidlib.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/actions.h \
+ ../src/librnd/core/hidlib.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/actions.h \
  ../src/librnd/plugins/lib_gtk_common/hid_gtk_conf.h \
  ../src/librnd/plugins/lib_hid_common/cli_history.h
 ../src/librnd/plugins/lib_gtk4_common/bu_dwg_tooltip.o: \
@@ -1832,7 +1832,7 @@
  ../src/librnd/hid/hid_dad_spin.h \
  ../src/librnd/plugins/lib_gtk4_common/gtkc_trunc_label.h \
  ../src/librnd/plugins/lib_gtk_common/dlg_attribute.c ../config.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
@@ -1889,7 +1889,7 @@
  ../src_3rd/genht/htip.h ../src/librnd/plugins/lib_gtk4_common/bu_menu.h \
  ../src/librnd/core/conf_hid.h ../src/librnd/plugins/lib_gtk_common/bu_command.h \
  ../src/librnd/plugins/lib_gtk_common/dlg_topwin.h ../src/librnd/core/event.h \
- ../src/librnd/core/hidlib.h ../src_3rd/genht/hash.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/hidlib.h ../src_3rd/genht/hash.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/actions.h ../src/librnd/hid/tool.h ../src/librnd/hid/hid_menu.h \
  ../src/librnd/plugins/lib_gtk_common/bu_pixbuf.h \
  ../src/librnd/plugins/lib_gtk_common/hid_gtk_conf.h \
@@ -1961,7 +1961,7 @@
  ../src/librnd/core/color.h ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h \
  ../src/librnd/core/hidlib.h ../src/librnd/core/actions.h ../src/librnd/hid/hid_menu.h \
  ../src/librnd/hid/hid_nogui.h ../src/librnd/hid/pixmap.h \
- ../src/librnd/plugins/lib_gtk_common/coord_conv.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/plugins/lib_gtk_common/coord_conv.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
  ../src/librnd/plugins/lib_gtk_common/ui_zoompan.h \
  ../src/librnd/plugins/lib_gtk_common/bu_dwg_tooltip.h \
@@ -2134,7 +2134,7 @@
  ../src/librnd/plugins/lib_gtk_common/dlg_topwin.h ../src/librnd/hid/hid_dad.h \
  ../src/librnd/hid/hid_attrib.h ../src_3rd/genlist/gendlist.h \
  ../src/librnd/core/color.h ../src/librnd/hid/hid_dad_spin.h ../src/librnd/core/event.h \
- ../src/librnd/core/hidlib.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/hidlib.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/plugins/lib_hid_common/lib_hid_common.h \
  ../src/librnd/plugins/lib_hid_common/dialogs_conf.h \
  ../src/librnd/plugins/lib_gtk_common/glue_common.h
@@ -2246,7 +2246,7 @@
  ../src/librnd/hid/hid_attrib.h ../src/librnd/core/color.h ../src/librnd/hid/hid_dad_spin.h \
  ../src/librnd/core/event.h ../src/librnd/core/hidlib.h \
  ../src/librnd/plugins/lib_gtk_common/wt_preview.c ../config.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/plugins/lib_gtk_common/in_keyboard.h \
  ../src/librnd/plugins/lib_gtk_common/wt_preview.h ../src/librnd/core/globalconst.h
 ../src/librnd/plugins/lib_hid_common/act_dad.o: \
  ../src/librnd/plugins/lib_hid_common/act_dad.c ../src/librnd/rnd_config.h \
@@ -2345,7 +2345,7 @@
  ../src/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src/librnd/core/safe_fs_dir.h ../src/librnd/core/compat_inc.h ../src/librnd/core/event.h \
- ../src/librnd/core/hidlib.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/hidlib.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/plugins/lib_hid_common/dialogs_conf.h \
  ../src/librnd/plugins/lib_hid_common/dlg_fileselect.h \
  ../src/librnd/rnd_config.h ../src/librnd/config.h ../src/librnd/core/actions.h \
@@ -2413,7 +2413,7 @@
  ../src/librnd/hid/hid_dad_tree.h ../src_3rd/genht/hash.h \
  ../src/librnd/plugins/lib_hid_common/dlg_pref.h \
  ../src/librnd/plugins/lib_hid_common/dlg_pref_win.c \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/plugins/lib_hid_common/dialogs_conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/plugins/lib_hid_common/dialogs_conf.h \
  ../src/librnd/plugins/lib_hid_common/place.h \
  ../src/librnd/plugins/lib_hid_common/dlg_pref_key.c \
  ../src/librnd/hid/hid_cfg_input.h ../src_3rd/genht/htip.h \
@@ -2435,7 +2435,7 @@
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
  ../src_3rd/genvector/vtp0.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
- ../src_3rd/genlist/gendlist.h ../src/librnd/core/hidlib_conf.h \
+ ../src_3rd/genlist/gendlist.h ../src/librnd/core/rnd_conf.h \
  ../src/librnd/core/color.h ../src/librnd/hid/grid.h ../src/librnd/core/event.h \
  ../src/librnd/core/hidlib.h ../src/librnd/core/hid_cfg.h ../src/librnd/hid/hid.h \
  ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h ../src/librnd/core/error.h \
@@ -2443,7 +2443,7 @@
  ../src/librnd/hid/hid_menu.h ../src/librnd/plugins/lib_hid_common/grid_menu.h
 ../src/librnd/plugins/lib_hid_common/gui_act.o: \
  ../src/librnd/plugins/lib_hid_common/gui_act.c ../src/librnd/rnd_config.h \
- ../src/librnd/config.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/config.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/config.h ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -2564,7 +2564,7 @@
  ../src/librnd/core/color.h ../src/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src/librnd/hid/hid_dad_spin.h \
  ../src/librnd/hid/tool.h ../src_3rd/genvector/vtp0.h ../src/librnd/hid/hid_menu.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/conf_hid.h \
@@ -2645,7 +2645,7 @@
  ../src/librnd/plugins/lib_hid_gl/draw_COMMON.c
 ../src/librnd/plugins/lib_hid_gl/hidgl.o: \
  ../src/librnd/plugins/lib_hid_gl/hidgl.c ../config.h ../src/librnd/config.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -2760,7 +2760,7 @@
  ../src_3rd/genvector/vtp0.h ../src/librnd/hid/hid_cfg_input.h \
  ../src_3rd/genht/htip.h ../src/librnd/hid/hid_attrib.h \
  ../src_3rd/genlist/gendlist.h ../src/librnd/core/color.h ../src/librnd/hid/pixmap.h \
- ../src/librnd/core/event.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/core/event.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/liblihata/lihata.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2846,7 +2846,7 @@
  ../src/librnd/core/color.h ../src/librnd/hid/hid_nogui.h
 ../src/librnd/plugins/stroke/stroke.o: \
  ../src/librnd/plugins/stroke/stroke.c ../src/librnd/rnd_config.h \
- ../src/librnd/config.h ../src/librnd/core/hidlib_conf.h ../src/librnd/core/conf.h \
+ ../src/librnd/config.h ../src/librnd/core/rnd_conf.h ../src/librnd/core/conf.h \
  ../src/librnd/config.h ../src/librnd/core/global_typedefs.h ../src/librnd/core/rnd_bool.h \
  ../src/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -2954,7 +2954,7 @@
  ../src/librnd/plugins/script/guess_lang.c ../src_3rd/genht/htss.h \
  ../src_3rd/genht/ht_utils.h ../src_3rd/puplug/util.h \
  ../src/librnd/plugins/script/c_script.c ../src/librnd/core/fptr_cast.h \
- ../src/librnd/core/hidlib_conf.h ../src/librnd/core/color.h \
+ ../src/librnd/core/rnd_conf.h ../src/librnd/core/color.h \
  ../src/librnd/plugins/script/timer.c \
  ../src/librnd/plugins/script/perma.c ../config.h \
  ../src/librnd/plugins/script/script_act.c ../src/librnd/hid/hid_dad.h \
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 34612)
+++ trunk/src/Makefile.in	(revision 34613)
@@ -109,7 +109,7 @@
 	$(LIBRND)/core/hid_cfg.o
 	$(LIBRND)/core/hid_cfg_action.o
 	$(LIBRND)/core/hidlib.o
-	$(LIBRND)/core/hidlib_conf.o
+	$(LIBRND)/core/rnd_conf.o
 	$(LIBRND)/core/list_conf.o
 	$(LIBRND)/core/main_act.o
 	$(LIBRND)/core/misc_util.o
@@ -546,11 +546,11 @@
 pcblib_DATA=
 EXTRA_DIST=
 
-../src/librnd/core/hidlib_conf_fields.h: $(LIBRND)/core/hidlib_conf.h $(ROOT)/doc/conf/tree/rc.html
-	AWK=@/host/fstools/awk@ $(LIBRND)/scconfig/gen_conf.sh < $(LIBRND)/core/hidlib_conf.h > $(LIBRND)/core/hidlib_conf_fields.h
+../src/librnd/core/hidlib_conf_fields.h: $(LIBRND)/core/rnd_conf.h $(ROOT)/doc/conf/tree/rc.html
+	AWK=@/host/fstools/awk@ $(LIBRND)/scconfig/gen_conf.sh < $(LIBRND)/core/rnd_conf.h > $(LIBRND)/core/hidlib_conf_fields.h
 
-$(ROOT)/doc/conf/tree/rc.html: $(LIBRND)/core/hidlib_conf.h
-	cat $(LIBRND)/core/hidlib_conf.h | AWK=@/host/fstools/awk@ $(LIBRND)/scconfig/gen_conf.sh $(ROOT)/doc/conf/tree > /dev/null
+$(ROOT)/doc/conf/tree/rc.html: $(LIBRND)/core/rnd_conf.h
+	cat $(LIBRND)/core/rnd_conf.h | AWK=@/host/fstools/awk@ $(LIBRND)/scconfig/gen_conf.sh $(ROOT)/doc/conf/tree > /dev/null
 
 FORCE:
 
Index: trunk/src/librnd/core/hidlib_conf.c
===================================================================
--- trunk/src/librnd/core/hidlib_conf.c	(revision 34612)
+++ trunk/src/librnd/core/hidlib_conf.c	(nonexistent)
@@ -1,48 +0,0 @@
-/*
- *                            COPYRIGHT
- *
- *  pcb-rnd, interactive printed circuit board design
- *  Copyright (C) 2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  Contact:
- *    Project page: http://repo.hu/projects/pcb-rnd
- *    lead developer: http://repo.hu/projects/pcb-rnd/contact.html
- *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
- */
-
-#include <librnd/rnd_config.h>
-
-#include <librnd/core/conf.h>
-#include <librnd/core/error.h>
-#include <librnd/core/color.h>
-#include <librnd/core/hidlib.h>
-
-#include <librnd/core/hidlib_conf.h>
-
-rnd_conf_t rnd_conf;
-
-int rnd_hidlib_conf_init()
-{
-	int cnt = 0;
-
-#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
-	rnd_conf_reg_field(rnd_conf, field,isarray,type_name,cpath,cname,desc,flags);
-#include <librnd/core/hidlib_conf_fields.h>
-
-	return cnt;
-}
-
Index: trunk/src/librnd/core/hidlib_conf.h
===================================================================
--- trunk/src/librnd/core/hidlib_conf.h	(revision 34612)
+++ trunk/src/librnd/core/hidlib_conf.h	(nonexistent)
@@ -1,111 +0,0 @@
-/*
- *                            COPYRIGHT
- *
- *  pcb-rnd, interactive printed circuit board design
- *  Copyright (C) 2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  Contact:
- *    Project page: http://repo.hu/projects/pcb-rnd
- *    lead developer: http://repo.hu/projects/pcb-rnd/contact.html
- *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
- */
-
-#ifndef RND_HIDLIB_CONF_H
-#define RND_HIDLIB_CONF_H
-
-#include <librnd/core/conf.h>
-#include <librnd/core/color.h>
-
-/* to @conf_gen.sh: begin hidlib */
-
-typedef struct {
-
-	struct rnd_conf_temp_s {
-		RND_CFT_BOOLEAN click_cmd_entry_active;/* true if the command line is active when the user click - this gives the command interpreter a chance to capture the click and use the coords */
-	} temp;
-
-	const struct {                       /* rc */
-		RND_CFT_INTEGER verbose;
-		RND_CFT_INTEGER quiet;                 /* print only errors on stderr */
-		RND_CFT_BOOLEAN dup_log_to_stderr;     /* copy log messages to stderr even if there is a HID that can show them */
-		RND_CFT_STRING cli_prompt;             /* plain text prompt to prefix the command entry */
-		RND_CFT_STRING cli_backend;            /* command parser action */
-		RND_CFT_BOOLEAN export_basename;       /* if an exported file contains the source file name, remove path from it, keeping the basename only */
-		RND_CFT_STRING menu_file;              /* where to load the default menu file from. If empty/unset, fall back to 'default'. If contains slash, take it as a full path, if no slash, it is taken as SUFFIX for a normal menu search for menu-SUFFIX.lht */
-		RND_CFT_LIST menu_patches;             /* file paths to extra menu patches to load */
-		RND_CFT_LIST preferred_gui;            /* if set, try GUI HIDs in this order when no GUI is explicitly selected */
-		RND_CFT_BOOLEAN hid_fallback;          /* if there is no explicitly specified HID (--gui) and the preferred GUI fails, automatically fall back on other HIDs, eventually running in batch mode */
-		const struct {
-			RND_CFT_STRING home;                 /* user's home dir, determined run-time */
-			RND_CFT_STRING exec_prefix;          /* exec prefix path (extracted from argv[0]) */
-		} path;
-		RND_CFT_LIST anyload_persist;          /* if not empty, load all anyload directories/files from this path on startup */
-	} rc;
-
-	const struct {
-		RND_CFT_REAL layer_alpha;              /* alpha value for layer drawing */
-		RND_CFT_REAL drill_alpha;              /* alpha value for drill drawing */
-
-		const struct {
-			RND_CFT_STRING   debug_tag;          /* log style tag of debug messages */
-			RND_CFT_BOOLEAN  debug_popup;        /* whether a debug line should pop up the log window */
-			RND_CFT_STRING   info_tag;           /* log style tag of info messages */
-			RND_CFT_BOOLEAN  info_popup;         /* whether an info line should pop up the log window */
-			RND_CFT_STRING   warning_tag;        /* log style tag of warnings */
-			RND_CFT_BOOLEAN  warning_popup;      /* whether a warning should pop up the log window */
-			RND_CFT_STRING   error_tag;          /* log style tag of errors */
-			RND_CFT_BOOLEAN  error_popup;        /* whether an error should pop up the log window */
-		} loglevels;
-		const struct {
-			RND_CFT_COLOR background;            /* background and cursor color ... */
-			RND_CFT_COLOR off_limit;             /* on-screen background beyond the configured drawing area */
-			RND_CFT_COLOR grid;                  /* on-screen grid */
-			RND_CFT_COLOR cross;                 /* on-screen crosshair color (inverted) */
-		} color;
-	} appearance;
-
-	const struct {
-		RND_CFT_INTEGER mode;                  /* currently active tool */
-		RND_CFT_UNIT grid_unit;                /* select whether you draw in mm or mil */
-		RND_CFT_COORD grid;                    /* grid in pcb-units */
-		RND_CFT_LIST grids;                    /* grid in grid-string format */
-		RND_CFT_INTEGER grids_idx;             /* the index of the currently active grid from grids */
-		RND_CFT_BOOLEAN draw_grid;             /* draw grid points */
-		RND_CFT_BOOLEAN cross_grid;            /* when drawing the grid, draw little 3x3 pixel crosses instead of single pixel dots */
-		RND_CFT_BOOLEAN auto_place;            /* force placement of GUI windows (dialogs), trying to override the window manager */
-		RND_CFT_BOOLEAN fullscreen;            /* hide widgets to make more room for the drawing */
-		RND_CFT_INTEGER crosshair_shape_idx;   /* OBSOLETE: do not use */
-		RND_CFT_BOOLEAN enable_stroke;         /* Enable libstroke gestures on middle mouse button when non-zero */
-		RND_CFT_LIST translate_key;
-
-		const struct {
-			RND_CFT_BOOLEAN flip_x;              /* view: flip the design along the X (horizontal) axis */
-			RND_CFT_BOOLEAN flip_y;              /* view: flip the design along the Y (vertical) axis */
-		} view;
-
-	} editor;
-} rnd_conf_t;
-
-/* to @conf_gen.sh: end hidlib */
-
-
-extern rnd_conf_t rnd_conf;
-
-int rnd_hidlib_conf_init();
-
-
-#endif
Index: trunk/src/librnd/core/actions.c
===================================================================
--- trunk/src/librnd/core/actions.c	(revision 34612)
+++ trunk/src/librnd/core/actions.c	(revision 34613)
@@ -40,7 +40,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/funchash.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/misc_util.h>
 
Index: trunk/src/librnd/core/anyload.c
===================================================================
--- trunk/src/librnd/core/anyload.c	(revision 34612)
+++ trunk/src/librnd/core/anyload.c	(revision 34613)
@@ -41,7 +41,7 @@
 #include <librnd/core/event.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/misc_util.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "anyload.h"
 
Index: trunk/src/librnd/core/conf.c
===================================================================
--- trunk/src/librnd/core/conf.c	(revision 34612)
+++ trunk/src/librnd/core/conf.c	(revision 34613)
@@ -49,7 +49,7 @@
 #include <librnd/core/fptr_cast.h>
 #include <librnd/core/safe_fs_dir.h>
 #include <librnd/core/event.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 static const char *flcat = "conf";
 
Index: trunk/src/librnd/core/conf_act.c
===================================================================
--- trunk/src/librnd/core/conf_act.c	(revision 34612)
+++ trunk/src/librnd/core/conf_act.c	(revision 34613)
@@ -26,7 +26,7 @@
 
 #include <librnd/rnd_config.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/funchash_core.h>
 #include <librnd/core/error.h>
 #include <librnd/core/hidlib.h>
Index: trunk/src/librnd/core/conf_hid.c
===================================================================
--- trunk/src/librnd/core/conf_hid.c	(revision 34612)
+++ trunk/src/librnd/core/conf_hid.c	(revision 34613)
@@ -3,7 +3,7 @@
 #include <genht/hash.h>
 #include <genht/htpp.h>
 #include <librnd/core/error.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 typedef struct {
 	const rnd_conf_hid_callbacks_t *cb;
Index: trunk/src/librnd/core/error.c
===================================================================
--- trunk/src/librnd/core/error.c	(revision 34612)
+++ trunk/src/librnd/core/error.c	(revision 34613)
@@ -34,7 +34,7 @@
 #include <librnd/core/event.h>
 #include <librnd/hid/hid_dad.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <genvector/gds_char.h>
 
 rnd_hid_t *rnd_gui = NULL;
Index: trunk/src/librnd/core/hidlib.c
===================================================================
--- trunk/src/librnd/core/hidlib.c	(revision 34612)
+++ trunk/src/librnd/core/hidlib.c	(revision 34613)
@@ -26,7 +26,7 @@
 
 #include <librnd/rnd_config.h>
 
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/event.h>
 #include <librnd/core/error.h>
 
Index: trunk/src/librnd/core/paths.c
===================================================================
--- trunk/src/librnd/core/paths.c	(revision 34612)
+++ trunk/src/librnd/core/paths.c	(revision 34613)
@@ -32,7 +32,7 @@
 #include <librnd/core/paths.h>
 #include <librnd/core/error.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 int rnd_getpid(void);
 
Index: trunk/src/librnd/core/rnd_conf.c
===================================================================
--- trunk/src/librnd/core/rnd_conf.c	(nonexistent)
+++ trunk/src/librnd/core/rnd_conf.c	(revision 34613)
@@ -0,0 +1,48 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: http://repo.hu/projects/pcb-rnd/contact.html
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <librnd/rnd_config.h>
+
+#include <librnd/core/conf.h>
+#include <librnd/core/error.h>
+#include <librnd/core/color.h>
+#include <librnd/core/hidlib.h>
+
+#include <librnd/core/rnd_conf.h>
+
+rnd_conf_t rnd_conf;
+
+int rnd_hidlib_conf_init()
+{
+	int cnt = 0;
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	rnd_conf_reg_field(rnd_conf, field,isarray,type_name,cpath,cname,desc,flags);
+#include <librnd/core/hidlib_conf_fields.h>
+
+	return cnt;
+}
+
Index: trunk/src/librnd/core/rnd_conf.h
===================================================================
--- trunk/src/librnd/core/rnd_conf.h	(nonexistent)
+++ trunk/src/librnd/core/rnd_conf.h	(revision 34613)
@@ -0,0 +1,111 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: http://repo.hu/projects/pcb-rnd/contact.html
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef RND_HIDLIB_CONF_H
+#define RND_HIDLIB_CONF_H
+
+#include <librnd/core/conf.h>
+#include <librnd/core/color.h>
+
+/* to @conf_gen.sh: begin hidlib */
+
+typedef struct {
+
+	struct rnd_conf_temp_s {
+		RND_CFT_BOOLEAN click_cmd_entry_active;/* true if the command line is active when the user click - this gives the command interpreter a chance to capture the click and use the coords */
+	} temp;
+
+	const struct {                       /* rc */
+		RND_CFT_INTEGER verbose;
+		RND_CFT_INTEGER quiet;                 /* print only errors on stderr */
+		RND_CFT_BOOLEAN dup_log_to_stderr;     /* copy log messages to stderr even if there is a HID that can show them */
+		RND_CFT_STRING cli_prompt;             /* plain text prompt to prefix the command entry */
+		RND_CFT_STRING cli_backend;            /* command parser action */
+		RND_CFT_BOOLEAN export_basename;       /* if an exported file contains the source file name, remove path from it, keeping the basename only */
+		RND_CFT_STRING menu_file;              /* where to load the default menu file from. If empty/unset, fall back to 'default'. If contains slash, take it as a full path, if no slash, it is taken as SUFFIX for a normal menu search for menu-SUFFIX.lht */
+		RND_CFT_LIST menu_patches;             /* file paths to extra menu patches to load */
+		RND_CFT_LIST preferred_gui;            /* if set, try GUI HIDs in this order when no GUI is explicitly selected */
+		RND_CFT_BOOLEAN hid_fallback;          /* if there is no explicitly specified HID (--gui) and the preferred GUI fails, automatically fall back on other HIDs, eventually running in batch mode */
+		const struct {
+			RND_CFT_STRING home;                 /* user's home dir, determined run-time */
+			RND_CFT_STRING exec_prefix;          /* exec prefix path (extracted from argv[0]) */
+		} path;
+		RND_CFT_LIST anyload_persist;          /* if not empty, load all anyload directories/files from this path on startup */
+	} rc;
+
+	const struct {
+		RND_CFT_REAL layer_alpha;              /* alpha value for layer drawing */
+		RND_CFT_REAL drill_alpha;              /* alpha value for drill drawing */
+
+		const struct {
+			RND_CFT_STRING   debug_tag;          /* log style tag of debug messages */
+			RND_CFT_BOOLEAN  debug_popup;        /* whether a debug line should pop up the log window */
+			RND_CFT_STRING   info_tag;           /* log style tag of info messages */
+			RND_CFT_BOOLEAN  info_popup;         /* whether an info line should pop up the log window */
+			RND_CFT_STRING   warning_tag;        /* log style tag of warnings */
+			RND_CFT_BOOLEAN  warning_popup;      /* whether a warning should pop up the log window */
+			RND_CFT_STRING   error_tag;          /* log style tag of errors */
+			RND_CFT_BOOLEAN  error_popup;        /* whether an error should pop up the log window */
+		} loglevels;
+		const struct {
+			RND_CFT_COLOR background;            /* background and cursor color ... */
+			RND_CFT_COLOR off_limit;             /* on-screen background beyond the configured drawing area */
+			RND_CFT_COLOR grid;                  /* on-screen grid */
+			RND_CFT_COLOR cross;                 /* on-screen crosshair color (inverted) */
+		} color;
+	} appearance;
+
+	const struct {
+		RND_CFT_INTEGER mode;                  /* currently active tool */
+		RND_CFT_UNIT grid_unit;                /* select whether you draw in mm or mil */
+		RND_CFT_COORD grid;                    /* grid in pcb-units */
+		RND_CFT_LIST grids;                    /* grid in grid-string format */
+		RND_CFT_INTEGER grids_idx;             /* the index of the currently active grid from grids */
+		RND_CFT_BOOLEAN draw_grid;             /* draw grid points */
+		RND_CFT_BOOLEAN cross_grid;            /* when drawing the grid, draw little 3x3 pixel crosses instead of single pixel dots */
+		RND_CFT_BOOLEAN auto_place;            /* force placement of GUI windows (dialogs), trying to override the window manager */
+		RND_CFT_BOOLEAN fullscreen;            /* hide widgets to make more room for the drawing */
+		RND_CFT_INTEGER crosshair_shape_idx;   /* OBSOLETE: do not use */
+		RND_CFT_BOOLEAN enable_stroke;         /* Enable libstroke gestures on middle mouse button when non-zero */
+		RND_CFT_LIST translate_key;
+
+		const struct {
+			RND_CFT_BOOLEAN flip_x;              /* view: flip the design along the X (horizontal) axis */
+			RND_CFT_BOOLEAN flip_y;              /* view: flip the design along the Y (vertical) axis */
+		} view;
+
+	} editor;
+} rnd_conf_t;
+
+/* to @conf_gen.sh: end hidlib */
+
+
+extern rnd_conf_t rnd_conf;
+
+int rnd_hidlib_conf_init();
+
+
+#endif
Index: trunk/src/librnd/hid/grid.c
===================================================================
--- trunk/src/librnd/hid/grid.c	(revision 34612)
+++ trunk/src/librnd/hid/grid.c	(revision 34613)
@@ -39,7 +39,7 @@
 #include <librnd/hid/hid.h>
 #include <librnd/hid/grid.h>
 #include <librnd/core/conf.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/misc_util.h>
Index: trunk/src/librnd/hid/hid_act.c
===================================================================
--- trunk/src/librnd/hid/hid_act.c	(revision 34612)
+++ trunk/src/librnd/hid/hid_act.c	(revision 34613)
@@ -26,7 +26,7 @@
 
 #include <librnd/rnd_config.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/funchash_core.h>
 #include <librnd/core/error.h>
 #include <librnd/core/hidlib.h>
Index: trunk/src/librnd/hid/hid_cfg_input.c
===================================================================
--- trunk/src/librnd/hid/hid_cfg_input.c	(revision 34612)
+++ trunk/src/librnd/hid/hid_cfg_input.c	(revision 34613)
@@ -38,7 +38,7 @@
 #include <librnd/hid/hid_cfg_input.h>
 #include <librnd/hid/hid_menu.h>
 #include <librnd/core/hid_cfg_action.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/error.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/event.h>
Index: trunk/src/librnd/hid/hid_dad_spin.c
===================================================================
--- trunk/src/librnd/hid/hid_dad_spin.c	(revision 34612)
+++ trunk/src/librnd/hid/hid_dad_spin.c	(revision 34613)
@@ -36,7 +36,7 @@
 #include <librnd/hid/hid_dad_unit.h>
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 gdl_list_t rnd_dad_coord_spins;
 
Index: trunk/src/librnd/hid/hid_init.c
===================================================================
--- trunk/src/librnd/hid/hid_init.c	(revision 34612)
+++ trunk/src/librnd/hid/hid_init.c	(revision 34613)
@@ -60,7 +60,7 @@
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/file_loaded.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/conf.h>
 #include <librnd/hid/grid.h>
 #include <librnd/core/funchash.h>
Index: trunk/src/librnd/hid/hid_menu.c
===================================================================
--- trunk/src/librnd/hid/hid_menu.c	(revision 34612)
+++ trunk/src/librnd/hid/hid_menu.c	(revision 34613)
@@ -41,7 +41,7 @@
 #include <librnd/core/hidlib.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/file_loaded.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/funchash_core.h>
 #include <librnd/core/compat_misc.h>
Index: trunk/src/librnd/hid/hid_nogui.c
===================================================================
--- trunk/src/librnd/hid/hid_nogui.c	(revision 34612)
+++ trunk/src/librnd/hid/hid_nogui.c	(revision 34613)
@@ -37,7 +37,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 /* This is the "gui" that is installed at startup, and is used when
    there is no other real GUI to use.  For the most part, it just
Index: trunk/src/librnd/hid/tool.c
===================================================================
--- trunk/src/librnd/hid/tool.c	(revision 34612)
+++ trunk/src/librnd/hid/tool.c	(revision 34613)
@@ -30,7 +30,7 @@
 
 #include <librnd/hid/tool.h>
 
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/event.h>
 #include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
Index: trunk/src/librnd/plugins/hid_batch/batch.c
===================================================================
--- trunk/src/librnd/plugins/hid_batch/batch.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_batch/batch.c	(revision 34613)
@@ -10,7 +10,7 @@
 #include <librnd/core/plugins.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/event.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <librnd/hid/hid_nogui.h>
 #include <librnd/core/actions.h>
Index: trunk/src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 34613)
@@ -1,5 +1,5 @@
 #include "config.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <stdio.h>
 
Index: trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 34613)
@@ -4,7 +4,7 @@
 
 #include <librnd/core/color_cache.h>
 #include <librnd/hid/hid_attrib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/pixmap.h>
 #include <librnd/core/globalconst.h>
 
Index: trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-main.c
===================================================================
--- trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-main.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_gtk2_gl/gtkhid-main.c	(revision 34613)
@@ -4,7 +4,7 @@
 
 #include <librnd/core/plugins.h>
 #include <librnd/hid/hid_init.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <librnd/plugins/lib_hid_gl/hidgl.h>
 
Index: trunk/src/librnd/plugins/hid_gtk4_gl/gtkhid-main.c
===================================================================
--- trunk/src/librnd/plugins/hid_gtk4_gl/gtkhid-main.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_gtk4_gl/gtkhid-main.c	(revision 34613)
@@ -4,7 +4,7 @@
 
 #include <librnd/core/plugins.h>
 #include <librnd/hid/hid_init.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <librnd/plugins/lib_hid_gl/hidgl.h>
 
Index: trunk/src/librnd/plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src/librnd/plugins/hid_lesstif/dialogs.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_lesstif/dialogs.c	(revision 34613)
@@ -2,7 +2,7 @@
 
 #include <genlist/gendlist.h>
 #include <librnd/rnd_config.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <stdio.h>
 #include <stdarg.h>
Index: trunk/src/librnd/plugins/hid_lesstif/main.c
===================================================================
--- trunk/src/librnd/plugins/hid_lesstif/main.c	(revision 34612)
+++ trunk/src/librnd/plugins/hid_lesstif/main.c	(revision 34613)
@@ -2,7 +2,7 @@
 
 #include <librnd/rnd_config.h>
 #include <librnd/core/math_helper.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/hid/pixmap.h>
 
Index: trunk/src/librnd/plugins/lib_exp_text/draw_svg.c
===================================================================
--- trunk/src/librnd/plugins/lib_exp_text/draw_svg.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_exp_text/draw_svg.c	(revision 34613)
@@ -40,7 +40,7 @@
 #include <genvector/gds_char.h>
 
 #include <librnd/core/math_helper.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/error.h>
 #include <librnd/core/misc_util.h>
 #include <librnd/core/compat_misc.h>
Index: trunk/src/librnd/plugins/lib_gtk_common/bu_command.c
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/bu_command.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/bu_command.c	(revision 34613)
@@ -36,7 +36,7 @@
 #include <librnd/rnd_config.h>
 #include "rnd_gtk.h"
 #include "bu_command.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <gdk/gdkkeysyms.h>
 
Index: trunk/src/librnd/plugins/lib_gtk_common/coord_conv.h
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/coord_conv.h	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/coord_conv.h	(revision 34613)
@@ -3,7 +3,7 @@
 
 /* Coordinate conversions */
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 /* Px converts view->pcb, Vx converts pcb->view */
 static inline int Vx(rnd_coord_t x)
Index: trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/dlg_attribute.c	(revision 34613)
@@ -31,7 +31,7 @@
    then got reworked heavily by Tibor 'Igor2' Palinkas for pcb-rnd DAD */
 
 #include "config.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "dlg_attribute.h"
 #include <stdlib.h>
 
Index: trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.c
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/dlg_topwin.c	(revision 34613)
@@ -45,7 +45,7 @@
 #include <genht/htsp.h>
 #include <genht/hash.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/actions.h>
Index: trunk/src/librnd/plugins/lib_gtk_common/gtk_gl_common.c
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/gtk_gl_common.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/gtk_gl_common.c	(revision 34613)
@@ -4,7 +4,7 @@
 
 #include <librnd/core/color_cache.h>
 #include <librnd/hid/hid_attrib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/pixmap.h>
 #include <librnd/core/globalconst.h>
 
Index: trunk/src/librnd/plugins/lib_gtk_common/ui_zoompan.c
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/ui_zoompan.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/ui_zoompan.c	(revision 34613)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "ui_zoompan.h"
 
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/plugins/lib_hid_common/lib_hid_common.h>
Index: trunk/src/librnd/plugins/lib_gtk_common/wt_preview.c
===================================================================
--- trunk/src/librnd/plugins/lib_gtk_common/wt_preview.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_gtk_common/wt_preview.c	(revision 34613)
@@ -33,7 +33,7 @@
    then got a major refactoring by Tibor 'Igor2' Palinkas and Alain in pcb-rnd */
 
 #include "config.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "in_mouse.h"
 #include "in_keyboard.h"
Index: trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_common/dlg_fileselect.c	(revision 34613)
@@ -47,7 +47,7 @@
 #include <librnd/core/safe_fs_dir.h>
 #include <librnd/core/event.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "dialogs_conf.h"
 #include "dlg_fileselect.h"
Index: trunk/src/librnd/plugins/lib_hid_common/dlg_pref_key.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_common/dlg_pref_key.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_common/dlg_pref_key.c	(revision 34613)
@@ -27,7 +27,7 @@
 /* Preferences dialog, key translation tab */
 
 #include <librnd/core/conf.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/hid_cfg_input.h>
 #include <librnd/plugins/lib_hid_common/dlg_pref.h>
 #include <liblihata/tree.h>
Index: trunk/src/librnd/plugins/lib_hid_common/dlg_pref_win.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_common/dlg_pref_win.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_common/dlg_pref_win.c	(revision 34613)
@@ -27,7 +27,7 @@
 /* Preferences dialog, window geometry tab */
 
 #include <librnd/core/conf.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/plugins/lib_hid_common/dialogs_conf.h>
 #include <librnd/plugins/lib_hid_common/place.h>
 #include <librnd/plugins/lib_hid_common/dlg_pref.h>
Index: trunk/src/librnd/plugins/lib_hid_common/grid_menu.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_common/grid_menu.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_common/grid_menu.c	(revision 34613)
@@ -27,7 +27,7 @@
 #include <librnd/rnd_config.h>
 
 #include <librnd/core/conf.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/grid.h>
 #include <librnd/core/event.h>
 #include <librnd/core/hid_cfg.h>
Index: trunk/src/librnd/plugins/lib_hid_common/gui_act.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_common/gui_act.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_common/gui_act.c	(revision 34613)
@@ -33,7 +33,7 @@
  *
  */
 #include <librnd/rnd_config.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/tool.h>
 #include <librnd/hid/grid.h>
 #include <librnd/core/error.h>
Index: trunk/src/librnd/plugins/lib_hid_common/toolbar.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_common/toolbar.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_common/toolbar.c	(revision 34613)
@@ -37,7 +37,7 @@
 #include <librnd/hid/hid_dad.h>
 #include <librnd/hid/tool.h>
 #include <librnd/hid/hid_menu.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/actions.h>
 
Index: trunk/src/librnd/plugins/lib_hid_gl/hidgl.c
===================================================================
--- trunk/src/librnd/plugins/lib_hid_gl/hidgl.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_hid_gl/hidgl.c	(revision 34613)
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <stdio.h>
 #include <stdlib.h>
Index: trunk/src/librnd/plugins/lib_mbtk_common/glue_hid.c
===================================================================
--- trunk/src/librnd/plugins/lib_mbtk_common/glue_hid.c	(revision 34612)
+++ trunk/src/librnd/plugins/lib_mbtk_common/glue_hid.c	(revision 34613)
@@ -40,7 +40,7 @@
 #include <librnd/hid/hid_attrib.h>
 #include <librnd/hid/pixmap.h>
 #include <librnd/core/event.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <librnd/plugins/lib_hid_common/lib_hid_common.h>
 #include <librnd/plugins/lib_hid_common/menu_helper.h>
Index: trunk/src/librnd/plugins/script/script.c
===================================================================
--- trunk/src/librnd/plugins/script/script.c	(revision 34612)
+++ trunk/src/librnd/plugins/script/script.c	(revision 34613)
@@ -67,7 +67,7 @@
 static pup_context_t script_pup;
 
 #include "c_script.c"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/compat_fs.h>
 
 /* dir name under dotdir for saving script persistency data */
Index: trunk/src/librnd/plugins/stroke/stroke.c
===================================================================
--- trunk/src/librnd/plugins/stroke/stroke.c	(revision 34612)
+++ trunk/src/librnd/plugins/stroke/stroke.c	(revision 34613)
@@ -30,7 +30,7 @@
 
 #include <stroke.h>
 
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/unit.h>
 #include <librnd/core/plugins.h>
Index: trunk/src/test-rnd.c
===================================================================
--- trunk/src/test-rnd.c	(revision 34612)
+++ trunk/src/test-rnd.c	(revision 34613)
@@ -63,7 +63,7 @@
 
 /*** crosshair ***/
 #include <librnd/hid/hid_inlines.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 rnd_hid_gc_t foobar_crosshair_gc;
 void foobar_crosshair_gui_init(void)
 {
Index: trunk/tests/conf/conf_core.c
===================================================================
--- trunk/tests/conf/conf_core.c	(revision 34612)
+++ trunk/tests/conf/conf_core.c	(revision 34613)
@@ -1,6 +1,6 @@
 #include <librnd/core/conf.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/conf_hid.h>
 
 
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 34612)
+++ trunk/tests/conf/conftest.c	(revision 34613)
@@ -6,7 +6,7 @@
 #include <librnd/hid/hid.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/conf_hid.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/file_loaded.h>
 #include "conf_core.h"
Index: trunk/tests/librnd/librnd_test.c
===================================================================
--- trunk/tests/librnd/librnd_test.c	(revision 34612)
+++ trunk/tests/librnd/librnd_test.c	(revision 34613)
@@ -8,7 +8,7 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/poly/polyarea.h>
 
 #include "glue.c"