From 53bf228c9edd594095e028df295ba43507a06983 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Thu, 10 Sep 2015 13:28:30 -0400
Subject: [PATCH] remove old scalar enter/leave logic
---
pd/src/g_canvas.c | 3 +--
pd/src/g_scalar.c | 24 ------------------------
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/pd/src/g_canvas.c b/pd/src/g_canvas.c
index 7bea503e1..a0d0136b1 100644
--- a/pd/src/g_canvas.c
+++ b/pd/src/g_canvas.c
@@ -729,9 +729,8 @@ void canvas_dirty(t_canvas *x, t_floatarg n)
}
}
-extern t_canvas *sc_mouseover_canvas; /* not needed */
-
void draw_notify(t_canvas *x, t_symbol *s, int argc, t_atom *argv);
+
void canvas_scalar_event(t_canvas *x, t_symbol *s, int argc, t_atom *argv)
{
draw_notify(x, s, argc, argv);
diff --git a/pd/src/g_scalar.c b/pd/src/g_scalar.c
index 6088658df..8c3eb685e 100644
--- a/pd/src/g_scalar.c
+++ b/pd/src/g_scalar.c
@@ -394,19 +394,6 @@ extern int array_joc;
extern void template_notifyforscalar(t_template *template, t_glist *owner,
t_scalar *sc, t_symbol *s, int argc, t_atom *argv);
-t_canvas *sc_mouseover_canvas;
-static void scalar_mouseover(t_scalar *x, t_floatarg state)
-{
- t_atom at[1];
- t_template *template = template_findbyname(x->sc_template);
- if (state)
- template_notifyforscalar(template, sc_mouseover_canvas,
- x, gensym("leave"), 1, at);
- else
- template_notifyforscalar(template, sc_mouseover_canvas,
- x, gensym("enter"), 1, at);
-}
-
static void scalar_getgrouprect(t_glist *owner, t_glist *groupcanvas,
t_word *data, t_template *template, int basex, int basey,
int *x1, int *x2, int *y1, int *y2)
@@ -834,10 +821,6 @@ void scalar_doconfigure(t_gobj *xgobj, t_glist *owner)
// (long unsigned int)x->sc_vec);
//gui_vmess("gui_create_scalar_group", "xss",
// glist_getcanvas(owner), groupbuf, tagbuf);
- //sys_vgui("pdtk_bind_scalar_mouseover "
- // ".x%lx.c .x%lx.x%lx.template%lx {.x%lx}\n",
- // glist_getcanvas(owner), glist_getcanvas(owner),
- // owner, x->sc_vec, x);
for (y = templatecanvas->gl_list; y; y = y->g_next)
{
@@ -1013,11 +996,6 @@ static void scalar_vis(t_gobj *z, t_glist *owner, int vis)
(long unsigned int)x->sc_vec);
gui_vmess("gui_create_scalar_group", "xss",
glist_getcanvas(owner), groupbuf, tagbuf);
-
- sys_vgui("pdtk_bind_scalar_mouseover "
- ".x%lx.c .x%lx.x%lx.template%lx {.x%lx}\n",
- glist_getcanvas(owner), glist_getcanvas(owner),
- owner, x->sc_vec, x);
}
/* warning: don't need--- have recursive func. */
@@ -1312,8 +1290,6 @@ void g_scalar_setup(void)
{
scalar_class = class_new(gensym("scalar"), 0, (t_method)scalar_free, 0,
CLASS_GOBJ, 0);
- class_addmethod(scalar_class, (t_method)scalar_mouseover,
- gensym("mouseover"), A_FLOAT, A_NULL);
class_addmethod(scalar_class, (t_method)scalar_menuopen,
gensym("menu-open"), 0);
class_setwidget(scalar_class, &scalar_widgetbehavior);
--
GitLab