[PD-cvs] pd/src g_editor.c,1.4.4.2,1.4.4.2.2.1
Tim Blechmann
timblech at users.sourceforge.net
Sun May 22 14:43:47 CEST 2005
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9198
Modified Files:
Tag: devel_0_39
g_editor.c
Log Message:
upgrading to 0.39-test2
Index: g_editor.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.2.2.1
diff -C2 -d -r1.4.4.2 -r1.4.4.2.2.1
*** g_editor.c 11 Nov 2004 22:30:41 -0000 1.4.4.2
--- g_editor.c 22 May 2005 12:43:45 -0000 1.4.4.2.2.1
***************
*** 1036,1041 ****
if (canvas_hitbox(x, y, xpos, ypos, &x1, &y1, &x2, &y2)
&& (clickreturned = gobj_click(y, x, xpos, ypos,
! shiftmod, altmod, 0, doit)))
! break;
}
if (!doit)
--- 1036,1042 ----
if (canvas_hitbox(x, y, xpos, ypos, &x1, &y1, &x2, &y2)
&& (clickreturned = gobj_click(y, x, xpos, ypos,
! shiftmod, ((mod & CTRLMOD) && (!x->gl_edit)) || altmod,
! 0, doit)))
! break;
}
if (!doit)
***************
*** 1122,1126 ****
}
! /* not in an outlet; select and move */
else if (doit)
{
--- 1123,1127 ----
}
! /* not in an outlet; select and move */
else if (doit)
{
***************
*** 1956,1959 ****
--- 1957,1961 ----
canvas_copy(x);
canvas_doclear(x);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
}
}
***************
*** 1994,1997 ****
--- 1996,2000 ----
canvas_resume_dsp(dspstate);
canvas_dirty(x, 1);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
glist_donewloadbangs(x);
}
***************
*** 2070,2086 ****
if (!sink->g_next) goto bad;
! /* check they're both patchable objects */
if (!(objsrc = pd_checkobject(&src->g_pd)) ||
!(objsink = pd_checkobject(&sink->g_pd)))
goto bad;
! /* if object creation failed, make dummy inlets or outlets
! as needed */
if (pd_class(&src->g_pd) == text_class && objsrc->te_type == T_OBJECT)
! while (outno >= obj_noutlets(objsrc))
! outlet_new(objsrc, &s_);
if (pd_class(&sink->g_pd) == text_class && objsink->te_type == T_OBJECT)
! while (inno >= obj_ninlets(objsink))
! inlet_new(objsink, &objsink->ob_pd, &s_, &s_);
if (!(oc = obj_connect(objsrc, outno, objsink, inno))) goto bad;
--- 2073,2089 ----
if (!sink->g_next) goto bad;
! /* check they're both patchable objects */
if (!(objsrc = pd_checkobject(&src->g_pd)) ||
!(objsink = pd_checkobject(&sink->g_pd)))
goto bad;
! /* if object creation failed, make dummy inlets or outlets
! as needed */
if (pd_class(&src->g_pd) == text_class && objsrc->te_type == T_OBJECT)
! while (outno >= obj_noutlets(objsrc))
! outlet_new(objsrc, &s_);
if (pd_class(&sink->g_pd) == text_class && objsink->te_type == T_OBJECT)
! while (inno >= obj_ninlets(objsink))
! inlet_new(objsink, &objsink->ob_pd, &s_, &s_);
if (!(oc = obj_connect(objsrc, outno, objsink, inno))) goto bad;
More information about the Pd-cvs
mailing list