[PD-cvs] externals/ggee/gui button.c, 1.16, 1.17 gcanvas.c, 1.4, 1.5 image.c, 1.11, 1.12 slider.c, 1.12, 1.13 sliderh.c, 1.7, 1.8 ticker.c, 1.9, 1.10 toddle.c, 1.5, 1.6 w_envgen.h, 1.13, 1.14
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Mon Oct 29 19:58:44 CET 2007
Update of /cvsroot/pure-data/externals/ggee/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1599/ggee/gui
Modified Files:
button.c gcanvas.c image.c slider.c sliderh.c ticker.c
toddle.c w_envgen.h
Log Message:
Following this thread:
http://lists.puredata.info/pipermail/pd-dev/2007-10/009797.html
I have changed the save functions so that they will save the name of the
object that it was actually instantiated with. This allows objects with
savefns to work properly with namespaces.
This is a fix for this bug:
http://sourceforge.net/tracker/index.php?&aid=1818219&group_id=55736&atid=478070
Index: ticker.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/ticker.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ticker.c 14 Nov 2005 21:59:09 -0000 1.9
--- ticker.c 29 Oct 2007 18:58:42 -0000 1.10
***************
*** 19,25 ****
t_fatom *x = (t_fatom *)z;
! binbuf_addv(b, "ssiiss", gensym("#X"),gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! gensym("ticker"),x->x_text,x->x_max,x->x_width);
binbuf_addv(b, ";");
}
--- 19,26 ----
t_fatom *x = (t_fatom *)z;
! binbuf_addv(b, "ssiiss", gensym("#X"), gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_text,x->x_max,x->x_width);
binbuf_addv(b, ";");
}
Index: gcanvas.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/gcanvas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gcanvas.c 22 May 2005 13:17:33 -0000 1.4
--- gcanvas.c 29 Oct 2007 18:58:42 -0000 1.5
***************
*** 28,273 ****
void gcanvas_drawme(t_gcanvas *x, t_glist *glist, int firsttime)
! {
! if (firsttime) {
! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xS -fill %s\n",
! glist_getcanvas(glist),
! x->x_obj.te_xpix, x->x_obj.te_ypix,
! x->x_obj.te_xpix + x->x_width, x->x_obj.te_ypix + x->x_height,
! x,BACKGROUNDCOLOR);
! }
! else {
sys_vgui(".x%x.c coords %xS \
! %d %d %d %d\n",
! glist_getcanvas(glist), x,
! x->x_obj.te_xpix, x->x_obj.te_ypix,
! x->x_obj.te_xpix + x->x_width, x->x_obj.te_ypix + x->x_height);
! }
!
! {
! /* outlets */
! int n = 2;
! int nplus, i;
! nplus = (n == 1 ? 1 : n-1);
! for (i = 0; i < n; i++)
! {
! int onset = x->x_obj.te_xpix + (x->x_width - IOWIDTH) * i / nplus;
! if (firsttime)
! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xo%d\n",
! glist_getcanvas(glist),
! onset, x->x_obj.te_ypix + x->x_height - 1,
! onset + IOWIDTH, x->x_obj.te_ypix + x->x_height,
! x, i);
! else
! sys_vgui(".x%x.c coords %xo%d %d %d %d %d\n",
! glist_getcanvas(glist), x, i,
! onset, x->x_obj.te_ypix + x->x_height - 1,
! onset + IOWIDTH, x->x_obj.te_ypix + x->x_height);
! }
! /* inlets */
! n = 0;
! nplus = (n == 1 ? 1 : n-1);
! for (i = 0; i < n; i++)
! {
! int onset = x->x_obj.te_xpix + (x->x_width - IOWIDTH) * i / nplus;
! if (firsttime)
! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xi%d\n",
! glist_getcanvas(glist),
! onset, x->x_obj.te_ypix,
! onset + IOWIDTH, x->x_obj.te_ypix + 1,
! x, i);
! else
! sys_vgui(".x%x.c coords %xi%d %d %d %d %d\n",
! glist_getcanvas(glist), x, i,
! onset, x->x_obj.te_ypix,
! onset + IOWIDTH, x->x_obj.te_ypix + 1);
!
! }
! }
!
! }
!
!
!
!
! void gcanvas_erase(t_gcanvas* x,t_glist* glist)
! {
! int n;
! sys_vgui(".x%x.c delete %xS\n",
! glist_getcanvas(glist), x);
! n = 2;
! while (n--) {
! sys_vgui(".x%x.c delete %xo%d\n",glist_getcanvas(glist),x,n);
! }
! }
!
!
!
! /* ------------------------ gcanvas widgetbehaviour----------------------------- */
!
!
! static void gcanvas_getrect(t_gobj *z, t_glist *owner,
! int *xp1, int *yp1, int *xp2, int *yp2)
! {
! int width, height;
! t_gcanvas* s = (t_gcanvas*)z;
!
!
! width = s->x_width;
! height = s->x_height;
! *xp1 = s->x_obj.te_xpix;
! *yp1 = s->x_obj.te_ypix;
! *xp2 = s->x_obj.te_xpix + width;
! *yp2 = s->x_obj.te_ypix + height;
! }
!
! static void gcanvas_displace(t_gobj *z, t_glist *glist,
! int dx, int dy)
! {
! t_gcanvas *x = (t_gcanvas *)z;
! x->x_obj.te_xpix += dx;
! x->x_obj.te_ypix += dy;
! gcanvas_drawme(x, glist, 0);
! canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x);
! }
!
! static void gcanvas_select(t_gobj *z, t_glist *glist, int state)
! {
! t_gcanvas *x = (t_gcanvas *)z;
! sys_vgui(".x%x.c itemconfigure %xS -fill %s\n", glist,
! x, (state? "blue" : BACKGROUNDCOLOR));
! }
!
!
! static void gcanvas_activate(t_gobj *z, t_glist *glist, int state)
! {
! /* t_text *x = (t_text *)z;
! t_rtext *y = glist_findrtext(glist, x);
! if (z->g_pd != gatom_class) rtext_activate(y, state);*/
! }
!
! static void gcanvas_delete(t_gobj *z, t_glist *glist)
! {
! t_text *x = (t_text *)z;
! canvas_deletelinesfor(glist_getcanvas(glist), x);
! }
!
!
! static void gcanvas_vis(t_gobj *z, t_glist *glist, int vis)
! {
! t_gcanvas* s = (t_gcanvas*)z;
! if (vis)
! gcanvas_drawme(s, glist, 1);
! else
! gcanvas_erase(s,glist);
! }
!
! /* can we use the normal text save function ?? */
!
! static void gcanvas_save(t_gobj *z, t_binbuf *b)
! {
! t_gcanvas *x = (t_gcanvas *)z;
! binbuf_addv(b, "ssiisii", gensym("#X"),gensym("obj"),
! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
! gensym("gcanvas"),x->x_width,x->x_height);
! binbuf_addv(b, ";");
! }
!
!
! t_widgetbehavior gcanvas_widgetbehavior;
!
! static void gcanvas_motion(t_gcanvas *x, t_floatarg dx, t_floatarg dy)
! {
! x->x += dx;
! x->y += dy;
! outlet_float(x->out2,x->y);
! outlet_float(x->x_obj.ob_outlet,x->x);
! }
!
! void gcanvas_key(t_gcanvas *x, t_floatarg f)
! {
! post("key");
! }
!
!
! static void gcanvas_click(t_gcanvas *x,
! t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl,
! t_floatarg alt)
! {
! glist_grab(x->x_glist, &x->x_obj.te_g, (t_glistmotionfn) gcanvas_motion,
! (t_glistkeyfn) NULL, xpos, ypos);
!
! x->x = xpos - x->x_obj.te_xpix;
! x->y = ypos - x->x_obj.te_ypix;
! outlet_float(x->out2,x->y);
! outlet_float(x->x_obj.ob_outlet,x->x);
! }
!
! static int gcanvas_newclick(t_gobj *z, struct _glist *glist,
! int xpix, int ypix, int shift, int alt, int dbl, int doit)
! {
! if (doit)
! gcanvas_click((t_gcanvas *)z, (t_floatarg)xpix, (t_floatarg)ypix,
! (t_floatarg)shift, 0, (t_floatarg)alt);
! return (1);
! }
!
! void gcanvas_size(t_gcanvas* x,t_floatarg w,t_floatarg h) {
! x->x_width = w;
! x->x_height = h;
! gcanvas_drawme(x, x->x_glist, 0);
! }
!
! static void gcanvas_setwidget(void)
! {
! gcanvas_widgetbehavior.w_getrectfn = gcanvas_getrect;
! gcanvas_widgetbehavior.w_displacefn = gcanvas_displace;
! gcanvas_widgetbehavior.w_selectfn = gcanvas_select;
! gcanvas_widgetbehavior.w_activatefn = gcanvas_activate;
! gcanvas_widgetbehavior.w_deletefn = gcanvas_delete;
! gcanvas_widgetbehavior.w_visfn = gcanvas_vis;
! gcanvas_widgetbehavior.w_clickfn = gcanvas_newclick;
! #if PD_MINOR_VERSION < 37
! gcanvas_widgetbehavior.w_propertiesfn = NULL;
! gcanvas_widgetbehavior.w_savefn = gcanvas_save;
! #endif
! }
!
!
! static void *gcanvas_new(t_floatarg h,t_floatarg o)
! {
! t_gcanvas *x = (t_gcanvas *)pd_new(gcanvas_class);
!
! x->x_glist = (t_glist*) canvas_getcurrent();
! if (h) x->x_width = h;
! else
! x->x_width = DEFAULTSIZE;
!
! if (o) x->x_height = o;
! else
! x->x_height = DEFAULTSIZE;
!
! outlet_new(&x->x_obj, &s_float);
! x->out2 = outlet_new(&x->x_obj, &s_float);
! return (x);
! }
!
! void gcanvas_setup(void)
! {
! gcanvas_class = class_new(gensym("gcanvas"), (t_newmethod)gcanvas_new, 0,
! sizeof(t_gcanvas),0, A_DEFFLOAT,A_DEFFLOAT,0);
!
! class_addcreator((t_newmethod)gcanvas_new,gensym("bng"),A_DEFSYM,A_DEFFLOAT,A_DEFFLOAT,A_GIMME,0);
!
! class_addmethod(gcanvas_class, (t_method)gcanvas_click, gensym("click"),
! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
! class_addmethod(gcanvas_class, (t_method)gcanvas_size, gensym("size"),
! A_FLOAT, A_FLOAT, 0);
!
! gcanvas_setwidget();
! class_setwidget(gcanvas_class,&gcanvas_widgetbehavior);
! #if PD_MINOR_VERSION >= 37
! class_setsavefn(gcanvas_class,&gcanvas_save);
! #endif
! }
!
!
--- 28,274 ----
void gcanvas_drawme(t_gcanvas *x, t_glist *glist, int firsttime)
! {
! if (firsttime) {
! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xS -fill %s\n",
! glist_getcanvas(glist),
! x->x_obj.te_xpix, x->x_obj.te_ypix,
! x->x_obj.te_xpix + x->x_width, x->x_obj.te_ypix + x->x_height,
! x,BACKGROUNDCOLOR);
! }
! else {
sys_vgui(".x%x.c coords %xS \
! %d %d %d %d\n",
! glist_getcanvas(glist), x,
! x->x_obj.te_xpix, x->x_obj.te_ypix,
! x->x_obj.te_xpix + x->x_width, x->x_obj.te_ypix + x->x_height);
! }
!
! {
! /* outlets */
! int n = 2;
! int nplus, i;
! nplus = (n == 1 ? 1 : n-1);
! for (i = 0; i < n; i++)
! {
! int onset = x->x_obj.te_xpix + (x->x_width - IOWIDTH) * i / nplus;
! if (firsttime)
! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xo%d\n",
! glist_getcanvas(glist),
! onset, x->x_obj.te_ypix + x->x_height - 1,
! onset + IOWIDTH, x->x_obj.te_ypix + x->x_height,
! x, i);
! else
! sys_vgui(".x%x.c coords %xo%d %d %d %d %d\n",
! glist_getcanvas(glist), x, i,
! onset, x->x_obj.te_ypix + x->x_height - 1,
! onset + IOWIDTH, x->x_obj.te_ypix + x->x_height);
! }
! /* inlets */
! n = 0;
! nplus = (n == 1 ? 1 : n-1);
! for (i = 0; i < n; i++)
! {
! int onset = x->x_obj.te_xpix + (x->x_width - IOWIDTH) * i / nplus;
! if (firsttime)
! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xi%d\n",
! glist_getcanvas(glist),
! onset, x->x_obj.te_ypix,
! onset + IOWIDTH, x->x_obj.te_ypix + 1,
! x, i);
! else
! sys_vgui(".x%x.c coords %xi%d %d %d %d %d\n",
! glist_getcanvas(glist), x, i,
! onset, x->x_obj.te_ypix,
! onset + IOWIDTH, x->x_obj.te_ypix + 1);
!
! }
! }
!
! }
!
!
!
!
! void gcanvas_erase(t_gcanvas* x,t_glist* glist)
! {
! int n;
! sys_vgui(".x%x.c delete %xS\n",
! glist_getcanvas(glist), x);
! n = 2;
! while (n--) {
! sys_vgui(".x%x.c delete %xo%d\n",glist_getcanvas(glist),x,n);
! }
! }
!
!
!
! /* ------------------------ gcanvas widgetbehaviour----------------------------- */
!
!
! static void gcanvas_getrect(t_gobj *z, t_glist *owner,
! int *xp1, int *yp1, int *xp2, int *yp2)
! {
! int width, height;
! t_gcanvas* s = (t_gcanvas*)z;
!
!
! width = s->x_width;
! height = s->x_height;
! *xp1 = s->x_obj.te_xpix;
! *yp1 = s->x_obj.te_ypix;
! *xp2 = s->x_obj.te_xpix + width;
! *yp2 = s->x_obj.te_ypix + height;
! }
!
! static void gcanvas_displace(t_gobj *z, t_glist *glist,
! int dx, int dy)
! {
! t_gcanvas *x = (t_gcanvas *)z;
! x->x_obj.te_xpix += dx;
! x->x_obj.te_ypix += dy;
! gcanvas_drawme(x, glist, 0);
! canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x);
! }
!
! static void gcanvas_select(t_gobj *z, t_glist *glist, int state)
! {
! t_gcanvas *x = (t_gcanvas *)z;
! sys_vgui(".x%x.c itemconfigure %xS -fill %s\n", glist,
! x, (state? "blue" : BACKGROUNDCOLOR));
! }
!
!
! static void gcanvas_activate(t_gobj *z, t_glist *glist, int state)
! {
! /* t_text *x = (t_text *)z;
! t_rtext *y = glist_findrtext(glist, x);
! if (z->g_pd != gatom_class) rtext_activate(y, state);*/
! }
!
! static void gcanvas_delete(t_gobj *z, t_glist *glist)
! {
! t_text *x = (t_text *)z;
! canvas_deletelinesfor(glist_getcanvas(glist), x);
! }
!
!
! static void gcanvas_vis(t_gobj *z, t_glist *glist, int vis)
! {
! t_gcanvas* s = (t_gcanvas*)z;
! if (vis)
! gcanvas_drawme(s, glist, 1);
! else
! gcanvas_erase(s,glist);
! }
!
! /* can we use the normal text save function ?? */
!
! static void gcanvas_save(t_gobj *z, t_binbuf *b)
! {
! t_gcanvas *x = (t_gcanvas *)z;
! binbuf_addv(b, "ssiisii", gensym("#X"), gensym("obj"),
! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_width, x->x_height);
! binbuf_addv(b, ";");
! }
!
!
! t_widgetbehavior gcanvas_widgetbehavior;
!
! static void gcanvas_motion(t_gcanvas *x, t_floatarg dx, t_floatarg dy)
! {
! x->x += dx;
! x->y += dy;
! outlet_float(x->out2,x->y);
! outlet_float(x->x_obj.ob_outlet,x->x);
! }
!
! void gcanvas_key(t_gcanvas *x, t_floatarg f)
! {
! post("key");
! }
!
!
! static void gcanvas_click(t_gcanvas *x,
! t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl,
! t_floatarg alt)
! {
! glist_grab(x->x_glist, &x->x_obj.te_g, (t_glistmotionfn) gcanvas_motion,
! (t_glistkeyfn) NULL, xpos, ypos);
!
! x->x = xpos - x->x_obj.te_xpix;
! x->y = ypos - x->x_obj.te_ypix;
! outlet_float(x->out2,x->y);
! outlet_float(x->x_obj.ob_outlet,x->x);
! }
!
! static int gcanvas_newclick(t_gobj *z, struct _glist *glist,
! int xpix, int ypix, int shift, int alt, int dbl, int doit)
! {
! if (doit)
! gcanvas_click((t_gcanvas *)z, (t_floatarg)xpix, (t_floatarg)ypix,
! (t_floatarg)shift, 0, (t_floatarg)alt);
! return (1);
! }
!
! void gcanvas_size(t_gcanvas* x,t_floatarg w,t_floatarg h) {
! x->x_width = w;
! x->x_height = h;
! gcanvas_drawme(x, x->x_glist, 0);
! }
!
! static void gcanvas_setwidget(void)
! {
! gcanvas_widgetbehavior.w_getrectfn = gcanvas_getrect;
! gcanvas_widgetbehavior.w_displacefn = gcanvas_displace;
! gcanvas_widgetbehavior.w_selectfn = gcanvas_select;
! gcanvas_widgetbehavior.w_activatefn = gcanvas_activate;
! gcanvas_widgetbehavior.w_deletefn = gcanvas_delete;
! gcanvas_widgetbehavior.w_visfn = gcanvas_vis;
! gcanvas_widgetbehavior.w_clickfn = gcanvas_newclick;
! #if PD_MINOR_VERSION < 37
! gcanvas_widgetbehavior.w_propertiesfn = NULL;
! gcanvas_widgetbehavior.w_savefn = gcanvas_save;
! #endif
! }
!
!
! static void *gcanvas_new(t_floatarg h,t_floatarg o)
! {
! t_gcanvas *x = (t_gcanvas *)pd_new(gcanvas_class);
!
! x->x_glist = (t_glist*) canvas_getcurrent();
! if (h) x->x_width = h;
! else
! x->x_width = DEFAULTSIZE;
!
! if (o) x->x_height = o;
! else
! x->x_height = DEFAULTSIZE;
!
! outlet_new(&x->x_obj, &s_float);
! x->out2 = outlet_new(&x->x_obj, &s_float);
! return (x);
! }
!
! void gcanvas_setup(void)
! {
! gcanvas_class = class_new(gensym("gcanvas"), (t_newmethod)gcanvas_new, 0,
! sizeof(t_gcanvas),0, A_DEFFLOAT,A_DEFFLOAT,0);
!
! class_addcreator((t_newmethod)gcanvas_new,gensym("bng"),A_DEFSYM,A_DEFFLOAT,A_DEFFLOAT,A_GIMME,0);
!
! class_addmethod(gcanvas_class, (t_method)gcanvas_click, gensym("click"),
! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
! class_addmethod(gcanvas_class, (t_method)gcanvas_size, gensym("size"),
! A_FLOAT, A_FLOAT, 0);
!
! gcanvas_setwidget();
! class_setwidget(gcanvas_class,&gcanvas_widgetbehavior);
! #if PD_MINOR_VERSION >= 37
! class_setsavefn(gcanvas_class,&gcanvas_save);
! #endif
! }
!
!
Index: slider.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/slider.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** slider.c 1 Jul 2005 07:51:03 -0000 1.12
--- slider.c 29 Oct 2007 18:58:42 -0000 1.13
***************
*** 10,16 ****
t_fatom *x = (t_fatom *)z;
! binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! gensym("slider"),x->x_max,x->x_min,x->x_width);
binbuf_addv(b, ";");
}
--- 10,17 ----
t_fatom *x = (t_fatom *)z;
! binbuf_addv(b, "ssiisiii", gensym("#X"), gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_max,x->x_min,x->x_width);
binbuf_addv(b, ";");
}
Index: toddle.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/toddle.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** toddle.c 14 Nov 2005 21:59:09 -0000 1.5
--- toddle.c 29 Oct 2007 18:58:42 -0000 1.6
***************
*** 238,244 ****
{
t_toddle *x = (t_toddle *)z;
! binbuf_addv(b, "ssiissii", gensym("#X"),gensym("obj"),
! (t_int)x->x_obj.te_xpos, (t_int)x->x_obj.te_ypos,
! gensym("toddle"),x->x_color,x->x_width,x->x_height);
binbuf_addv(b, ";");
}
--- 238,245 ----
{
t_toddle *x = (t_toddle *)z;
! binbuf_addv(b, "ssiissii", gensym("#X"), gensym("obj"),
! (t_int)x->x_obj.te_xpos, (t_int)x->x_obj.te_ypos,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_color,x->x_width,x->x_height);
binbuf_addv(b, ";");
}
Index: image.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/image.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** image.c 15 Aug 2007 22:57:56 -0000 1.11
--- image.c 29 Oct 2007 18:58:42 -0000 1.12
***************
*** 139,145 ****
{
t_image *x = (t_image *)z;
! binbuf_addv(b, "ssiiss", gensym("#X"),gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix,
! gensym("image"),x->x_fname);
binbuf_addv(b, ";");
}
--- 139,146 ----
{
t_image *x = (t_image *)z;
! binbuf_addv(b, "ssiiss", gensym("#X"), gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_fname);
binbuf_addv(b, ";");
}
Index: sliderh.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/sliderh.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sliderh.c 14 Nov 2005 21:59:09 -0000 1.7
--- sliderh.c 29 Oct 2007 18:58:42 -0000 1.8
***************
*** 19,25 ****
t_fatom *x = (t_fatom *)z;
! binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! gensym("sliderh"),x->x_max,x->x_min,x->x_width);
binbuf_addv(b, ";");
}
--- 19,26 ----
t_fatom *x = (t_fatom *)z;
! binbuf_addv(b, "ssiisiii", gensym("#X"), gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_max,x->x_min,x->x_width);
binbuf_addv(b, ";");
}
Index: button.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/button.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** button.c 14 Nov 2005 21:59:09 -0000 1.16
--- button.c 29 Oct 2007 18:58:42 -0000 1.17
***************
*** 295,301 ****
t_button *x = (t_button *)z;
! binbuf_addv(b, "ssiiss", gensym("#X"),gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! gensym("button"),x->x_text);
binbuf_addv(b, ";");
}
--- 295,302 ----
t_button *x = (t_button *)z;
! binbuf_addv(b, "ssiiss", gensym("#X"), gensym("obj"),
! x->x_obj.te_xpix, x->x_obj.te_ypix ,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->x_text);
binbuf_addv(b, ";");
}
Index: w_envgen.h
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/w_envgen.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** w_envgen.h 3 Jul 2007 11:04:57 -0000 1.13
--- w_envgen.h 29 Oct 2007 18:58:42 -0000 1.14
***************
*** 364,370 ****
{
t_envgen *x = (t_envgen *)z;
! binbuf_addv(b, "ssiisiiffss", gensym("#X"),gensym("obj"),
! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
! gensym("envgen"),x->w.width,x->w.height,x->max,x->min,x->r_sym,x->s_sym);
binbuf_addv(b, ";");
}
--- 364,371 ----
{
t_envgen *x = (t_envgen *)z;
! binbuf_addv(b, "ssiisiiffss", gensym("#X"), gensym("obj"),
! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
! atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
! x->w.width,x->w.height,x->max,x->min,x->r_sym,x->s_sym);
binbuf_addv(b, ";");
}
More information about the Pd-cvs
mailing list