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

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
Canvas: @xmargin, at ymargin -> @margin; @canvasx1, at canvasy1 -> @canvas_pos; @canvasxs, at canvasys -> @canvas_size


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.275
retrieving revision 1.1.2.600.2.276
diff -C2 -d -r1.1.2.600.2.275 -r1.1.2.600.2.276
*** desire.tk	4 Aug 2007 03:02:07 -0000	1.1.2.600.2.275
--- desire.tk	4 Aug 2007 03:23:28 -0000	1.1.2.600.2.276
***************
*** 1627,1632 ****
      set @coords {0 0 1 1} ;# default #X coords line
      set @pixsize {0 0}
!     set @xmargin 0
!     set @ymargin 0
      #set @grid 1
  }
--- 1627,1631 ----
      set @coords {0 0 1 1} ;# default #X coords line
      set @pixsize {0 0}
!     set @margin {0 0}
      #set @grid 1
  }
***************
*** 1636,1643 ****
      "#N" {
  	# those four are not to be confused with other @variables of similar names.
! 	set @canvasx1 [lindex $mess 2]
! 	set @canvasy1 [lindex $mess 3]
! 	set @canvasxs [lindex $mess 4]
! 	set @canvasys [lindex $mess 5]
  	set args [lrange $mess 6 end]
  	switch [llength $args] {
--- 1635,1640 ----
      "#N" {
  	# those four are not to be confused with other @variables of similar names.
! 	set @canvas_pos [lrange $mess 2 3]
! 	set @canvas_size [lrange $mess 4 5]
  	set args [lrange $mess 6 end]
  	switch [llength $args] {
***************
*** 1678,1683 ****
  	    11 {
  		set @gop [lindex $mess 8]
! 		set @xmargin [lindex $mess 9]
! 		set @ymargin [lindex $mess 10]
  	    }
  	    default {error "what???"}
--- 1675,1679 ----
  	    11 {
  		set @gop [lindex $mess 8]
! 		set @margin [lrange $mess 9 10]
  	    }
  	    default {error "what???"}
***************
*** 1695,1706 ****
  # doesn't this look like Canvas deconstruct ?
  def Canvas get_mess {} {
! 	return [concat $@coords $@pixsize [list $@xmargin $@ymargin]]
  }
  
  
! def Canvas margin {} {
! 	return [list $@xmargin $@ymargin]
! }
! 
  def Canvas gop {} {return $@gop}
  def Canvas hidtext {} {return $@hidetext}
--- 1691,1699 ----
  # doesn't this look like Canvas deconstruct ?
  def Canvas get_mess {} {
! 	return [concat $@coords $@pixsize $@margin]
  }
  
  
! def Canvas margin {} {return $@margin}
  def Canvas gop {} {return $@gop}
  def Canvas hidtext {} {return $@hidetext}
***************
*** 1708,1718 ****
  #def Canvas abs {} {if {!$@subpatch} {return 1} else {return 0}}
  def Canvas subpatch {} {return $@subpatch}
! def Canvas get_dimen {} {
! 	return [list $@canvasxs $@canvasys]
! }
  
  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]
--- 1701,1710 ----
  #def Canvas abs {} {if {!$@subpatch} {return 1} else {return 0}}
  def Canvas subpatch {} {return $@subpatch}
! def Canvas get_dimen {} {return $@canvas_size}
  
  def Canvas gop_rect {} {
  	mset {pxs pys} $@pixsize
! 	mset {mx my} $@margin
! 	set rect [list $mx $my [expr $mx+$pxs] [expr $my+$pys]]
  	if {$@goprect == ""} {
  		set @goprect [GopRect new $self $rect]
***************
*** 1748,1752 ****
      $self init_scrollbars
      wm minsize $win 1 1
!     wm geometry $win +$@canvasx1+$@canvasy1
      wm protocol $win WM_DELETE_WINDOW "$self close"
      focus $c
--- 1740,1744 ----
      $self init_scrollbars
      wm minsize $win 1 1
!     wm geometry $win +[lindex $@canvas_pos 0]+[lindex $@canvas_pos 1]
      wm protocol $win WM_DELETE_WINDOW "$self close"
      focus $c
***************
*** 5479,5488 ****
  	set @properties [list "gop" "xfrom" "xto" "yfrom" "yto" "width" "height" "xmargin" "ymargin"]
  	set mess [$of get_mess]
! 	set @xfrom [lindex $mess 0]
! 	set @xto [lindex $mess 2]
! 	set @yfrom [lindex $mess 1]
! 	set @yto [lindex $mess 3]
! 	set @width [lindex $mess 4]
! 	set @height [lindex $mess 5]
  	set @xmargin [lindex $mess 6]
  	set @ymargin [lindex $mess 7]
--- 5471,5480 ----
  	set @properties [list "gop" "xfrom" "xto" "yfrom" "yto" "width" "height" "xmargin" "ymargin"]
  	set mess [$of get_mess]
! 	set @xfrom   [lindex $mess 0]
! 	set @xto     [lindex $mess 2]
! 	set @yfrom   [lindex $mess 1]
! 	set @yto     [lindex $mess 3]
! 	set @width   [lindex $mess 4]
! 	set @height  [lindex $mess 5]
  	set @xmargin [lindex $mess 6]
  	set @ymargin [lindex $mess 7]
***************
*** 8345,8350 ****
  }
  def Canvas deconstruct_to {stream args} {
! 	set r {}
! 	lappend r #N canvas $@canvasx1 $@canvasy1 $@canvasxs $@canvasys
  	if {$@subpatch || $@abs} {lappend r $@name $@mapped} else {lappend r $@fontsize}
  	$stream << "[philtre $r];\n"
--- 8337,8341 ----
  }
  def Canvas deconstruct_to {stream args} {
! 	set r [concat [list #N canvas] $canvas_pos $canvas_size]
  	if {$@subpatch || $@abs} {lappend r $@name $@mapped} else {lappend r $@fontsize}
  	$stream << "[philtre $r];\n"