[PD-cvs] pd/src u_main.tk,1.1.1.4.2.7.4.55,1.1.1.4.2.7.4.56

[Mathieu Bouchard]

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

Modified Files:
      Tag: impd_0_37
	u_main.tk 
Log Message:
ditto


Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.1.1.4.2.7.4.55
retrieving revision 1.1.1.4.2.7.4.56
diff -C2 -d -r1.1.1.4.2.7.4.55 -r1.1.1.4.2.7.4.56
*** u_main.tk	3 May 2004 02:51:45 -0000	1.1.1.4.2.7.4.55
--- u_main.tk	3 May 2004 04:34:52 -0000	1.1.1.4.2.7.4.56
***************
*** 1271,1275 ****
  		label $f.label -text $label
  		# wtf, %6.6x sometimes gives me _8_ chars !?!
! 		set c [expr $_($self:$name) & 0xFCFCFC]
  		button $f.color -text "      " -width 10 \
  			-command [list iemgui_choose_col $w $name $label] \
--- 1271,1277 ----
  		label $f.label -text $label
  		# wtf, %6.6x sometimes gives me _8_ chars !?!
! 		set c $_($self:$name)
! 		switch -regexp -- $c { ^# { set c 0x[string trimleft $c #] } }
! 		set c [expr $c & 0xFCFCFC]
  		button $f.color -text "      " -width 10 \
  			-command [list iemgui_choose_col $w $name $label] \
***************
*** 1559,1563 ****
      global _
      set self [string trimleft $id .]
!     if {$_($self:lin0_log1) == 1} {
          if {$_($self:max_rng) == 0.0 && $_($self:min_rng) == 0.0} {
  	    set _($self:max_rng) 1.0
--- 1561,1565 ----
      global _
      set self [string trimleft $id .]
!     if {$_($self:is_log) == 1} {
          if {$_($self:max_rng) == 0.0 && $_($self:min_rng) == 0.0} {
  	    set _($self:max_rng) 1.0
***************
*** 1597,1601 ****
          $_($self:w) $_($self:h) \
          $_($self:min_rng) $_($self:max_rng) \
! 	$_($self:lin0_log1) $_($self:loadbang) \
          $_($self:num) $snd $rcv $lab \
          $_($self:ldx) $_($self:ldy) \
--- 1599,1603 ----
          $_($self:w) $_($self:h) \
          $_($self:min_rng) $_($self:max_rng) \
! 	$_($self:is_log) $_($self:loadbang) \
          $_($self:num) $snd $rcv $lab \
          $_($self:ldx) $_($self:ldy) \
***************
*** 1613,1620 ****
  dim_header w min_w w_label h min_h h_label \
  rng_header min_rng min_rng_label max_rng max_rng_label rng_sched \
! lin0_log1 lilo0_label lilo1_label loadbang steady num_label num \
! snd rcv lab ldx ldy fstyle fs bcol fcol lcol} {
! 
! # snd rcv lab ldx ldy fstyle fs bcol fcol lcol
      global _
      set self [string trimleft $id .]
--- 1615,1619 ----
  dim_header w min_w w_label h min_h h_label \
  rng_header min_rng min_rng_label max_rng max_rng_label rng_sched \
! lilo0_label lilo1_label num_label num obj} {
      global _
      set self [string trimleft $id .]
***************
*** 1624,1647 ****
      set _($self:max_rng) $max_rng
      set _($self:rng_sch) $rng_sched
-     set _($self:lin0_log1) $lin0_log1
      set _($self:lilo0) $lilo0_label
      set _($self:lilo1) $lilo1_label
-     set _($self:loadbang) $loadbang
      set _($self:num) $num
-     set _($self:steady) $steady
-     switch -- $snd { empty {set snd ""}}
-     switch -- $rcv { empty {set rcv ""}}
-     switch -- $lab { empty {set lab ""}}
-     set _($self:snd) $snd
-     set _($self:rcv) $rcv
-     set _($self:lab) $lab
-     set _($self:ldx) $ldx
-     set _($self:ldy) $ldy
-     set _($self:fstyle) $fstyle
-     set _($self:fs) $fs
-     set _($self:bcol) $bcol
-     set _($self:fcol) $fcol
-     set _($self:lcol) $lcol
  
      puts "pdtk_iemgui_dialog $id ..."
      toplevel $id
--- 1623,1643 ----
      set _($self:max_rng) $max_rng
      set _($self:rng_sch) $rng_sched
      set _($self:lilo0) $lilo0_label
      set _($self:lilo1) $lilo1_label
      set _($self:num) $num
  
+     foreach var {snd rcv lab} {
+         set val nosndno
+ 	catch {set val $_($obj:$var); switch -- $val { empty {set val ""}}}
+        set _($self:$var) $val
+     }
+     foreach var {ldx ldy fstyle fs} {
+ 	set _($self:$var) $_($obj:$var)
+     }
+     foreach var {bcol fcol lcol is_log steady} {
+ 	set _($self:$var) -1
+ 	catch {set _($self:$var) [parse_color $_($obj:$var)]}
+     }
+     set _($self:loadbang) [expr $_($obj:isa) & 1]
      puts "pdtk_iemgui_dialog $id ..."
      toplevel $id
***************
*** 1666,1671 ****
      }
      
!     if {$_($self:lin0_log1) >= 0} {
! 	lappend props lin0_log1 [list "Mode: " $lilo0_label $lilo1_label] choice {}
      }
      if {$_($self:loadbang) >= 0} {lappend props loadbang "init" toggle {}}
--- 1662,1667 ----
      }
      
!     if {$_($self:is_log) >= 0} {
! 	lappend props is_log [list "Mode: " $lilo0_label $lilo1_label] choice {}
      }
      if {$_($self:loadbang) >= 0} {lappend props loadbang "init" toggle {}}
***************
*** 1676,1681 ****
      properties_dialog $self .$self iemgui_ok $props
      set props {}
!     if {$snd != "nosndno"} {lappend props snd    "send-symbol: " entry {-width 20}}
!     if {$rcv != "norcvno"} {lappend props rcv "receive-symbol: " entry {-width 20}}
      lappend props lab "label: "          entry {-width 29}
      lappend props ldx "label x offset: " entry {-width  5}
--- 1672,1677 ----
      properties_dialog $self .$self iemgui_ok $props
      set props {}
!     if {$_($self:snd) != "nosndno"} {lappend props snd    "send-symbol: " entry {-width 20}}
!     if {$_($self:rcv) != "norcvno"} {lappend props rcv "receive-symbol: " entry {-width 20}}
      lappend props lab "label: "          entry {-width 29}
      lappend props ldx "label x offset: " entry {-width  5}
***************
*** 1765,1768 ****
--- 1761,1774 ----
  proc canvas_ok {id} {canvas_apply $id; canvas_cancel $id}
  
+ proc canvas_grab {canvas obj} {
+ 	set self [string trimleft $id .]
+ 	set $_($self:grab) $obj
+ }
+ 
+ proc canvas_ungrab {canvas} {
+ 	set self [string trimleft $id .]
+ 	set $_($self:grab) ""
+ }
+ 
  proc pdtk_canvas_dialog {id xscale yscale graphme stretch} {
      global _