[PD-cvs] pd/src desire.c,1.1.2.164,1.1.2.165

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5233

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
duh


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.164
retrieving revision 1.1.2.165
diff -C2 -d -r1.1.2.164 -r1.1.2.165
*** desire.c	7 Sep 2006 07:15:17 -0000	1.1.2.164
--- desire.c	7 Sep 2006 07:30:19 -0000	1.1.2.165
***************
*** 6768,6772 ****
      complicated. */
  static t_symbol *gatom_escapit(t_symbol *s) {
!     if (!*s->s_name) return gensym("-");
      if (*s->s_name == '-') {
      	char shmo[1000];
--- 6768,6772 ----
      complicated. */
  static t_symbol *gatom_escapit(t_symbol *s) {
!     if (!s || !*s->s_name) return gensym("-");
      if (*s->s_name == '-') {
      	char shmo[1000];
***************
*** 6870,6876 ****
      x->min = x->max = 0;
      x->wherelabel = 0;
!     x->label = &s_;
!     x->rcv = &s_;
!     x->snd = x->expanded_to = &s_;
      if (type == A_FLOAT) {
      	x->atom.a_w.w_float = 0;
--- 6870,6874 ----
      x->min = x->max = 0;
      x->wherelabel = 0;
!     x->label = x->rcv = x->snd = x->expanded_to = &s_;
      if (type == A_FLOAT) {
      	x->atom.a_w.w_float = 0;
***************
*** 6886,6908 ****
  	float width;
  	char wherelabel;
!     	x->a_text.te_xpix = atom_getfloatarg(0, argc, argv);
!     	x->a_text.te_ypix = atom_getfloatarg(1, argc, argv);
! 	pd_scanargs(argc-2,argv+2,"fffsfss",&width,&x->min,&x->max,&x->label,&wherelabel,&x->rcv,&x->snd);
!     	x->a_text.te_width = (width<0||width>500) ? 4 : width;
! 	x->wherelabel = wherelabel&3;
! 	x->label = gatom_unescapit(x->label);
! 	x->rcv   = gatom_unescapit(x->rcv);
  	if (*x->rcv->s_name) pd_bind(&x->a_text.te_pd, canvas_realizedollar(x->glist, x->rcv));
- 	x->snd = gatom_unescapit(x->snd);
  	x->expanded_to = canvas_realizedollar(x->glist, x->snd);
  	if (x->snd == &s_) outlet_new(&x->a_text, x->atom.a_type == A_FLOAT ? &s_float: &s_symbol);
  	if (x->rcv == &s_) inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0);
-     	glist_add(gl, &x->a_text.te_g);
      } else {
  	outlet_new(&x->a_text, x->atom.a_type == A_FLOAT ? &s_float: &s_symbol);
  	inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0);
      	x->a_text.te_xpix = x->a_text.te_ypix = 0;
-     	glist_add(gl, &x->a_text.te_g);
      }
  }
  
--- 6884,6906 ----
  	float width;
  	char wherelabel;
! 	x->a_text.te_xpix = atom_getfloatarg(0, argc, argv);
! 	x->a_text.te_ypix = atom_getfloatarg(1, argc, argv);
! 	if(pd_scanargs(argc-2,argv+2,"fffafaa",&width,&x->min,&x->max,&x->label,&wherelabel,&x->rcv,&x->snd)){
! 		x->a_text.te_width = (width<0||width>500) ? 4 : width;
! 		x->wherelabel = wherelabel&3;
! 		x->label = gatom_unescapit(x->label);
! 		x->rcv   = gatom_unescapit(x->rcv);
! 		x->snd   = gatom_unescapit(x->snd);
! 	}
  	if (*x->rcv->s_name) pd_bind(&x->a_text.te_pd, canvas_realizedollar(x->glist, x->rcv));
  	x->expanded_to = canvas_realizedollar(x->glist, x->snd);
  	if (x->snd == &s_) outlet_new(&x->a_text, x->atom.a_type == A_FLOAT ? &s_float: &s_symbol);
  	if (x->rcv == &s_) inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0);
      } else {
  	outlet_new(&x->a_text, x->atom.a_type == A_FLOAT ? &s_float: &s_symbol);
  	inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0);
      	x->a_text.te_xpix = x->a_text.te_ypix = 0;
      }
+     glist_add(gl, &x->a_text.te_g);
  }
  
***************
*** 6917,6924 ****
  }
  
- void canvas_saverestoreto(t_canvas *x, t_binbuf *b) {
- 
- }
- 
  void text_save(t_gobj *z, t_binbuf *b) {
      t_text *x = (t_text *)z;
--- 6915,6918 ----
***************
*** 6941,6945 ****
          binbuf_addbinbuf(b, x->te_binbuf);
      } else if (x->te_type == T_ATOM) {
! 	t_gatom *g;
  	t_atomtype t = g->atom.a_type;
  	t_symbol *sel = t==A_SYMBOL? gensym("symbolatom") : gensym("floatatom");
--- 6935,6939 ----
          binbuf_addbinbuf(b, x->te_binbuf);
      } else if (x->te_type == T_ATOM) {
! 	t_gatom *g = (t_gatom *)x;
  	t_atomtype t = g->atom.a_type;
  	t_symbol *sel = t==A_SYMBOL? gensym("symbolatom") : gensym("floatatom");