diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index e64ede155b2f581432131ac28c93f8a5b2f5273f..8958bd4ca185833f00c042ab97134021d8deba74 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -4302,6 +4302,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
int down, shift;
int focus = 1;
+ int autorepeat = 0;
/* remove stale tooltips, if any */
if (objtooltip) {
@@ -4309,13 +4310,15 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
sys_vgui("pdtk_canvas_leaveitem .x%x.c;\n", x);
}
- if (ac < 3)
+ if (ac < 5)
return;
if (!x || !x->gl_editor)
return;
canvas_undo_already_set_move = 0;
down = (atom_getfloat(av) != 0); /* nonzero if it's a key down */
shift = (atom_getfloat(av+2) != 0); /* nonzero if shift-ed */
+ autorepeat = (int)(atom_getfloat(av+4));
+ //fprintf(stderr,"canvas_key autorepeat=%d\n", autorepeat);
glob_shift = shift;
//fprintf(stderr,"%d %d %d %d\n", (x->gl_editor != NULL ? 1 : 0), (x->gl_editor->e_onmotion == MA_CONNECT ? 1 : 0), glob_shift, glob_lmclick);
@@ -4386,18 +4389,20 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
else if (keynum == 29)
keynum = 0, gotkeysym = gensym("Right");
#endif
- if (keynumsym->s_thing && down)
- pd_float(keynumsym->s_thing, (t_float)keynum);
- if (keyupsym->s_thing && !down)
- pd_float(keyupsym->s_thing, (t_float)keynum);
- if (keynamesym->s_thing)
- {
- t_atom at[2];
- at[0] = av[0];
- SETFLOAT(at, down);
- SETSYMBOL(at+1, gotkeysym);
- pd_list(keynamesym->s_thing, 0, 2, at);
- }
+ if (!autorepeat) {
+ if (keynumsym->s_thing && down)
+ pd_float(keynumsym->s_thing, (t_float)keynum);
+ if (keyupsym->s_thing && !down)
+ pd_float(keyupsym->s_thing, (t_float)keynum);
+ if (keynamesym->s_thing)
+ {
+ t_atom at[2];
+ at[0] = av[0];
+ SETFLOAT(at, down);
+ SETSYMBOL(at+1, gotkeysym);
+ pd_list(keynamesym->s_thing, 0, 2, at);
+ }
+ }
if (!x->gl_editor) /* if that 'invis'ed the window, we'd better stop. */
return;
if (x && down)
diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index 3e9a85a72dab9a1a6db359ffaf20e35d3c8a4763..7c9d58adf3553da92ba33f1344333a3c3b30d926 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -286,9 +286,9 @@ if { $tcl_platform(platform) == "windows" } {
set externalsdir "$::env(HOME)/pd-l2ork-externals"
}
-proc bgerror {message} {
- pdtk_post "\ntcl error: $message"
-}
+#proc bgerror {message} {
+# pdtk_post "\ntcl error: $message"
+#}
# make sure the user folder for installing externals exists
catch {
@@ -904,26 +904,26 @@ if {$pd_nt == 2} {
}
# pass key presses inside main window to patch windows
-proc pdtk_capture_root_window_keys {state key iso shift} {
+proc pdtk_capture_root_window_keys {state key iso shift serial} {
global menu_windowlist
set first_patch_window_name [lindex $menu_windowlist 0 1]
# pdtk_post "$first_patch_window_name\n"
if { [string length $first_patch_window_name] > 0 } {
- pdtk_canvas_sendkey $first_patch_window_name.c $state $key $iso $shift 0
+ pdtk_canvas_sendkey $first_patch_window_name.c $state $key $iso $shift 0 $serial
}
}
-bind . <Key> {pdtk_capture_root_window_keys 1 %K %A 0}
-bind . <Shift-Key> {pdtk_capture_root_window_keys 1 %K %A 1}
-bind . <KeyRelease> {pdtk_capture_root_window_keys 0 %K %A 0}
+bind . <Key> {pdtk_capture_root_window_keys 1 %K %A 0 %t}
+bind . <Shift-Key> {pdtk_capture_root_window_keys 1 %K %A 1 %t}
+bind . <KeyRelease> {pdtk_capture_root_window_keys 0 %K %A 0 %t}
bind . <Control-Key> {pdtk_canvas_ctrlkey %W %K 0}
bind . <Control-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1}
-bind .printout <Key> {pdtk_capture_root_window_keys 1 %K %A 0}
-bind .printout <Shift-Key> {pdtk_capture_root_window_keys 1 %K %A 1}
-bind .printout <KeyRelease> {pdtk_capture_root_window_keys 0 %K %A 0}
+bind .printout <Key> {pdtk_capture_root_window_keys 1 %K %A 0 %t}
+bind .printout <Shift-Key> {pdtk_capture_root_window_keys 1 %K %A 1 %t}
+bind .printout <KeyRelease> {pdtk_capture_root_window_keys 0 %K %A 0 %t}
bind .printout <Control-Key> {pdtk_canvas_ctrlkey %W %K 0}
bind .printout <Control-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1}
@@ -3203,15 +3203,15 @@ proc pdtk_canvas_new {name width height geometry editable} {
if {$pd_nt == 2} {
bind $name.c <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0}
bind $name.c <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1}
- bind $name.c <Mod1-BackSpace> {pdtk_canvas_sendkey %W 1 %K %A 0 1}
+ bind $name.c <Mod1-BackSpace> {pdtk_canvas_sendkey %W 1 %K %A 0 1 %t}
bind $name.c <Mod1-quoteleft> {menu_raisenextwindow}
} else {
bind $name.c <Control-Next> {menu_raisenextwindow}
bind $name.c <Control-Prior> {menu_raisepreviouswindow} ;# needs Tcl/Tk 8.5
}
- bind $name.c <Key> {pdtk_canvas_sendkey %W 1 %K %A 0 1}
- bind $name.c <Shift-Key> {pdtk_canvas_sendkey %W 1 %K %A 1 1}
- bind $name.c <KeyRelease> {pdtk_canvas_sendkey %W 0 %K %A 0 1}
+ bind $name.c <Key> {pdtk_canvas_sendkey %W 1 %K %A 0 1 %t}
+ bind $name.c <Shift-Key> {pdtk_canvas_sendkey %W 1 %K %A 1 1 %t}
+ bind $name.c <KeyRelease> {pdtk_canvas_sendkey %W 0 %K %A 0 1 %t}
bind $name.c <Motion> {pdtk_canvas_motion %W %x %y 0}
bind $name.c <Shift-Motion> {pdtk_canvas_motion %W %x %y 1}
bind $name.c <Control-Motion> {pdtk_canvas_motion %W %x %y 2}
@@ -3220,9 +3220,9 @@ proc pdtk_canvas_new {name width height geometry editable} {
# canvas bindings ---------------------------------------------------------
# just for tooltips right now
#$name.c bind all <Enter> "puts stderr {%x %y}"
- #$name.c bind inlet <Enter> "pdtk_canvas_enteritem %W %x %y inlet %#"
- #$name.c bind outlet <Enter> "pdtk_canvas_enteritem %W %x %y outlet %#"
- #$name.c bind text <Enter> "pdtk_canvas_enteritem %W %x %y text %#"
+ #$name.c bind inlet <Enter> "pdtk_canvas_enteritem %W %x %y inlet %t"
+ #$name.c bind outlet <Enter> "pdtk_canvas_enteritem %W %x %y outlet %t"
+ #$name.c bind text <Enter> "pdtk_canvas_enteritem %W %x %y text %t"
#$name.c bind inlet <Leave> "pdtk_canvas_leaveitem %W inlet 0"
#$name.c bind outlet <Leave> "pdtk_canvas_leaveitem %W outlet 0"
#$name.c bind text <Leave> "pdtk_canvas_leaveitem %W text 0"
@@ -4296,14 +4296,45 @@ proc pdtk_canvas_getscroll {name} {
}
-proc pdtk_canvas_sendkey {name state key iso shift focus} {
+set key_serial_press 0
+set key_serial_release 0
+
+proc pdtk_canvas_sendkey {name state key iso shift focus serial} {
global pd_nt
global ctrl_l_down
global ctrl_r_down
global shift_l_down
global shift_r_down
+ global key_serial_press
+ global key_serial_release
+
+ #puts stderr "pdtk_canvas_sendkey $name $state $key <$iso> $shift $focus $serial | $key_serial_press $key_serial_release"
+
+ # autorepeat logic
+ if { $iso == "null" } { set iso "" }
+ if { $iso == "spc" } { set iso " " }
+ set autorepeat 1
+ if { $state == 1 } {
+ # press
+ set key_serial_press $serial
+ if { $key_serial_press != $key_serial_release } {
+ set autorepeat 0
+ }
+ } elseif { $serial == -1 } {
+ # dorelease
+ if { $key_serial_release != $key_serial_press } {
+ set autorepeat 0
+ }
+ } else {
+ # schedule release
+ set key_serial_release $serial
+ if { $iso == "" } { set iso null }
+ if { $iso == " " } { set iso spc }
+ after 0 [concat pdtk_canvas_sendkey $name $state $key $iso $shift $focus -1]
+ return
+ }
- #puts stderr "key = $name $state $key $iso $shift\n"
+ #puts stderr "autorepeat=$autorepeat"
if {$key == "BackSpace"} {
set iso ""
@@ -4410,8 +4441,9 @@ proc pdtk_canvas_sendkey {name state key iso shift focus} {
}
#puts stderr "FINAL key=$key"
+ #puts stderr "FINAL key $state $key $shift $focus $autorepeat"
- pd [canvastosym $name] key $state $key $shift $focus\;
+ pd [canvastosym $name] key $state $key $shift $focus $autorepeat\;
}
# only do actions if this is a canvas.
@@ -7001,9 +7033,9 @@ proc pdtk_pastetext {} {
# we add first digit to ask for force getscroll as we limit the number of
# getscrolls we can get per second so last one is likely to be eaten up
# in the process
- pd [concat pd pastetext 1 1 $keynum 0\;]
+ pd [concat pd pastetext 1 1 $keynum 0 0\;]
} else {
- pd [concat pd pastetext 0 1 $keynum 0\;]
+ pd [concat pd pastetext 0 1 $keynum 0 0\;]
}
}
}