From 1194e8dbe40616498072ac182e4c5f6d7dde3e6e Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Fri, 30 Aug 2013 04:11:43 -0400
Subject: [PATCH] improved keyboard interaction with arrays (shift+click adds a
point, ctrl+click deletes it--still need to figure out the role of shift when
wonset is set) and instantaneous cursor update. minor refinements to
drawsymbol.
---
pd/src/g_array.c | 11 ++++++-----
pd/src/g_editor.c | 34 +++++++++++++++++++++++++---------
pd/src/g_template.c | 8 ++++----
pd/src/pd.tk | 2 ++
4 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/pd/src/g_array.c b/pd/src/g_array.c
index 98052edef..27dcb492a 100644
--- a/pd/src/g_array.c
+++ b/pd/src/g_array.c
@@ -943,7 +943,7 @@ int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap,
array_motion_template = elemtemplate;
array_motion_xperpix = glist_dpixtodx(glist, 1);
array_motion_yperpix = glist_dpixtody(glist, 1);
- if (alt && xpix < pxpix1) /* delete a point */
+ if (alt) /* delete a point */
{
if (array->a_n <= 1)
return (0);
@@ -955,7 +955,7 @@ int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap,
canvas_setcursor(glist_getcanvas(glist), 0);
return (0);
}
- else if (alt)
+ else if (shift)
{
/* add a point (after the clicked-on one) */
//fprintf(stderr,"add a point\n");
@@ -1015,10 +1015,11 @@ int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap,
}
if (alt)
{
- if (xpix < pxpix1)
- return (CURSOR_EDITMODE_DISCONNECT);
- else return (CURSOR_RUNMODE_ADDPOINT);
+ return (CURSOR_EDITMODE_DISCONNECT);
}
+ else if (shift) {
+ return (CURSOR_RUNMODE_ADDPOINT);
+ }
else return (array_motion_fatten ?
CURSOR_RUNMODE_THICKEN : CURSOR_RUNMODE_CLICKME);
//}
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 98b8feb02..5dfe0a3a9 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -29,7 +29,7 @@ char *class_gethelpdir(t_class *c);
/* ------------------ forward declarations --------------- */
static void canvas_doclear(t_canvas *x);
-void glist_setlastxy(t_glist *gl, int xval, int yval);
+void glist_setlastxymod(t_glist *gl, int xval, int yval, int mod);
static void glist_donewloadbangs(t_glist *x);
static t_binbuf *canvas_docopy(t_canvas *x);
static void canvas_dopaste(t_canvas *x, t_binbuf *b);
@@ -68,6 +68,7 @@ int canvas_apply_restore_original_position(t_canvas *x, int orig_pos);
extern void canvas_draw_gop_resize_hooks(t_canvas *x);
static void canvas_font(t_canvas *x, t_floatarg font, t_floatarg oldfont, t_floatarg resize, t_floatarg preview);
static void canvas_displaceselection(t_canvas *x, int dx, int dy);
+void canvas_motion(t_canvas *x, t_floatarg xpos, t_floatarg ypos, t_floatarg fmod);
// for updating preset_node locations in case of operations that alter glist object locations (tofront/back, cut, delete, undo/redo cut/delete)
extern void glob_preset_node_list_check_loc_and_update(void);
// for preset_node
@@ -86,7 +87,7 @@ int glob_ctrl = 0;
int glob_alt = 0;
static t_glist *canvas_last_glist;
-static int canvas_last_glist_x, canvas_last_glist_y;
+static int canvas_last_glist_x, canvas_last_glist_y, canvas_last_glist_mod;
struct _outlet
{
@@ -4489,14 +4490,18 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
/* if control key goes up or down, and if we're in edit mode, change
cursor to indicate how the click action changes
NEW: do so only if not doing anything else in edit mode */
- if (x && keynum == 0 && x->gl_edit &&
+ if (x && keynum == 0 &&
!strncmp(gotkeysym->s_name, "Control", 7))
{
- glob_ctrl = down;
- if(x->gl_editor->e_onmotion == MA_NONE)
- canvas_setcursor(x, down ?
- CURSOR_RUNMODE_NOTHING : CURSOR_EDITMODE_NOTHING);
+ //fprintf(stderr,"ctrl\n");
+ glob_ctrl = down;
+ if(x->gl_edit && x->gl_editor->e_onmotion == MA_NONE)
+ canvas_setcursor(x, down ?
+ CURSOR_RUNMODE_NOTHING : CURSOR_EDITMODE_NOTHING);
}
+ //fprintf(stderr," %d %d %d %s %d %d\n", glob_shift, glob_ctrl, glob_alt, gotkeysym->s_name, keynum, down);
+ //canvas_motion(x, canvas_last_glist_x, canvas_last_glist_y, canvas_last_glist_mod);
+ pd_vmess(&x->gl_pd, gensym("motion"), "fff", (double)canvas_last_glist_x, (double)canvas_last_glist_y, (double)(glob_shift+glob_ctrl*2+glob_alt*4));
}
extern void graph_checkgop_rect(t_gobj *z, t_glist *glist,
@@ -4512,7 +4517,7 @@ void canvas_motion(t_canvas *x, t_floatarg xpos, t_floatarg ypos,
bug("editor");
return;
}
- glist_setlastxy(x, xpos, ypos);
+ glist_setlastxymod(x, xpos, ypos, mod);
if (x->gl_editor->e_onmotion == MA_MOVE)
{
canvas_displaceselection(x,
@@ -4604,10 +4609,13 @@ void canvas_motion(t_canvas *x, t_floatarg xpos, t_floatarg ypos,
else post("not resizable");
}
}
- else if (x->gl_editor->e_onmotion == MA_SCROLL) { fprintf(stderr,"canvas_motion MA_SCROLL\n"); }
+ else if (x->gl_editor->e_onmotion == MA_SCROLL) {
+ //fprintf(stderr,"canvas_motion MA_SCROLL\n");
+ }
else {
//fprintf(stderr,"canvas_motion -> doclick %d\n", x->gl_editor->e_onmotion);
canvas_doclick(x, xpos, ypos, 0, mod, 0);
+ //pd_vmess(&x->gl_pd, gensym("mouse"), "ffff", (double)xpos, (double)ypos, 0, (double)mod);
}
//if (toggle_moving == 1) {
// sys_vgui("pdtk_update_xy_tooltip .x%lx %d %d\n", x, (int)xpos, (int)ypos);
@@ -6452,6 +6460,14 @@ void glist_setlastxy(t_glist *gl, int xval, int yval)
canvas_last_glist_y = yval;
}
+void glist_setlastxymod(t_glist *gl, int xval, int yval, int mod)
+{
+ canvas_last_glist = gl;
+ canvas_last_glist_x = xval;
+ canvas_last_glist_y = yval;
+ canvas_last_glist_mod = mod;
+}
+
static void canvas_enterobj(t_canvas *x, t_symbol *item, t_floatarg xpos,
t_floatarg ypos, t_floatarg xletno)
{
diff --git a/pd/src/g_template.c b/pd/src/g_template.c
index d77f37df4..72005e4ca 100644
--- a/pd/src/g_template.c
+++ b/pd/src/g_template.c
@@ -2485,10 +2485,10 @@ void drawsymbol_float(t_drawsymbol *x, t_floatarg f)
#define DRAWSYMBOL_BUFSIZE 80
static void drawsymbol_sprintf(t_drawsymbol *x, char *buf, t_atom *ap)
{
- int nchars;
- strncpy(buf, x->x_label->s_name, DRAWSYMBOL_BUFSIZE);
- buf[DRAWSYMBOL_BUFSIZE - 1] = 0;
- nchars = strlen(buf);
+ //int nchars;
+ //strncpy(buf, x->x_label->s_name, DRAWSYMBOL_BUFSIZE);
+ //buf[DRAWSYMBOL_BUFSIZE - 1] = 0;
+ //nchars = strlen(buf);
atom_string(ap, buf, DRAWSYMBOL_BUFSIZE);
}
diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index fc1836f22..281893731 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -3210,7 +3210,9 @@ proc pdtk_canvas_new {name width height geometry editable} {
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 <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}
+ bind $name.c <Control-Shift-Motion> {pdtk_canvas_motion %W %x %y 3}
# canvas bindings ---------------------------------------------------------
# just for tooltips right now
--
GitLab