From 570221dade5b4bb1f2de2b04cb1aae2f17261c57 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Thu, 24 Mar 2011 05:24:00 -0400
Subject: [PATCH] Pd-0.42.5-extended-l2ork-dev-20110324.tar.bz2
---
src/g_canvas.c | 6 +++++-
src/g_editor.c | 4 ++--
src/g_text.c | 5 +++--
src/m_class.c | 1 +
src/m_pd.h | 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/g_canvas.c b/src/g_canvas.c
index ba61b759c..797d1a0e4 100644
--- a/src/g_canvas.c
+++ b/src/g_canvas.c
@@ -638,10 +638,14 @@ void canvas_reflecttitle(t_canvas *x)
x, x->gl_dirty, canvas_getdir(x)->s_name, x->gl_name->s_name);
sys_vgui("wm title .x%lx {%s%s}\n", x, x->gl_name->s_name, namebuf);
#else
- if(glist_istoplevel(x) || !x->gl_isgraph || x->gl_isgraph && x->gl_havewindow || x->gl_loading)
+ if(glist_istoplevel(x) || !x->gl_isgraph || x->gl_isgraph && x->gl_havewindow || x->gl_loading || x->gl_dirty) {
+ /*fprintf(stderr,"%d %d %d %d %d\n", glist_istoplevel(x), !x->gl_isgraph,
+ x->gl_isgraph && x->gl_havewindow, x->gl_loading,
+ x->gl_dirty);*/
sys_vgui("wm title .x%lx {%s%c%s - %s}\n",
x, x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf,
canvas_getdir(x)->s_name);
+ }
#endif
}
diff --git a/src/g_editor.c b/src/g_editor.c
index 459fafc05..40393b8d3 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -2588,6 +2588,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
}
rtext_key(x->gl_editor->e_textedfor,
(int)keynum, gotkeysym);
+ canvas_fixlinesfor(x, (t_text *)(x->gl_editor->e_selection->sel_what));
if (x->gl_editor->e_textdirty)
canvas_dirty(x, 1);
}
@@ -3307,7 +3308,6 @@ static void canvas_dopaste(t_canvas *x, t_binbuf *b)
if (!canvas_undo_name || canvas_undo_name[0] != 'd') {
canvas_redraw(x);
}
- //sys_vgui(".x%lx.c create line 0 0 100 100 -width 3 -fill black -tags tcltastic\n", x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
glist_donewloadbangs(x);
}
@@ -3471,7 +3471,7 @@ void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutno,
if (!(oc = obj_connect(objsrc, outno, objsink, inno))) goto bad;
if (glist_isvisible(x))
{
- sys_vgui(".x%lx.c create line %d %d %d %d -width %d -fill %s -tags l%lx\n",
+ sys_vgui(".x%lx.c create line %d %d %d %d -width %d -fill %s -tags {l%lx all_cords}\n",
glist_getcanvas(x), 0, 0, 0, 0,
(obj_issignaloutlet(objsrc, outno) ? 2 : 1),
(obj_issignaloutlet(objsrc, outno) ? "$signal_cord" : "$msg_cord"), oc);
diff --git a/src/g_text.c b/src/g_text.c
index e1f1c5364..a874ebaf5 100644
--- a/src/g_text.c
+++ b/src/g_text.c
@@ -133,8 +133,9 @@ static void canvas_objtext(t_glist *gl, int xpix, int ypix, int selected,
if (pd_class(&x->ob_pd) == voutlet_class)
canvas_resortoutlets(glist_getcanvas(gl));
canvas_unsetcurrent((t_canvas *)gl);
- if ( glist_isvisible( ((t_canvas *)gl) ) )
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (t_int)gl);
+ if ( glist_isvisible( ((t_canvas *)gl) ) ) {
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", glist_getcanvas(gl));
+ }
}
extern int sys_noautopatch;
diff --git a/src/m_class.c b/src/m_class.c
index f9d473fa9..3278f85da 100644
--- a/src/m_class.c
+++ b/src/m_class.c
@@ -707,6 +707,7 @@ void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv)
}
for (i = c->c_nmethod, m = c->c_methods; i--; m++)
if (m->me_name == s)
+ //if (m && m->me_name == s)
{
wp = m->me_arg;
if (*wp == A_GIMME)
diff --git a/src/m_pd.h b/src/m_pd.h
index 131c77710..a1cd59fd1 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 5
-#define PD_TEST_VERSION "extended-l2ork-20110316"
+#define PD_TEST_VERSION "extended-l2ork-20110324"
/* old name for "MSW" flag -- we have to take it for the sake of many old
"nmakefiles" for externs, which will define NT and not MSW */
--
GitLab