Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jonathan Wilkes
purr-data
Commits
6d8ab17f
Commit
6d8ab17f
authored
Oct 02, 2020
by
Ivica Bukvic
Browse files
Fixed crasher and key release propagation
parent
75205b91
Pipeline
#2955
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pd/src/g_editor.c
View file @
6d8ab17f
...
...
@@ -5509,8 +5509,6 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
// (x->gl_editor->e_onmotion == MA_CONNECT ? 1 : 0),
// glob_shift, glob_lmclick);
post("
canvas_key
down
=%
d
shift
=%
d
<%
s
>
", down, shift);
// check if user released shift while trying manual multi-connect
if (x && x->gl_editor &&
x->gl_editor->e_onmotion == MA_CONNECT && !glob_shift && !glob_lmclick)
...
...
@@ -5630,12 +5628,27 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
if (!x || !x->gl_editor)
return;
// we need to do keynameafn here for key releases
if (x && x->gl_editor && x->gl_editor->e_grab)
{
if (x->gl_editor->e_keynameafn && gotkeysym && focus)
{
at[0] = av[0];
SETFLOAT(at, down);
SETSYMBOL(at+1, gotkeysym);
post("
...
SENDING
<%
s
>
down
=%
d
", gotkeysym->s_name, down);
(* x->gl_editor->e_keynameafn) (x->gl_editor->e_grab, 0, 2, at);
}
}
if (x && down)
{
/* cancel any dragging action */
if (x->gl_editor->e_onmotion == MA_MOVE)
x->gl_editor->e_onmotion = MA_NONE;
/* if an object has "
grabbed
" keys just send them on */
/* if an object has "
grabbed
" keys just send them on
but deal with key release above outside this loop */
if (x->gl_editor->e_grab)
{
if (x->gl_editor->e_keyfn && keynum && focus)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment