[PD-cvs] pd/src desire.c,1.1.2.179,1.1.2.180
Mathieu Bouchard
matju at users.sourceforge.net
Fri Sep 15 17:21:48 CEST 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27167
Modified Files:
Tag: devel_0_39
desire.c
Log Message:
fixed previous commit (renamed Pd to s_Pd)
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.179
retrieving revision 1.1.2.180
diff -C2 -d -r1.1.2.179 -r1.1.2.180
*** desire.c 15 Sep 2006 07:39:07 -0000 1.1.2.179
--- desire.c 15 Sep 2006 15:21:44 -0000 1.1.2.180
***************
*** 406,412 ****
static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) {
t_symbol *bs = canvas_makebindsym(x->name);
! if (x->name!=Pd) pd_unbind((t_pd *)x, bs);
x->name = s;
! if (x->name!=Pd) pd_bind((t_pd *)x, bs);
if (dir && dir != &s_) canvas_getenv(x)->dir = dir;
gobj_changed(x,0);
--- 406,412 ----
static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) {
t_symbol *bs = canvas_makebindsym(x->name);
! if (x->name!=s_Pd) pd_unbind((t_pd *)x, bs);
x->name = s;
! if (x->name!=s_Pd) pd_bind((t_pd *)x, bs);
if (dir && dir != &s_) canvas_getenv(x)->dir = dir;
gobj_changed(x,0);
***************
*** 567,574 ****
menu = 1;
} else if (!strncmp((str = sym->s_name), "graph", 5) && (zz = atoi(str + 5)) > gcount) gcount = zz;
! /* in 0.34 and earlier, the pixel rectangle and the y bounds were
! reversed; this would behave the same, except that the dialog window
! would be confusing. The "correct" way is to have "py1" be the value
! that is higher on the screen. */
if (py2 < py1) {
float zz = y2; y2 = y1; y1 = zz;
--- 567,573 ----
menu = 1;
} else if (!strncmp((str = sym->s_name), "graph", 5) && (zz = atoi(str + 5)) > gcount) gcount = zz;
! /* in 0.34 and earlier, the pixel rectangle and the y bounds were reversed; this would behave the same,
! except that the dialog window would be confusing. The "correct" way is to have "py1" be the value
! that is higher on the screen. */
if (py2 < py1) {
float zz = y2; y2 = y1; y1 = zz;
***************
*** 624,628 ****
x->screenx1 = x1; x->screeny1 = y1;
x->screenx2 = x2; x->screeny2 = y2;
! if (!x->isgraph && (x->y2 < x->y1)) {
/* if it's flipped so that y grows upward, fix so that zero is bottom edge and redraw.
This is only appropriate if we're a regular "text" object on the parent. */
--- 623,627 ----
x->screenx1 = x1; x->screeny1 = y1;
x->screenx2 = x2; x->screeny2 = y2;
! if (!x->isgraph && x->y2 < x->y1) {
/* if it's flipped so that y grows upward, fix so that zero is bottom edge and redraw.
This is only appropriate if we're a regular "text" object on the parent. */
***************
*** 3186,3190 ****
that old versions of Pd can at least do something with it.
otherwise write in 0.38-compatible form. */
! binbuf_addv(b, "ssfffffff", gensym("#X"), gensym("coords"),
x->x1, x->y1, x->x2, x->y2, (float)x->pixwidth, (float)x->pixheight,
x->isgraph);
--- 3185,3189 ----
that old versions of Pd can at least do something with it.
otherwise write in 0.38-compatible form. */
! binbuf_addv(b, "ssffffffi", gensym("#X"), gensym("coords"),
x->x1, x->y1, x->x2, x->y2, (float)x->pixwidth, (float)x->pixheight,
x->isgraph);
***************
*** 3777,3786 ****
*/
! /* IOhannes :
! * changed the canvas_restore, so that it might accept $args as well (like "pd $0_test")
! * so you can make multiple & distinguishable templates
! * 1511:forum::für::umläute:2001
! * changes marked with IOhannes
! * added Krzysztof Czajas fix to avoid crashing...
*/
--- 3776,3781 ----
*/
! /* IOhannes changed the canvas_restore, so that it might accept $args as well (like "pd $0_test")
! * so you can make multiple & distinguishable templates; added Krzysztof Czajas fix to avoid crashing...
*/
More information about the Pd-cvs
mailing list