[PD-cvs] pd/src desire.c, 1.1.2.217.2.186, 1.1.2.217.2.187 desire.tk, 1.1.2.600.2.271, 1.1.2.600.2.272

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c desire.tk 
Log Message:
change to proc change: send index of object (relative to a canvas)


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.271
retrieving revision 1.1.2.600.2.272
diff -C2 -d -r1.1.2.600.2.271 -r1.1.2.600.2.272
*** desire.tk	3 Aug 2007 08:55:25 -0000	1.1.2.600.2.271
--- desire.tk	3 Aug 2007 15:49:02 -0000	1.1.2.600.2.272
***************
*** 950,954 ****
  } elseif {$cmdline(valgrind)} {
  	#exec valgrind --tool=memcheck $cmdline(server) -guiport $server_port &
! 	exec valgrind --tool=memcheck --gen-suppressions=yes --suppressions=valgrind3.supp $cmdline(server) -guiport $server_port &
  } else {
      if {$cmdline(gdb)} {
--- 950,954 ----
  } elseif {$cmdline(valgrind)} {
  	#exec valgrind --tool=memcheck $cmdline(server) -guiport $server_port &
! 	exec valgrind --tool=memcheck --gen-suppressions=all --suppressions=valgrind3.supp $cmdline(server) -guiport $server_port &
  } else {
      if {$cmdline(gdb)} {
***************
*** 1210,1213 ****
--- 1210,1214 ----
  	super
  	set @selected? 0
+ 	set @index 0xDEADBEEF
  	set @ninlets 1  ;# should be in Box init
  	set @noutlets 0 ;# should be in Box init
***************
*** 2640,2644 ****
  	set parts [lrange $parts 0 end-1]
  	foreach part $parts {netsend $part}
! 	netsend [concat [list .$self object_insert $i] $last]
  	$@history add [list $self del $i]
  }
--- 2641,2645 ----
  	set parts [lrange $parts 0 end-1]
  	foreach part $parts {netsend $part}
! 	netsend [concat [list .$self object_insert $i] $last] ;# bork bork bork
  	$@history add [list $self del $i]
  }
***************
*** 5171,5179 ****
  #A 0 0;
  
! proc change {self canvas e {ninlets 0} {noutlets 0} {valid 1}} {
  	foreach mess [pd_mess_split $e] {change_2 $self $mess}
  	#the server ought to take care of this:
  	#if {[lindex $e 1] == "array"} {set ninlets 0; set noutlets 0}
  	if {$canvas != "x0"} {$self   canvas= $canvas}
  	$self  ninlets= $ninlets
  	$self noutlets= $noutlets
--- 5172,5184 ----
  #A 0 0;
  
! def Canvas index= {i} {set @index $i}
! def Canvas index {} {return $@index}
! 
! proc change {self canvas index e {ninlets 0} {noutlets 0} {valid 1}} {
  	foreach mess [pd_mess_split $e] {change_2 $self $mess}
  	#the server ought to take care of this:
  	#if {[lindex $e 1] == "array"} {set ninlets 0; set noutlets 0}
  	if {$canvas != "x0"} {$self   canvas= $canvas}
+ 	$self    index= $index
  	$self  ninlets= $ninlets
  	$self noutlets= $noutlets

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.186
retrieving revision 1.1.2.217.2.187
diff -C2 -d -r1.1.2.217.2.186 -r1.1.2.217.2.187
*** desire.c	3 Aug 2007 14:57:13 -0000	1.1.2.217.2.186
--- desire.c	3 Aug 2007 15:49:00 -0000	1.1.2.217.2.187
***************
*** 6007,6014 ****
  	if (s[n-1]=='\n') n--;
  	if (c->patchable) {
! 		sys_vgui("change x%lx x%lx {%.*s} %d %d %d\n",(long)self,(long)self->dix->canvas,n,s,
  			obj_ninlets((t_text *)self), obj_noutlets((t_text *)self), x->_class!=dummy_class);
  	} else {
! 		sys_vgui("change x%lx x%lx {%.*s}\n",(long)self,(long)self->dix->canvas,n,s);
  	}
  	binbuf_free(b);
--- 6007,6014 ----
  	if (s[n-1]=='\n') n--;
  	if (c->patchable) {
! 		sys_vgui("change x%lx x%lx %d {%.*s} %d %d %d\n",(long)self,(long)self->dix->canvas,self->dix->index,n,s,
  			obj_ninlets((t_text *)self), obj_noutlets((t_text *)self), x->_class!=dummy_class);
  	} else {
! 		sys_vgui("change x%lx x%lx %d {%.*s}\n",(long)self,(long)self->dix->canvas,self->dix->index,n,s);
  	}
  	binbuf_free(b);