[PD-cvs] pd/src desire.tk,1.1.2.600.2.274,1.1.2.600.2.275

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
merged the 4 @coords variables as one, and @pixwidth, at pixheight into @pixsize


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.274
retrieving revision 1.1.2.600.2.275
diff -C2 -d -r1.1.2.600.2.274 -r1.1.2.600.2.275
*** desire.tk	4 Aug 2007 02:32:12 -0000	1.1.2.600.2.274
--- desire.tk	4 Aug 2007 03:02:07 -0000	1.1.2.600.2.275
***************
*** 1625,1635 ****
      set @iohilite {-1 0 0 0 0}
      set @keyprefix 0
!     # default #X coords line
!     set @coordsx1 0
!     set @coordsy1 0
!     set @coordsx2 1
!     set @coordsy2 1
!     set @pixwidth 0
!     set @pixheight 0
      set @xmargin 0
      set @ymargin 0
--- 1625,1630 ----
      set @iohilite {-1 0 0 0 0}
      set @keyprefix 0
!     set @coords {0 0 1 1} ;# default #X coords line
!     set @pixsize {0 0}
      set @xmargin 0
      set @ymargin 0
***************
*** 1640,1644 ****
    switch -- [lindex $mess 0] {
      "#N" {
! 	# those four are not to be confused with other @variables of the same name.
  	set @canvasx1 [lindex $mess 2]
  	set @canvasy1 [lindex $mess 3]
--- 1635,1639 ----
    switch -- [lindex $mess 0] {
      "#N" {
! 	# those four are not to be confused with other @variables of similar names.
  	set @canvasx1 [lindex $mess 2]
  	set @canvasy1 [lindex $mess 3]
***************
*** 1676,1680 ****
  	}
  	coords {
! 	  mset [list @coordsx1 @coordsy1 @coordsx2 @coordsy2 @pixwidth @pixheight] [lrange $mess 2 7]
  	  switch [llength $mess] {
  	    8  {set @gop 0}
--- 1671,1676 ----
  	}
  	coords {
! 	  set @coords  [lrange $mess 2 5]
! 	  set @pixsize [lrange $mess 6 7]
  	  switch [llength $mess] {
  	    8  {set @gop 0}
***************
*** 1699,1703 ****
  # doesn't this look like Canvas deconstruct ?
  def Canvas get_mess {} {
! 	return [list $@coordsx1 $@coordsy1 $@coordsx2 $@coordsy2 $@pixwidth $@pixheight $@xmargin $@ymargin]
  }
  
--- 1695,1699 ----
  # doesn't this look like Canvas deconstruct ?
  def Canvas get_mess {} {
! 	return [concat $@coords $@pixsize [list $@xmargin $@ymargin]]
  }
  
***************
*** 1717,1721 ****
  
  def Canvas gop_rect {} {
! 	set rect [list $@xmargin $@ymargin [expr $@xmargin+$@pixwidth] [expr $@ymargin+$@pixheight]]
  	if {$@goprect == ""} {
  		set @goprect [GopRect new $self $rect]
--- 1713,1718 ----
  
  def Canvas gop_rect {} {
! 	mset {pxs pys} $@pixsize
! 	set rect [list $@xmargin $@ymargin [expr $@xmargin+$pxs] [expr $@ymargin+$pys]]
  	if {$@goprect == ""} {
  		set @goprect [GopRect new $self $rect]
***************
*** 2408,2412 ****
  		return
  	}
! 	if {[info exists @gop]} {if {$@gop} {set @xs $@pixwidth; set @ys $@pixheight; return}}
  	set l {};set nl 1
  	foreach char [split $@text ""] {lappend l [scan $char %c]}
--- 2405,2409 ----
  		return
  	}
! 	if {[info exists @gop]} {if {$@gop} {mset [list @xs @ys] $@pixsize; return}}
  	set l {};set nl 1
  	foreach char [split $@text ""] {lappend l [scan $char %c]}