[PD-cvs] pd/src desire.c, 1.1.2.217.2.4, 1.1.2.217.2.5 desire.tk, 1.1.2.600.2.1, 1.1.2.600.2.2

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c desire.tk 
Log Message:
fixed floatatom and symbolatom refresh


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.1
retrieving revision 1.1.2.600.2.2
diff -C2 -d -r1.1.2.600.2.1 -r1.1.2.600.2.2
*** desire.tk	30 Nov 2006 02:22:46 -0000	1.1.2.600.2.1
--- desire.tk	1 Dec 2006 21:00:02 -0000	1.1.2.600.2.2
***************
*** 619,623 ****
  }
  
! proc pdtk_pd_startup {version apilist midiapilist fontname} {
  	set ::pd_myversion $version
  	set ::pd_apilist $apilist
--- 619,623 ----
  }
  
! proc pdtk_pd_startup {version apilist midiapilist args} {
  	set ::pd_myversion $version
  	set ::pd_apilist $apilist
***************
*** 4725,4728 ****
--- 4725,4734 ----
  def FloatAtom canonize {x} {return [expr $x]}
  
+ def AtomBox set {val} {
+ 	set @val $val
+ 	set @text $val ;# why do i have to set two vars and not just one?
+ 	$self changed
+ }
+ 
  def AtomBox key {key shift} {
  	set @clicking 0

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.4
retrieving revision 1.1.2.217.2.5
diff -C2 -d -r1.1.2.217.2.4 -r1.1.2.217.2.5
*** desire.c	30 Nov 2006 18:10:49 -0000	1.1.2.217.2.4
--- desire.c	1 Dec 2006 21:00:00 -0000	1.1.2.217.2.5
***************
*** 6270,6275 ****
      } 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");
  	binbuf_addv(b, "ssii", gensym("#X"), sel, (t_int)x->te_xpix, (t_int)x->te_ypix);
  	binbuf_addv(b, "iffi", (t_int)x->te_width, g->min, g->max, (t_int)g->wherelabel);
--- 6270,6274 ----
      } else if (x->te_type == T_ATOM) {
  	t_gatom *g = (t_gatom *)x;
! 	t_symbol *sel = g->atom.a_type==A_SYMBOL? gensym("symbolatom") : gensym("floatatom");
  	binbuf_addv(b, "ssii", gensym("#X"), sel, (t_int)x->te_xpix, (t_int)x->te_ypix);
  	binbuf_addv(b, "iffi", (t_int)x->te_width, g->min, g->max, (t_int)g->wherelabel);
***************
*** 6643,6646 ****
--- 6642,6653 ----
  		sys_mgui(self,"folder=","s",canvas_getenv(can)->dir);
  	}
+ 	if (x->te_type == T_ATOM) {
+ 		t_gatom *g = (t_gatom *)x;
+ 		if (g->atom.a_type==A_SYMBOL) {
+ 			sys_mgui(g,"set","s",g->atom.a_w.w_symbol);
+ 		} else {
+ 			sys_mgui(g,"set","f",g->atom.a_w.w_float);
+ 		}
+ 	}
  }