pd/src desire.tk,1.1.2.600.2.296,1.1.2.600.2.297 - Pd-cvs

7 Aug 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1409
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
cleanup
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.296
retrieving revision 1.1.2.600.2.297
diff -C2 -d -r1.1.2.600.2.296 -r1.1.2.600.2.297
*** desire.tk	6 Aug 2007 21:57:20 -0000	1.1.2.600.2.296
--- desire.tk	6 Aug 2007 22:42:48 -0000	1.1.2.600.2.297
***************
*** 2593,2600 ****
    $@canvas selection-= [list $self]
    switch [$@canvas action] {
! 		insert {set goto [list $@canvas new_object_insert_wire]}
! 		chain_obj {set goto [list $@canvas new_object_chain_wire]}
    	subpatcherize {set goto [list $@canvas new_object_subpatcherize_redraw]}
! 		default {set goto [list $@canvas new_object_callback]}
    }
    netsend [list .$@canvas text_setto $self $l] $goto
--- 2593,2600 ----
    $@canvas selection-= [list $self]
    switch [$@canvas action] {
! 		insert        {set goto [list $@canvas new_object_insert_wire]}
! 		chain_obj     {set goto [list $@canvas new_object_chain_wire]}
    	subpatcherize {set goto [list $@canvas new_object_subpatcherize_redraw]}
! 		default       {set goto [list $@canvas new_object_callback]}
    }
    netsend [list .$@canvas text_setto $self $l] $goto
***************
*** 3551,3565 ****
    			set count [llength $@children]
    			set mess2 [list #X connect [expr $from+$count] $outlet [expr $to+$count] $inlet]
! 				if {$in} {set goto ""} else {
! 					netsend $mess2 [list $self new_wire_select]
! 				}
    		}
    		restore {incr in -1; netsend [$self paste_coords $mess $offset]}
! 			default {
! 				if {$in} {set goto ""} else {
! 					netsend [$self paste_coords $mess $offset] \
! 					    [list $self new_object_copyselect]
! 				}
! 			}
    	}
    }
--- 3551,3558 ----
    			set count [llength $@children]
    			set mess2 [list #X connect [expr $from+$count] $outlet [expr $to+$count] $inlet]
! 				if {!$in} {netsend $mess2 [list $self new_wire_select]}
    		}
    		restore {incr in -1; netsend [$self paste_coords $mess $offset]}
! 			default {if {!$in} {netsend [$self paste_coords $mess $offset] [list $self new_object_copyselect]}}
    	}
    }
***************
*** 5253,5257 ****
  # split at atom boundaries.
  proc pd_atom_split {e} {
! 
  }
--- 5246,5250 ----
  # split at atom boundaries.
  proc pd_atom_split {e} {
! 	# huh...
  }
***************
*** 5496,5502 ****
    foreach entry $entries {
    	if {!$@gop} {
! 		.$self.$entry.entry configure -state disable
    	} else {
! 		.$self.$entry.entry configure -state normal
    	}
    }
--- 5489,5495 ----
    foreach entry $entries {
    	if {!$@gop} {
! 			.$self.$entry.entry configure -state disable
    	} else {
! 			.$self.$entry.entry configure -state normal
    	}
    }
***************
*** 5504,5528 ****
def CanvasPropertiesDialog apply {} {
- 	#pd .$@of donecanvasdialog $@xscale $@yscale $@graphme
    if {![$@canvas editmode]} {$@canvas editmode= 1}
    netsend [list .$@of coords $@xfrom $@yfrom $@xto $@yto $@width $@height $@gop $@xmargin $@ymargin]
- 	#donecanvasdialogy sends back weird scientific notation values....
  }
proc gatom_escape {sym} {
    if {[string length $sym] == 0} {return "-"}
! 	if {[string equal -length 1 $sym "-"]} {
! 		return [string replace $sym 0 0 "--"]
! 	} else {
! 		return $sym
! 	}
  }
proc gatom_unescape {sym} {
! 	if {[string equal -length 1 $sym "-"]} {
! 		return [string replace $sym 0 0 ""]
! 	} else {
! 		return $sym
! 	}
  }
--- 5497,5513 ----
def CanvasPropertiesDialog apply {} {
    if {![$@canvas editmode]} {$@canvas editmode= 1}
    netsend [list .$@of coords $@xfrom $@yfrom $@xto $@yto $@width $@height $@gop $@xmargin $@ymargin]
  }
proc gatom_escape {sym} {
    if {[string length $sym] == 0} {return "-"}
! 	if {[string equal -length 1 $sym "-"]} {return [string replace $sym 0 0 "--"]}
! 	return $sym
  }
proc gatom_unescape {sym} {
! 	if {[string equal -length 1 $sym "-"]} {return [string replace $sym 0 0 ""]}
! 	return $sym
  }