From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
Date: Sat, 1 Feb 2025 00:23:21 +0100
Origin: upstream, https://sourceforge.net/p/mcj/xfig/ci/c34a1b3
Forwarded: not-needed
Bug: https://sourceforge.net/p/mcj/tickets/194/
Bug-Debian: https://bugs.debian.org/1098137
Last-Update: 2025-09-05
Subject: Fix prototypes for keyboard callbacks

--- a/src/d_arc.c
+++ b/src/d_arc.c
@@ -74,11 +74,11 @@ arc_drawing_selected(void)
 {
     center_marked = FALSE;
     set_mousefun("first point", "center point", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_arc_drawing;
     canvas_middlebut_proc = init_arc_c_drawing;
-    canvas_rightbut_proc = null_proc;
+    canvas_rightbut_proc = null_proc_button;
     set_cursor(crosshair_cursor);
     reset_action_on();
 }
--- a/src/d_arcbox.c
+++ b/src/d_arcbox.c
@@ -43,7 +43,7 @@ void
 arcbox_drawing_selected(void)
 {
     set_mousefun("corner point", "", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_arc_box_drawing;
     canvas_middlebut_proc = null_proc_button;
--- a/src/d_box.c
+++ b/src/d_box.c
@@ -43,7 +43,7 @@ void
 box_drawing_selected(void)
 {
     set_mousefun("corner point", "", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_box_drawing;
     canvas_middlebut_proc = null_proc_button;
--- a/src/d_ellipse.c
+++ b/src/d_ellipse.c
@@ -54,7 +54,7 @@ static void	cancel_circlebydia(int x, in
 void
 circle_ellipse_byradius_drawing_selected(void)
 {
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_circlebyradius_drawing;
     canvas_middlebut_proc = init_ellipsebyradius_drawing;
@@ -141,7 +141,7 @@ create_ellipsebyrad(int x, int y, unsign
 void circle_ellipse_bydiameter_drawing_selected(void)
 {
     set_mousefun("Circle diameter", "Ellipse corner", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_circlebydiameter_drawing;
     canvas_middlebut_proc = init_ellipsebydiameter_drawing;
--- a/src/d_line.c
+++ b/src/d_line.c
@@ -53,7 +53,7 @@ static void	    init_line_freehand_drawi
 void
 line_drawing_selected(void)
 {
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_line_drawing;
     canvas_middlebut_proc = init_line_freehand_drawing;
--- a/src/d_picobj.c
+++ b/src/d_picobj.c
@@ -48,7 +48,7 @@ void
 picobj_drawing_selected(void)
 {
     set_mousefun("corner point", "", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_picobj_drawing;
     canvas_middlebut_proc = null_proc_button;
--- a/src/d_regpoly.c
+++ b/src/d_regpoly.c
@@ -47,7 +47,7 @@ void
 regpoly_drawing_selected(void)
 {
     set_mousefun("center point", "", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_regpoly_drawing;
     canvas_middlebut_proc = null_proc_button;
--- a/src/d_spline.c
+++ b/src/d_spline.c
@@ -51,7 +51,7 @@ void
 spline_drawing_selected(void)
 {
     set_mousefun("first point", "freehand", "", "", "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_leftbut_proc = init_spline_drawing;
     canvas_middlebut_proc = init_spline_freehand_drawing;
--- a/src/d_text.c
+++ b/src/d_text.c
@@ -162,7 +162,7 @@ static Boolean	is_preedit_running();
 void
 text_drawing_selected(void)
 {
-	canvas_kbd_proc = null_proc;
+	canvas_kbd_proc = null_proc_kbd;
 	canvas_locmove_proc = null_proc;
 	canvas_middlebut_proc = null_proc_button;
 	canvas_leftbut_proc = init_text_input;
@@ -407,7 +407,7 @@ overlay_text_input(int x, int y)
 	set_mousefun("new text", "finish text", "cancel", "", "paste text", "");
 	draw_mousefun_kbd();
 	draw_mousefun_canvas();
-	canvas_kbd_proc = (void (*)())char_handler;
+	canvas_kbd_proc = char_handler;
 	canvas_middlebut_proc = finish_text_input;
 	canvas_leftbut_proc = finish_n_start;
 	canvas_rightbut_proc = cancel_text_input;
@@ -471,7 +471,7 @@ init_text_input(int x, int y, unsigned i
 	set_mousefun("new text", "finish text", "cancel", "", "paste text", "");
 	draw_mousefun_kbd();
 	draw_mousefun_canvas();
-	canvas_kbd_proc = (void (*)())char_handler;
+	canvas_kbd_proc = char_handler;
 	canvas_middlebut_proc = finish_text_input;
 	canvas_leftbut_proc = finish_n_start;
 	canvas_rightbut_proc = cancel_text_input;
@@ -813,7 +813,7 @@ terminate_char_handler(void)
 }
 
 void
-char_handler(unsigned char *c, int clen, KeySym keysym)
+char_handler(char *c, int clen, KeySym keysym)
 {
 	int    i;
 
--- a/src/d_text.h
+++ b/src/d_text.h
@@ -28,7 +28,7 @@
 
 extern int		work_font;
 extern XFontStruct	*canvas_font;
-extern void	char_handler(unsigned char *c, int clen, KeySym keysym);
+extern void	char_handler(char *c, int clen, KeySym keysym);
 extern void	finish_text_input(int x, int y, unsigned int shift);
 
 extern XIC	xim_ic;
--- a/src/e_addpt.c
+++ b/src/e_addpt.c
@@ -50,7 +50,7 @@ void
 point_adding_selected(void)
 {
     set_mousefun("break/add here", "", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_point_adding);
--- a/src/e_align.c
+++ b/src/e_align.c
@@ -69,7 +69,7 @@ void
 align_selected(void)
 {
     set_mousefun("align compound", "align canvas", "", LOC_OBJ, "", LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_align);
--- a/src/e_arrow.c
+++ b/src/e_arrow.c
@@ -50,7 +50,7 @@ void
 arrow_head_selected(void)
 {
     set_mousefun("add arrow", "delete arrow", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(add_arrow_head);
--- a/src/e_break.c
+++ b/src/e_break.c
@@ -43,7 +43,7 @@ void
 break_selected(void)
 {
     set_mousefun("break compound", "break and tag", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_break_only);
--- a/src/e_chop.c
+++ b/src/e_chop.c
@@ -87,7 +87,7 @@ chop_selected(void)
     set_mousefun("Select axe object", "Select log object", "Clear axe list",
 			LOC_OBJ, LOC_OBJ, LOC_OBJ);
     draw_mousefun_canvas();
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(select_axe_object);
--- a/src/e_compound.c
+++ b/src/e_compound.c
@@ -126,7 +126,7 @@ open_compound_selected(void)
 
   set_mousefun("open compound", "open, keep visible", "",
 		LOC_OBJ, LOC_OBJ, LOC_OBJ);
-  canvas_kbd_proc = null_proc;
+  canvas_kbd_proc = null_proc_kbd;
   canvas_locmove_proc = null_proc;
   canvas_ref_proc = null_proc;
   init_searchproc_left(init_open_compound);
--- a/src/e_convert.c
+++ b/src/e_convert.c
@@ -52,7 +52,7 @@ void
 convert_selected(void)
 {
     set_mousefun("spline<->line", "", "open<->closed", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_convert_line_spline);
--- a/src/e_copy.c
+++ b/src/e_copy.c
@@ -51,7 +51,7 @@ static void	init_copy_to_scrap(F_line *p
 void
 copy_selected(void)
 {
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_arb_copy);
--- a/src/e_delete.c
+++ b/src/e_delete.c
@@ -65,7 +65,7 @@ delete_selected(void)
 {
     set_mousefun("delete object", "delete region", "del to cut buf",
 			LOC_OBJ, "", LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_delete);
--- a/src/e_deletept.c
+++ b/src/e_deletept.c
@@ -45,7 +45,7 @@ void
 delete_point_selected(void)
 {
     set_mousefun("delete point", "", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_delete_point);
--- a/src/e_edit.c
+++ b/src/e_edit.c
@@ -686,7 +686,7 @@ void edit_item_selected(void)
 {
 	set_mousefun("edit object", "edit Main comment", "edit point",
 			LOC_OBJ, "show comments", LOC_OBJ);
-	canvas_kbd_proc = null_proc;
+	canvas_kbd_proc = null_proc_kbd;
 	canvas_locmove_proc = null_proc;
 	canvas_ref_proc = null_proc;
 	init_searchproc_left(edit_item);
--- a/src/e_flip.c
+++ b/src/e_flip.c
@@ -102,7 +102,7 @@ flip_selected(void)
 {
     set_mousefun("flip", "copy & flip", "set anchor",
 			LOC_OBJ, LOC_OBJ, "set anchor");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_flip);
--- a/src/e_glue.c
+++ b/src/e_glue.c
@@ -65,7 +65,7 @@ compound_selected(void)
 {
     set_mousefun("tag object", "tag region", "compound tagged",
 			LOC_OBJ, "", "");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(tag_object);
--- a/src/e_joinsplit.c
+++ b/src/e_joinsplit.c
@@ -73,7 +73,7 @@ join_split_selected(void)
     set_mousefun("Join Lines/Splines", "Split Line/Spline", "",
 			LOC_OBJ, LOC_OBJ, LOC_OBJ);
     draw_mousefun_canvas();
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_join);
--- a/src/e_measure.c
+++ b/src/e_measure.c
@@ -89,7 +89,7 @@ static float total_area = 0.0;
 void anglemeas_selected(void)
 {
     set_mousefun("first point", "select & save", "select object", "", LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_middle(init_anglemeas_object_m);
@@ -314,7 +314,7 @@ freehand_line_nomsg(int x, int y)
 void lenmeas_selected(void)
 {
     set_mousefun("select object", "select & add", "reset to 0", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_lenmeas_object_l);
@@ -426,7 +426,7 @@ clear_lenmeas_memory(int x, int y, unsig
 void areameas_selected(void)
 {
     set_mousefun("select object", "select & add", "reset to 0", LOC_OBJ, LOC_OBJ, "reset to +-0");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_areameas_object_l);
--- a/src/e_move.c
+++ b/src/e_move.c
@@ -42,7 +42,7 @@ void
 move_selected(void)
 {
     set_mousefun("move object", "horiz/vert move", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     init_searchproc_left(init_arb_move);
     init_searchproc_middle(init_constrained_move);
--- a/src/e_movept.c
+++ b/src/e_movept.c
@@ -80,7 +80,7 @@ static void	cancel_movedlinepoint(int x,
 void move_point_selected(void)
 {
     set_mousefun("move point", "horiz/vert move", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_arb_move_point);
--- a/src/e_placelib.c
+++ b/src/e_placelib.c
@@ -59,7 +59,7 @@ static int	off_library_y;
 static void	init_move_object(int x, int y);
 static void	move_object(int x, int y);
 static void	change_draw_mode(int x, int y);
-static void	transform_lib_obj(unsigned char *c, int clen, KeySym keysym);
+static void	transform_lib_obj(char *c, int clen, KeySym keysym);
 static void	place_lib_object(int x, int y, unsigned int shift);
 static void	put_draw(int paint_mode);
 static void	sel_place_lib_obj_proc(int x, int y, unsigned int shift);
@@ -116,7 +116,7 @@ put_selected(void)
 /* allow rotation or flipping of library object before placing on canvas */
 
 static void
-transform_lib_obj(unsigned char *c, int clen, KeySym keysym)
+transform_lib_obj(char *c, int clen, KeySym keysym)
 {
 	(void)keysym;
 	(void)clen;
@@ -163,7 +163,7 @@ sel_place_lib_obj_proc(int x, int y, uns
 void
 sel_place_lib_obj(void)
 {
-    canvas_kbd_proc = (void (*)())transform_lib_obj;
+    canvas_kbd_proc = transform_lib_obj;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     canvas_leftbut_proc = null_proc_button;
@@ -258,7 +258,7 @@ place_lib_object(int x, int y, unsigned
     redisplay_compound(new_c);
     if (shift) {
 	/* temporarily turn off library place mode so we can edit the object just placed */
-	canvas_kbd_proc = null_proc;
+	canvas_kbd_proc = null_proc_kbd;
 	clear_mousefun();
 	set_mousefun("","","", "", "", "");
 	turn_off_current();
@@ -325,7 +325,7 @@ cancel_place_lib_obj(int x, int y, unsig
     canvas_rightbut_proc = null_proc_button;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     clear_mousefun();
     set_mousefun("","","", "", "", "");
     turn_off_current();
--- a/src/e_rotate.c
+++ b/src/e_rotate.c
@@ -109,7 +109,7 @@ rotate_selected(void)
 {
     set_mousefun("rotate object", "copy & rotate", "set center",
 			LOC_OBJ, LOC_OBJ, "set center");
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_rotate);
--- a/src/e_scale.c
+++ b/src/e_scale.c
@@ -105,7 +105,7 @@ scale_selected(void)
 {
     set_mousefun("scale box", "scale about center", "",
 			LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_box_scale);
--- a/src/e_tangent.c
+++ b/src/e_tangent.c
@@ -49,7 +49,7 @@ void
 tangent_selected(void)
 {
     set_mousefun("add tangent", "add normal", "", LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = smart_null_proc;
     canvas_ref_proc = smart_null_proc;
     init_smart_searchproc_left(init_tangent_adding);
--- a/src/e_update.c
+++ b/src/e_update.c
@@ -93,7 +93,7 @@ update_selected(void)
 {
     set_mousefun("update object", "update settings", "",
 			LOC_OBJ, LOC_OBJ, LOC_OBJ);
-    canvas_kbd_proc = null_proc;
+    canvas_kbd_proc = null_proc_kbd;
     canvas_locmove_proc = null_proc;
     canvas_ref_proc = null_proc;
     init_searchproc_left(init_update_object);
--- a/src/w_canvas.c
+++ b/src/w_canvas.c
@@ -69,7 +69,7 @@
 
 /*********************** EXPORTS ************************/
 
-void		(*canvas_kbd_proc) ();
+void		(*canvas_kbd_proc) (char *c, int clen, KeySym keysym);
 void		(*canvas_locmove_proc) ();
 void		(*canvas_ref_proc) ();
 void		(*canvas_leftbut_proc) (int x, int y, unsigned int shift);
@@ -125,6 +125,16 @@ null_proc_button(int x, int y, unsigned
 	null_proc();
 }
 
+void
+null_proc_kbd(char *c, int clen, KeySym keysym)
+{
+	(void)c;
+	(void)clen;
+	(void)keysym;
+
+	null_proc();
+}
+
 static void
 canvas_exposed(Widget tool, XEvent *event, String *params, Cardinal *nparams)
 {
@@ -212,7 +222,8 @@ init_canvas(Widget tool)
 	canvas_leftbut_proc = null_proc_button;
 	canvas_middlebut_proc = null_proc_button;
 	canvas_rightbut_proc = null_proc_button;
-	canvas_kbd_proc = canvas_locmove_proc = null_proc;
+	canvas_kbd_proc = null_proc_kbd;
+	canvas_locmove_proc = null_proc;
 	XtAugmentTranslations(canvas_sw,
 			XtParseTranslationTable(canvas_translations));
 	readComposeKey();
@@ -629,7 +640,7 @@ canvas_selected(Widget tool, XButtonEven
 
 			/* edit text */
 			} else {
-				if (canvas_kbd_proc != null_proc ) {
+				if (canvas_kbd_proc != null_proc_kbd ) {
 					if (key == XK_Left || key == XK_Right ||
 							key == XK_Home ||
 							key == XK_End) {
@@ -714,12 +725,12 @@ get_canvas_clipboard(Widget w, XtPointer
 				&tmp, &num_values);
 		if (ret_status == Success || 0 < num_values) {
 			for (i = 0; i < num_values; ++i) {
-				canvas_kbd_proc((unsigned char *)tmp[i],
+				canvas_kbd_proc((char *)tmp[i],
 						(int)strlen(tmp[i]), (KeySym)0);
 			}
 		}
 	} else {
-		canvas_kbd_proc((unsigned char *)buf, (int)(*length),(KeySym)0);
+		canvas_kbd_proc((char *)buf, (int)(*length),(KeySym)0);
 	}
 	XtFree(buf);
 }
@@ -740,7 +751,7 @@ canvas_paste(Widget w, XKeyEvent *paste_
 	Time event_time;
 	Atom	atom_utf8_string;
 
-	if (canvas_kbd_proc != (void (*)())char_handler)
+	if (canvas_kbd_proc != char_handler)
 		return;
 
 	if (paste_event != NULL)
--- a/src/w_canvas.h
+++ b/src/w_canvas.h
@@ -24,7 +24,7 @@
 
 extern void	init_canvas(Widget tool);
 extern void	add_canvas_actions(void);
-extern void	(*canvas_kbd_proc) ();
+extern void	(*canvas_kbd_proc) (char *c, int clen, KeySym keysym);
 extern void	(*canvas_locmove_proc) ();
 extern void	(*canvas_ref_proc) ();
 extern void	(*canvas_leftbut_proc) (int x, int y, unsigned int shift);
@@ -34,6 +34,7 @@ extern void	(*canvas_rightbut_proc) (int
 extern void	(*return_proc) ();
 extern void	null_proc(void);
 extern void	null_proc_button(int x, int y, unsigned int shift);
+extern void	null_proc_kbd(char *c, int clen, KeySym keysym);
 extern void	toggle_show_balloons(void);
 extern void	toggle_show_lengths(void);
 extern void	toggle_show_vertexnums(void);
--- a/src/w_cmdpanel.c
+++ b/src/w_cmdpanel.c
@@ -1724,7 +1724,7 @@ paste_character(Widget w, XtPointer clie
 	XftChar8	str[FC_UTF8_MAX_LEN];
 
 	/* only allow during text input */
-	if (canvas_kbd_proc != (void (*)())char_handler)
+	if (canvas_kbd_proc != char_handler)
 		return;
 
 	len = FcUcs4ToUtf8((XftChar32)i.val, str);
--- a/src/w_library.c
+++ b/src/w_library.c
@@ -283,7 +283,7 @@ library_cancel(Widget w, XButtonEvent *e
     } else {
 	/* otherwise, cancel all library operations */
 	reset_action_on();
-	canvas_kbd_proc = null_proc;
+	canvas_kbd_proc = null_proc_kbd;
 	canvas_locmove_proc = null_proc;
 	canvas_ref_proc = null_proc;
 	canvas_leftbut_proc = null_proc_button;
--- a/src/w_zoom.c
+++ b/src/w_zoom.c
@@ -42,7 +42,7 @@ Boolean	zoom_in_progress = False;
 static void	do_zoom(int x, int y, unsigned int shift);
 static void	init_zoombox_drawing(int x, int y);
 
-static void	(*save_kbd_proc) ();
+static void	(*save_kbd_proc) (char *c, int clen, KeySym keysym);
 static void	(*save_locmove_proc) ();
 static void	(*save_ref_proc) ();
 static void	(*save_leftbut_proc) (int x, int y, unsigned int shift);