Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26792)
+++ trunk/src/hid.h	(revision 26793)
@@ -471,7 +471,7 @@
 	     string  print summary for the topic in string
 	   Return 0 on success.
 	*/
-	int (*usage)(const char *subtopic);
+	int (*usage)(pcb_hid_t *hid, const char *subtopic);
 
 
 	/* Optional: change cursor to indicate if an object is grabbed (or not) */
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 26792)
+++ trunk/src/main_act.c	(revision 26793)
@@ -178,7 +178,7 @@
 		for (i = 0; hl[i]; i++) {
 			if ((hl[i]->usage != NULL) && (strcmp(topic, hl[i]->name) == 0)) {
 				PCB_ACT_MAY_CONVARG(2, FGW_STR, PrintUsage, subt = argv[2].val.str);
-				PCB_ACT_IRES(hl[i]->usage(subt));
+				PCB_ACT_IRES(hl[i]->usage(hl[i], subt));
 				return 0;
 			}
 		}
Index: trunk/src_plugins/cam/cam.c
===================================================================
--- trunk/src_plugins/cam/cam.c	(revision 26792)
+++ trunk/src_plugins/cam/cam.c	(revision 26793)
@@ -213,7 +213,7 @@
 	return 0;
 }
 
-static int export_cam_usage(const char *topic)
+static int export_cam_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nThe cam exporter shorthand:\n\n");
 	fprintf(stderr, "\nUsage: pcb-rnd -x cam jobname [cam-opts] [pcb-rnd-options] filename");
Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 26792)
+++ trunk/src_plugins/export_bom/bom.c	(revision 26793)
@@ -280,7 +280,7 @@
 	PrintBOM();
 }
 
-static int bom_usage(const char *topic)
+static int bom_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nbom exporter command line arguments:\n\n");
 	pcb_hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0]));
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 26792)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 26793)
@@ -511,7 +511,7 @@
 {
 }
 
-static int dxf_usage(const char *topic)
+static int dxf_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\ndxf exporter command line arguments:\n\n");
 	pcb_hid_usage(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]));
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 26792)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 26793)
@@ -445,7 +445,7 @@
 	pcb_message(PCB_MSG_ERROR, "Excellon internal error: can not calibrate()\n");
 }
 
-static int excellon_usage(const char *topic)
+static int excellon_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nexcellon exporter command line arguments:\n\n");
 	pcb_hid_usage(excellon_options, sizeof(excellon_options) / sizeof(excellon_options[0]));
Index: trunk/src_plugins/export_fidocadj/fidocadj.c
===================================================================
--- trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 26792)
+++ trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 26793)
@@ -349,7 +349,7 @@
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
-static int fidocadj_usage(const char *topic)
+static int fidocadj_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nfidocadj exporter command line arguments:\n\n");
 	pcb_hid_usage(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]));
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 26792)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 26793)
@@ -874,7 +874,7 @@
 {
 }
 
-static int gcode_usage(const char *topic)
+static int gcode_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\ngcode exporter command line arguments:\n\n");
 	pcb_hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]));
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 26792)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 26793)
@@ -1338,7 +1338,7 @@
 	CRASH("gerber_calibrate");
 }
 
-static int gerber_usage(const char *topic)
+static int gerber_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\ngerber exporter command line arguments:\n\n");
 	pcb_hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0]));
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 26792)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 26793)
@@ -107,7 +107,7 @@
 
 static pcb_hid_t lpr_hid;
 
-static int lpr_usage(const char *topic)
+static int lpr_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nlpr exporter command line arguments:\n\n");
 	pcb_hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0]));
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 26792)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 26793)
@@ -816,7 +816,7 @@
 {
 }
 
-static int openems_usage(const char *topic)
+static int openems_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nopenems exporter command line arguments:\n\n");
 	pcb_hid_usage(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]));
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 26792)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 26793)
@@ -583,7 +583,7 @@
 {
 }
 
-static int openscad_usage(const char *topic)
+static int openscad_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nopenscad exporter command line arguments:\n\n");
 	pcb_hid_usage(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]));
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 26792)
+++ trunk/src_plugins/export_png/png.c	(revision 26793)
@@ -1904,7 +1904,7 @@
 {
 }
 
-static int png_usage(const char *topic)
+static int png_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\npng exporter command line arguments:\n\n");
 	pcb_hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]));
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 26792)
+++ trunk/src_plugins/export_ps/eps.c	(revision 26793)
@@ -670,7 +670,7 @@
 {
 }
 
-static int eps_usage(const char *topic)
+static int eps_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\neps exporter command line arguments:\n\n");
 	pcb_hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]));
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 26792)
+++ trunk/src_plugins/export_ps/ps.c	(revision 26793)
@@ -1455,7 +1455,7 @@
 	ps_inited = 1;
 }
 
-static int ps_usage(const char *topic)
+static int ps_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nps exporter command line arguments:\n\n");
 	pcb_hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0]));
Index: trunk/src_plugins/export_stat/stat.c
===================================================================
--- trunk/src_plugins/export_stat/stat.c	(revision 26792)
+++ trunk/src_plugins/export_stat/stat.c	(revision 26793)
@@ -372,7 +372,7 @@
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
-static int stat_usage(const char *topic)
+static int stat_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nstat exporter command line arguments:\n\n");
 	pcb_hid_usage(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]));
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 26792)
+++ trunk/src_plugins/export_svg/svg.c	(revision 26793)
@@ -857,7 +857,7 @@
 {
 }
 
-static int svg_usage(const char *topic)
+static int svg_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nsvg exporter command line arguments:\n\n");
 	pcb_hid_usage(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]));
Index: trunk/src_plugins/export_test/export_test.c
===================================================================
--- trunk/src_plugins/export_test/export_test.c	(revision 26792)
+++ trunk/src_plugins/export_test/export_test.c	(revision 26793)
@@ -77,7 +77,7 @@
 	Printexport_test();
 }
 
-static int export_test_usage(const char *topic)
+static int export_test_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nexport_test exporter command line arguments:\n\n");
 	pcb_hid_usage(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]));
Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c
===================================================================
--- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c	(revision 26792)
+++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c	(revision 26793)
@@ -275,7 +275,7 @@
 		fprintf(stderr, "fuse_main() returned error.\n");
 }
 
-static int export_vfs_fuse_usage(const char *topic)
+static int export_vfs_fuse_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nexport_vfs_fuse exporter command line arguments are plain fuse aguments.\n\n");
 	fprintf(stderr, "\nUsage: pcb-rnd [pcb-rnd-options] [-o fuse-options] foo.pcb mountpoint\n\n");
Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c
===================================================================
--- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 26792)
+++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 26793)
@@ -126,7 +126,7 @@
 	}
 }
 
-static int export_vfs_mc_usage(const char *topic)
+static int export_vfs_mc_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nexport_vfs_mc exporter command line arguments:\n\n");
 	pcb_hid_usage(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]));
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 26792)
+++ trunk/src_plugins/export_xy/xy.c	(revision 26793)
@@ -825,7 +825,7 @@
 	PrintXY(&templ, options[HA_format].str_value);
 }
 
-static int xy_usage(const char *topic)
+static int xy_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nXY exporter command line arguments:\n\n");
 	pcb_hid_usage(xy_options, sizeof(xy_options) / sizeof(xy_options[0]));
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 26792)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 26793)
@@ -41,7 +41,7 @@
 	return NULL;
 }
 
-static int batch_usage(const char *topic)
+static int batch_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nbatch GUI command line arguments: none\n\n");
 	fprintf(stderr, "\nInvocation: pcb-rnd --gui batch [options]\n");
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26792)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26793)
@@ -2842,7 +2842,7 @@
 	fflush(stdout);
 }
 
-static int lesstif_usage(const char *topic)
+static int lesstif_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nLesstif GUI command line arguments:\n\n");
 	pcb_hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0]));
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26792)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26793)
@@ -349,7 +349,7 @@
 	return ghidgui->topwin.ghid_cfg;
 }
 
-static int ghid_usage(const char *topic)
+static int ghid_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nGTK GUI command line arguments:\n\n");
 	conf_usage("plugins/hid_gtk", pcb_hid_usage_option);
Index: trunk/src_plugins/loghid/loghid.c
===================================================================
--- trunk/src_plugins/loghid/loghid.c	(revision 26792)
+++ trunk/src_plugins/loghid/loghid.c	(revision 26793)
@@ -89,7 +89,7 @@
 }
 
 
-static int loghid_usage(const char *topic)
+static int loghid_usage(pcb_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nloghid command line arguments:\n\n");
 	pcb_hid_usage(loghid_attribute_list, NUM_OPTIONS);