Index: trunk/src_plugins/dialogs/dlg_fontsel.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 32399)
@@ -175,7 +175,7 @@
 		ctx->txt_id = NULL;
 	RND_DAD_BEGIN_VBOX(ctx->dlg);
 		RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
-		RND_DAD_PREVIEW(ctx->dlg, fontsel_expose_cb, fontsel_mouse_cb, fontsel_free_cb, &vbox, 200, 200, ctx);
+		RND_DAD_PREVIEW(ctx->dlg, fontsel_expose_cb, fontsel_mouse_cb, NULL, fontsel_free_cb, &vbox, 200, 200, ctx);
 			RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 			ctx->wprev = RND_DAD_CURRENT(ctx->dlg);
 		RND_DAD_BEGIN_HBOX(ctx->dlg);
Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 32399)
@@ -563,7 +563,7 @@
 			/* right */
 			RND_DAD_BEGIN_VBOX(ctx->dlg);
 				RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
-				RND_DAD_PREVIEW(ctx->dlg, pstklib_expose, NULL, NULL, NULL, 200, 200, ctx);
+				RND_DAD_PREVIEW(ctx->dlg, pstklib_expose, NULL, NULL, NULL, NULL, 200, 200, ctx);
 					RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 					ctx->wprev = RND_DAD_CURRENT(ctx->dlg);
 
Index: trunk/src_plugins/dialogs/dlg_library.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_library.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_library.c	(revision 32399)
@@ -684,7 +684,7 @@
 			RND_DAD_BEGIN_VPANE(library_ctx.dlg);
 				RND_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME);
 				/* right top */
-				RND_DAD_PREVIEW(library_ctx.dlg, library_expose, library_mouse, NULL, NULL, 100, 100, &library_ctx);
+				RND_DAD_PREVIEW(library_ctx.dlg, library_expose, library_mouse, NULL, NULL, NULL, 100, 100, &library_ctx);
 					library_ctx.wpreview = RND_DAD_CURRENT(library_ctx.dlg);
 
 				/* right bottom */
Index: trunk/src_plugins/dialogs/dlg_netlist.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_netlist.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_netlist.c	(revision 32399)
@@ -445,7 +445,7 @@
 					wvpan = RND_DAD_CURRENT(netlist_ctx.dlg);
 					RND_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* right-top */
 						RND_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL);
-						RND_DAD_PREVIEW(netlist_ctx.dlg, netlist_expose, netlist_mouse, NULL, &netlist_ctx.bb_prv, 100, 100, &netlist_ctx);
+						RND_DAD_PREVIEW(netlist_ctx.dlg, netlist_expose, netlist_mouse, NULL, NULL, &netlist_ctx.bb_prv, 100, 100, &netlist_ctx);
 							RND_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_PRV_BOARD);
 							netlist_ctx.wprev = RND_DAD_CURRENT(netlist_ctx.dlg);
 					RND_DAD_END(netlist_ctx.dlg);
Index: trunk/src_plugins/dialogs/dlg_obj_list.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_obj_list.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_obj_list.c	(revision 32399)
@@ -83,7 +83,7 @@
 		RND_DAD_BEGIN_VBOX(dlg);
 			RND_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL);
 			for(n = 0; n < pcb_obj_list_vect.used; n++) {
-				RND_DAD_PREVIEW(dlg, view_expose_cb, view_mouse_cb, NULL, NULL, 100, 100, &pcb_obj_list_vect.array[n]);
+				RND_DAD_PREVIEW(dlg, view_expose_cb, view_mouse_cb, NULL, NULL, NULL, 100, 100, &pcb_obj_list_vect.array[n]);
 			}
 		RND_DAD_END(dlg);
 		RND_DAD_BUTTON_CLOSES(dlg, clbtn);
Index: trunk/src_plugins/dialogs/dlg_pinout.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pinout.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_pinout.c	(revision 32399)
@@ -146,7 +146,7 @@
 	ctx->subc_id = sc->ID;
 	RND_DAD_BEGIN_VBOX(ctx->dlg);
 		RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
-		RND_DAD_PREVIEW(ctx->dlg, pinout_expose, pinout_mouse, NULL, &sc->BoundingBox, 200, 200, ctx);
+		RND_DAD_PREVIEW(ctx->dlg, pinout_expose, pinout_mouse, NULL, NULL, &sc->BoundingBox, 200, 200, ctx);
 		RND_DAD_BEGIN_HBOX(ctx->dlg);
 			RND_DAD_LABEL(ctx->dlg, "Term ID:");
 			RND_DAD_LABEL(ctx->dlg, "");
Index: trunk/src_plugins/dialogs/dlg_pref_layer.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_layer.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_pref_layer.c	(revision 32399)
@@ -44,6 +44,11 @@
 	return pcb_stub_draw_csect_mouse_ev(kind, x, y);
 }
 
+rnd_bool layersel_key_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_bool release, rnd_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr)
+{
+	printf("KEY: release=%d mods=%d raw=%d tr=%d\n", release, mods, key_raw, key_tr);
+}
+
 void layersel_free_cb(rnd_hid_attribute_t *attrib, void *user_ctx, void *hid_ctx)
 {
 }
@@ -55,7 +60,7 @@
 	RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 	RND_DAD_BEGIN_VBOX(ctx->dlg);
 		RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
-		RND_DAD_PREVIEW(ctx->dlg, layersel_expose_cb, layersel_mouse_cb, layersel_free_cb, &vbox, 200, 200, ctx);
+		RND_DAD_PREVIEW(ctx->dlg, layersel_expose_cb, layersel_mouse_cb, layersel_key_cb, layersel_free_cb, &vbox, 200, 200, ctx);
 			RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 	RND_DAD_END(ctx->dlg);
 }
Index: trunk/src_plugins/dialogs/dlg_test.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_test.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_test.c	(revision 32399)
@@ -238,7 +238,7 @@
 
 			/* tab 4: preview */
 			RND_DAD_BEGIN_VBOX(ctx.dlg);
-				RND_DAD_PREVIEW(ctx.dlg, prv_expose, prv_mouse, NULL, NULL, 200, 200, NULL);
+				RND_DAD_PREVIEW(ctx.dlg, prv_expose, prv_mouse, NULL, NULL, NULL, 200, 200, NULL);
 				RND_DAD_LABEL(ctx.dlg, "This is a cool preview widget.");
 			RND_DAD_END(ctx.dlg);
 
Index: trunk/src_plugins/dialogs/dlg_view.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_view.c	(revision 32398)
+++ trunk/src_plugins/dialogs/dlg_view.c	(revision 32399)
@@ -627,7 +627,7 @@
 			/* right */
 			RND_DAD_BEGIN_VBOX(ctx->dlg);
 				RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
-				RND_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, 100, 100, ctx);
+				RND_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, NULL, 100, 100, ctx);
 					ctx->wprev = RND_DAD_CURRENT(ctx->dlg);
 					RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_PRV_BOARD);
 				RND_DAD_LABEL(ctx->dlg, "(description)");
@@ -672,7 +672,7 @@
 
 		RND_DAD_BEGIN_HBOX(ctx->dlg);
 			RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
-			RND_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, 100, 100, ctx);
+			RND_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, NULL, 100, 100, ctx);
 				ctx->wprev = RND_DAD_CURRENT(ctx->dlg);
 				RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_PRV_BOARD);
 			RND_DAD_BEGIN_VBOX(ctx->dlg);
Index: trunk/src_plugins/propedit/propdlg.c
===================================================================
--- trunk/src_plugins/propedit/propdlg.c	(revision 32398)
+++ trunk/src_plugins/propedit/propdlg.c	(revision 32399)
@@ -647,7 +647,7 @@
 			RND_DAD_BEGIN_VBOX(ctx->dlg);
 				RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 				RND_DAD_BEGIN_VBOX(ctx->dlg);
-					RND_DAD_PREVIEW(ctx->dlg, prop_prv_expose_cb, prop_prv_mouse_cb, NULL, &prvbb, 100, 100, ctx);
+					RND_DAD_PREVIEW(ctx->dlg, prop_prv_expose_cb, prop_prv_mouse_cb, NULL, NULL, &prvbb, 100, 100, ctx);
 				RND_DAD_END(ctx->dlg);
 				RND_DAD_LABEL(ctx->dlg, "<scope>");
 					ctx->wscope = RND_DAD_CURRENT(ctx->dlg);