From 4b216f9698a56227c553406c84cecf9f2d939e37 Mon Sep 17 00:00:00 2001
From: Mathieu L Bouchard <matju@artengine.ca>
Date: Sat, 23 Aug 2014 17:09:05 -0400
Subject: [PATCH] =?UTF-8?q?big=20refactoring=20#12=C2=A0:=20add=20a=20few?=
=?UTF-8?q?=20functions=20in=20g=5Feditor.c=20to=20replace=20many=20sys=5F?=
=?UTF-8?q?vgui=20calls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pd/src/g_all_guis.c | 6 +-
pd/src/g_array.c | 3 +-
pd/src/g_canvas.h | 1 +
pd/src/g_editor.c | 361 ++++++++++----------------------------------
pd/src/g_graph.c | 2 +-
pd/src/g_rtext.c | 9 +-
pd/src/g_scalar.c | 4 +-
pd/src/g_template.c | 2 +-
pd/src/g_text.c | 25 ++-
pd/src/g_undo.c | 4 +-
10 files changed, 104 insertions(+), 313 deletions(-)
diff --git a/pd/src/g_all_guis.c b/pd/src/g_all_guis.c
index 384b55246..114d227c6 100644
--- a/pd/src/g_all_guis.c
+++ b/pd/src/g_all_guis.c
@@ -812,7 +812,7 @@ void scalehandle_unclick_label(t_scalehandle *h) {
{
iemgui_select((t_gobj *)x, x->x_glist, 1);
canvas_fixlinesfor(x->x_glist, (t_text *)x);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_glist);
+ canvas_getscroll(x->x_glist);
}
}
@@ -863,7 +863,7 @@ void scalehandle_unclick_scale(t_scalehandle *h) {
iemgui_io_draw_move(x);
iemgui_select((t_gobj *)x, x->x_glist, 1);
canvas_fixlinesfor(x->x_glist, (t_text *)x);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_glist);
+ canvas_getscroll(x->x_glist);
}
void scalehandle_drag_scale(t_scalehandle *h) {
@@ -1092,7 +1092,7 @@ void scrollbar_update(t_glist *glist) {
//ico@bukvic.net 100518 update scrollbars when object potentially
//exceeds window size
t_canvas *canvas=(t_canvas *)glist_getcanvas(glist);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (long unsigned int)canvas);
+ canvas_getscroll(canvas);
}
void wb_init(t_widgetbehavior *wb, t_getrectfn gr, t_clickfn cl) {
diff --git a/pd/src/g_array.c b/pd/src/g_array.c
index 34c44a04e..6f81fd383 100644
--- a/pd/src/g_array.c
+++ b/pd/src/g_array.c
@@ -593,8 +593,7 @@ void glist_arraydialog(t_glist *parent, t_symbol *s, int argc, t_atom *argv)
//canvas_redraw(glist_getcanvas(parent));
garray_fittograph(a, (int)size, -1);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",
- (long unsigned int)glist_getcanvas(parent));
+ canvas_getscroll(glist_getcanvas(parent));
}
extern void canvas_apply_setundo(t_canvas *x, t_gobj *y);
diff --git a/pd/src/g_canvas.h b/pd/src/g_canvas.h
index 6dde20607..d847b51b0 100644
--- a/pd/src/g_canvas.h
+++ b/pd/src/g_canvas.h
@@ -770,6 +770,7 @@ void *qt_thread_main (void *);
/* ---------- other things added by Mathieu (aug.2014) ----------------- */
void canvas_raise_all_cords (t_canvas *x);
+void canvas_getscroll (t_canvas *x);
/* --------------------------------------------------------------------- */
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 53621b866..b3da6c7c6 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -118,6 +118,45 @@ int gobj_filter_highlight_behavior(t_text *y)
return (y->te_iemgui);
}
+/* ---------------- mathieu 2014.08 --------------------------------- */
+
+void canvas_raise_all_cords (t_canvas *x) {
+ sys_vgui(".x%lx.c raise all_cords\n", x);
+}
+static void canvas_enteritem (t_canvas *x, int xpos, int ypos, const char *tag) {
+ sys_vgui("pdtk_canvas_enteritem .x%x.c %d %d %s -1\n",
+ x, xpos, ypos, tag);
+}
+static void canvas_leaveitem (t_canvas *x) {
+ sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
+}
+static void tooltip_erase (t_canvas *x) {
+ if (objtooltip) {
+ objtooltip = 0;
+ canvas_leaveitem(x);
+ }
+}
+static void canvas_nlet_conf (t_canvas *x, int type) {
+ int filter = type=='o' ? last_outlet_filter : last_inlet_filter;
+ int issignal = type=='o' ? outlet_issignal : inlet_issignal;
+ sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n", x,
+ type=='o' ? x->gl_editor->canvas_cnct_outlet_tag : x->gl_editor->canvas_cnct_inlet_tag,
+ (filter ? "$pd_colors(iemgui_nlet)" :
+ (issignal ? "$pd_colors(signal_cord)" : "$pd_colors(control_cord)")),
+ (issignal ? "$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
+}
+static void canvas_nlet_conf2 (t_canvas *x, int cond) { // because of one exception...
+ int issignal = inlet_issignal;
+ sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n", x,
+ x->gl_editor->canvas_cnct_inlet_tag,
+ (last_inlet_filter ? "$pd_colors(iemgui_nlet)" :
+ (cond ? "$pd_colors(signal_cord)" : "$pd_colors(control_cord)")),
+ (issignal ? "$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
+}
+void canvas_getscroll (t_canvas *x) {
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",(long)x);
+}
+
/* ---------------- generic widget behavior ------------------------- */
void gobj_getrect(t_gobj *x, t_glist *glist, int *x1, int *y1,
@@ -350,17 +389,8 @@ void canvas_check_nlet_highlights(t_glist *x)
{
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ? "$pd_colors(iemgui_nlet)" : (inlet_issignal ?
- "$pd_colors(signal_cord)" : "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'i');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
//if (x->gl_editor->e_onmotion == MA_CONNECT) {
x->gl_editor->e_onmotion = MA_NONE;
@@ -371,17 +401,8 @@ void canvas_check_nlet_highlights(t_glist *x)
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0 &&
x->gl_editor->e_onmotion != MA_CONNECT)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ? "$pd_colors(iemgui_nlet)" : (outlet_issignal ?
- "$pd_colors(signal_cord)" : "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'o');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_outlet_tag[0] = 0;
//if (x->gl_editor->e_onmotion == MA_CONNECT) {
x->gl_editor->e_onmotion = MA_NONE;
@@ -2990,12 +3011,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
return;
}
- // remove stale tooltips, if any
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ tooltip_erase(x);
// read key and mouse button states
shiftmod = (mod & SHIFTMOD);
@@ -3230,18 +3246,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
t_rtext *yr = glist_findrtext(x, (t_text *)&ob->ob_g);
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0)
- {
- sys_vgui(".x%x.c itemconfigure %s "
- "-stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" : (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- }
+ canvas_nlet_conf(x,'o');
if (yr)
{
last_outlet_filter =
@@ -3262,9 +3267,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
if (tooltips)
{
objtooltip = 1;
- sys_vgui("pdtk_canvas_enteritem "
- ".x%x.c %d %d %s -1\n",
- x, xpos, ypos,
+ canvas_enteritem(x, xpos, ypos,
x->gl_editor->canvas_cnct_outlet_tag);
}
}
@@ -3302,19 +3305,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
t_rtext *yr = glist_findrtext(x, (t_text *)&ob->ob_g);
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
- {
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- }
+ canvas_nlet_conf(x,'i');
if (yr)
{
@@ -3332,9 +3323,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
if (tooltips)
{
objtooltip = 1;
- sys_vgui("pdtk_canvas_enteritem "
- ".x%x.c %d %d %s -1\n",
- x, xpos, ypos,
+ canvas_enteritem(x, xpos, ypos,
x->gl_editor->canvas_cnct_inlet_tag);
}
}
@@ -3399,43 +3388,15 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
{
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'i');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'o');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_outlet_tag[0] = 0;
}
@@ -3451,8 +3412,7 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
{
t_rtext *yr = glist_findrtext(x, (t_text *)&ob->ob_g);
objtooltip = 1;
- sys_vgui("pdtk_canvas_enteritem .x%x.c %d %d %s -1\n",
- x, xpos, ypos, rtext_gettag(yr));
+ canvas_enteritem(x, xpos, ypos, rtext_gettag(yr));
}
}
// end jsarlo
@@ -3528,42 +3488,14 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
}
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'i');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'o');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_outlet_tag[0] = 0;
}
// end jsarlo
@@ -3574,41 +3506,15 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which,
}
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'i');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
// jsarlo
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'o');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_outlet_tag[0] = 0;
}
if(x->gl_editor && x->gl_editor->gl_magic_glass)
@@ -3917,39 +3823,14 @@ int canvas_doconnect_doit(t_canvas *x, t_gobj *y1, t_gobj *y2,
oc);*/
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (obj_issignalinlet(ob2, closest2) ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" : "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf2(x,obj_issignalinlet(ob2, closest2));
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0 && !glob_shift)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'o');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_outlet_tag[0] = 0;
}
// end jsarlo
@@ -4487,19 +4368,7 @@ void canvas_doconnect(t_canvas *x, int xpos, int ypos, int which, int doit)
{
t_rtext *y = glist_findrtext(x, (t_text *)&ob2->ob_g);
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
- {
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- }
+ canvas_nlet_conf(x,'i');
if (y)
{
last_inlet_filter =
@@ -4521,8 +4390,8 @@ void canvas_doconnect(t_canvas *x, int xpos, int ypos, int which, int doit)
if (tooltips)
{
objtooltip = 1;
- sys_vgui("pdtk_canvas_enteritem .x%x.c %d %d %s -1\n",
- x, xpos, ypos, x->gl_editor->canvas_cnct_inlet_tag);
+ canvas_enteritem(x, xpos, ypos,
+ x->gl_editor->canvas_cnct_inlet_tag);
}
}
canvas_setcursor(x, CURSOR_EDITMODE_CONNECT);
@@ -4534,21 +4403,8 @@ void canvas_doconnect(t_canvas *x, int xpos, int ypos, int which, int doit)
// jsarlo
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s -strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ canvas_nlet_conf(x,'i');
+ tooltip_erase(x);
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
if(x->gl_editor && x->gl_editor->gl_magic_glass)
@@ -4736,32 +4592,10 @@ void canvas_mouseup(t_canvas *x,
//fprintf(stderr,"releasing shift during connect without "
// "the button pressed\n");
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0)
- {
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
- }
+ canvas_nlet_conf(x,'o');
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
+ canvas_nlet_conf(x,'i');
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
@@ -4778,13 +4612,7 @@ void canvas_mousedown_middle(t_canvas *x, t_floatarg xpos, t_floatarg ypos,
t_floatarg which, t_floatarg mod)
{
int middleclick;
-
- // remove stale tooltips, if any
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ tooltip_erase(x);
// read key and mouse button states
x->gl_editor->e_xwas = (int)xpos;
@@ -4891,12 +4719,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
int focus = 1;
int autorepeat = 0;
- /* remove stale tooltips, if any */
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ tooltip_erase(x);
if (ac < 5)
return;
@@ -5245,7 +5068,7 @@ void canvas_motion(t_canvas *x, t_floatarg xpos, t_floatarg ypos,
else {
//fprintf(stderr,"canvas_motion -> doclick %d %d\n",
// x->gl_editor->e_onmotion, mod);
- //sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
+ //canvas_getscroll( x);
canvas_doclick(x, xpos, ypos, 0, mod, 0);
//pd_vmess(&x->gl_pd, gensym("mouse"), "ffff",
// (double)xpos, (double)ypos, 0, (double)mod);
@@ -7241,32 +7064,12 @@ void canvas_editmode(t_canvas *x, t_floatarg fyesplease)
// jsarlo
if (x->gl_editor->canvas_cnct_inlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_inlet_tag,
- (last_inlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (inlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (inlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
+ canvas_nlet_conf(x,'i');
x->gl_editor->canvas_cnct_inlet_tag[0] = 0;
}
if (x->gl_editor->canvas_cnct_outlet_tag[0] != 0)
{
- sys_vgui(".x%x.c itemconfigure %s -stroke %s -fill %s "
- "-strokewidth 1\n",
- x, x->gl_editor->canvas_cnct_outlet_tag,
- (last_outlet_filter ?
- "$pd_colors(iemgui_nlet)" :
- (outlet_issignal ?
- "$pd_colors(signal_cord)" :
- "$pd_colors(control_cord)")),
- (outlet_issignal ?
- "$pd_colors(signal_nlet)" :
- "$pd_colors(control_nlet)"));
+ canvas_nlet_conf(x,'o');
x->gl_editor->canvas_cnct_outlet_tag[0] = 0;
}
if(x->gl_editor && x->gl_editor->gl_magic_glass)
@@ -7334,11 +7137,7 @@ void canvas_tooltips(t_canvas *x, t_floatarg fyesplease)
}
else {
tooltips = 0;
- if (objtooltip)
- {
- objtooltip = 0;
- sys_vgui("pdtk_canvas_leaveitem .x%x.c\n", x);
- }
+ tooltip_erase(x);
}
sys_vgui("pdtk_canvas_tooltips .x%lx %d\n",
x, tooltips);
@@ -7498,10 +7297,6 @@ static void canvas_tip(t_canvas *x, t_symbol *s, int argc, t_atom *argv)
}
}
-void canvas_raise_all_cords (t_canvas *x) {
- sys_vgui(".x%lx.c raise all_cords\n", x);
-}
-
void g_editor_setup(void)
{
/* ------------------------ events ---------------------------------- */
diff --git a/pd/src/g_graph.c b/pd/src/g_graph.c
index 914becbd5..d27c618a1 100644
--- a/pd/src/g_graph.c
+++ b/pd/src/g_graph.c
@@ -1420,7 +1420,7 @@ static void graph_delete(t_gobj *z, t_glist *glist)
glist_delete(x, y);
}
if (glist_istoplevel(glist) && glist_isvisible(glist))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", glist);
+ canvas_getscroll(glist);
}
static t_float graph_lastxpix, graph_lastypix;
diff --git a/pd/src/g_rtext.c b/pd/src/g_rtext.c
index a08786692..4bcb119e2 100644
--- a/pd/src/g_rtext.c
+++ b/pd/src/g_rtext.c
@@ -554,8 +554,7 @@ void rtext_key(t_rtext *x, int keynum, t_symbol *keysym)
{
u8_dec(x->x_buf, &x->x_selstart);
if (glist_isvisible(glist_getcanvas(x->x_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",
- (t_int)glist_getcanvas(x->x_glist));
+ canvas_getscroll(glist_getcanvas(x->x_glist));
}
}
@@ -564,8 +563,7 @@ void rtext_key(t_rtext *x, int keynum, t_symbol *keysym)
if (x->x_selend < x->x_bufsize && (x->x_selstart == x->x_selend))
u8_inc(x->x_buf, &x->x_selend);
if (glist_isvisible(glist_getcanvas(x->x_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",
- (t_int)glist_getcanvas(x->x_glist));
+ canvas_getscroll(glist_getcanvas(x->x_glist));
}
ndel = x->x_selend - x->x_selstart;
@@ -594,8 +592,7 @@ be printable in whatever 8-bit character set we find ourselves. */
x->x_bufsize = newsize;
x->x_selstart = x->x_selstart + 1;
if (glist_isvisible(glist_getcanvas(x->x_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",
- (t_int)glist_getcanvas(x->x_glist));
+ canvas_getscroll(glist_getcanvas(x->x_glist));
}
/*--moo: check for unicode codepoints beyond 7-bit ASCII --*/
else if (n > 127)
diff --git a/pd/src/g_scalar.c b/pd/src/g_scalar.c
index 2ad5a9136..92cc2e00b 100644
--- a/pd/src/g_scalar.c
+++ b/pd/src/g_scalar.c
@@ -581,7 +581,7 @@ static void scalar_displace_withtag(t_gobj *z, t_glist *glist, int dx, int dy)
SETFLOAT(&at[2], (t_float)dy);
template_notify(template, gensym("displace"), 2, at);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", glist);
+ canvas_getscroll(glist);
/* Apparently this is no longer needed, so it is commented out. But if
we merge garrays back into this code we may need it... */
@@ -776,7 +776,7 @@ static void scalar_doredraw(t_gobj *client, t_glist *glist)
sys_vgui("pdtk_select_all_gop_widgets .x%lx %lx %d\n",
glist_getcanvas(glist), glist, 1);
}
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", glist_getcanvas(glist));
+ canvas_getscroll(glist_getcanvas(glist));
}
void scalar_redraw(t_scalar *x, t_glist *glist)
diff --git a/pd/src/g_template.c b/pd/src/g_template.c
index dabe2bfee..5c1f437bd 100644
--- a/pd/src/g_template.c
+++ b/pd/src/g_template.c
@@ -1733,7 +1733,7 @@ void svg_doupdate(t_svg *x, t_canvas *c, t_symbol *s)
/* uncache the scalar's bbox */
((t_scalar *)g)->sc_bboxcache = 0;
/* only get the scroll if we had to redraw the bbox */
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", visible);
+ canvas_getscroll(visible);
if (glist_isselected(c, &((t_scalar *)g)->sc_gobj))
{
scalar_drawselectrect((t_scalar *)g, c, 0);
diff --git a/pd/src/g_text.c b/pd/src/g_text.c
index a67f20ebf..28b4fd2d7 100644
--- a/pd/src/g_text.c
+++ b/pd/src/g_text.c
@@ -237,7 +237,7 @@ static void canvas_objtext(t_glist *gl, int xpix, int ypix,
}*/
if ( glist_isvisible( ((t_canvas *)gl) ) )
{
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", glist_getcanvas(gl));
+ canvas_getscroll(glist_getcanvas(gl));
}
}
@@ -286,7 +286,7 @@ void canvas_howputnew(t_canvas *x, int *connectp, int *xpixp, int *ypixp,
indx = nobj-1;
}
x->gl_editor->e_onmotion = MA_NONE;
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
+ canvas_getscroll(x);
}
else
{
@@ -599,7 +599,7 @@ static void message_set(t_message *x, t_symbol *s, int argc, t_atom *argv)
binbuf_add(x->m_text.te_binbuf, argc, argv);
glist_retext(x->m_glist, &x->m_text);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_add2(t_message *x, t_symbol *s, int argc, t_atom *argv)
@@ -607,7 +607,7 @@ static void message_add2(t_message *x, t_symbol *s, int argc, t_atom *argv)
binbuf_add(x->m_text.te_binbuf, argc, argv);
glist_retext(x->m_glist, &x->m_text);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_add(t_message *x, t_symbol *s, int argc, t_atom *argv)
@@ -616,7 +616,7 @@ static void message_add(t_message *x, t_symbol *s, int argc, t_atom *argv)
binbuf_addsemi(x->m_text.te_binbuf);
glist_retext(x->m_glist, &x->m_text);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_addcomma(t_message *x)
@@ -626,14 +626,14 @@ static void message_addcomma(t_message *x)
binbuf_add(x->m_text.te_binbuf, 1, &a);
glist_retext(x->m_glist, &x->m_text);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_addsemi(t_message *x)
{
message_add(x, 0, 0, 0);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_adddollar(t_message *x, t_floatarg f)
@@ -646,7 +646,7 @@ static void message_adddollar(t_message *x, t_floatarg f)
binbuf_add(x->m_text.te_binbuf, 1, &a);
glist_retext(x->m_glist, &x->m_text);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_adddollsym(t_message *x, t_symbol *s)
@@ -660,7 +660,7 @@ static void message_adddollsym(t_message *x, t_symbol *s)
binbuf_add(x->m_text.te_binbuf, 1, &a);
glist_retext(x->m_glist, &x->m_text);
if (glist_isvisible(glist_getcanvas(x->m_glist)))
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->m_glist);
+ canvas_getscroll(x->m_glist);
}
static void message_click(t_message *x,
@@ -1099,8 +1099,7 @@ static void gatom_param(t_gatom *x, t_symbol *sel, int argc, t_atom *argv)
gobj_vis(&x->a_text.te_g, x->a_glist, 1);
gobj_select(&x->a_text.te_g, x->a_glist, 1);
canvas_dirty(x->a_glist, 1);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)x->a_glist);
-
+ canvas_getscroll(x->a_glist);
/* glist_retext(x->a_glist, &x->a_text); */
}
@@ -2079,7 +2078,7 @@ void text_drawborder(t_text *x, t_glist *glist,
//ico@bukvic.net 100518 update scrollbars when GOP
//potentially exceeds window size
- //sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",
+ //canvas_getscroll(
// (long unsigned int)glist_getcanvas(glist));
}
@@ -2174,7 +2173,7 @@ void text_drawborder_withtag(t_text *x, t_glist *glist,
//ico@bukvic.net 100518 update scrollbars when GOP
//potentially exceeds window size
- //sys_vgui("pdtk_canvas_getscroll .x%lx.c\n",
+ //canvas_getscroll(
// (long unsigned int)glist_getcanvas(glist));
}
diff --git a/pd/src/g_undo.c b/pd/src/g_undo.c
index 0c0c0b587..9083bdfee 100644
--- a/pd/src/g_undo.c
+++ b/pd/src/g_undo.c
@@ -93,7 +93,7 @@ void canvas_undo_undo(t_canvas *x)
{
sys_vgui("pdtk_undomenu .x%lx %s %s\n",
x, undo_action, redo_action);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
+ canvas_getscroll(x);
}
canvas_dirty(x, 1);
}
@@ -137,7 +137,7 @@ void canvas_undo_redo(t_canvas *x)
{
sys_vgui("pdtk_undomenu .x%lx %s %s\n",
x, undo_action, redo_action);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
+ canvas_getscroll(x);
}
canvas_dirty(x, 1);
}
--
GitLab