pd/src u_main.tk,1.1.1.4.2.7.4.66,1.1.1.4.2.7.4.67 - Pd-cvs

10 May 2004


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27192
Modified Files:
      Tag: impd_0_37
    u_main.tk 
Log Message:
bugfix
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.1.1.4.2.7.4.66
retrieving revision 1.1.1.4.2.7.4.67
diff -C2 -d -r1.1.1.4.2.7.4.66 -r1.1.1.4.2.7.4.67
*** u_main.tk	9 May 2004 15:13:43 -0000	1.1.1.4.2.7.4.66
--- u_main.tk	10 May 2004 16:02:21 -0000	1.1.1.4.2.7.4.67
***************
*** 577,581 ****
    foreach {a b} {pos 12 what 32 mode 4 action 4 sel 4} {
    	label $f.$a -width $b -font {courier 9} \
! 		-background #cccccc -foreground black
    }
    label $f.mode_l   -text " Mode: "
--- 577,581 ----
    foreach {a b} {pos 12 what 32 mode 4 action 4 sel 4} {
    	label $f.$a -width $b -font {courier 9} \
! 		-background #cccccc -foreground black -anchor w
    }
    label $f.mode_l   -text " Mode: "
***************
*** 805,809 ****
      focus $name.c
      pdtk_canvas_editval $name $editable
!     bind $name.c <Motion> "+statusbar_update $name %x %y"
global pd_nt
--- 805,809 ----
      focus $name.c
      pdtk_canvas_editval $name $editable
!     #bind $name.c <Motion> "+statusbar_update $name %x %y"
global pd_nt
***************
*** 879,883 ****
  proc pdtk_canvas_click {canvas x y b f} {
      pdtk_canvas_click2 $canvas $x $y $b $f
!     statusbar_update [string trimright $canvas .c] $x $y
  }
--- 879,883 ----
  proc pdtk_canvas_click {canvas x y b f} {
      pdtk_canvas_click2 $canvas $x $y $b $f
!     statusbar_update [canvastosym $canvas] $x $y
  }
***************
*** 919,923 ****
        # selection
        set already [expr [lsearch $_($self:selection) $id]>=0]
- 	    puts "f = $f"
        if {($f&1) && !$already} {
            pd "$self select-object x$id ;"
--- 919,922 ----
***************
*** 955,959 ****
  proc pdtk_canvas_motion {canvas x y mods state} {
      pdtk_canvas_motion2 $canvas $x $y $mods $state
!     statusbar_update [string trimright $canvas .c] $x $y
  }
--- 954,958 ----
  proc pdtk_canvas_motion {canvas x y mods state} {
      pdtk_canvas_motion2 $canvas $x $y $mods $state
!     statusbar_update [canvastosym $canvas] $x $y
  }
***************
*** 1053,1057 ****
        wire {}
      }
!     pd "[canvastosym $canvas] motion $cx $cy $mods ;"
  }
--- 1052,1056 ----
        wire {}
      }
!     # pd "[canvastosym $canvas] motion $cx $cy $mods ;"
  }
***************
*** 1068,1072 ****
  proc pdtk_canvas_mouseup {canvas x y b} {
      pdtk_canvas_mouseup2 $canvas $x $y $b
!     statusbar_update [string trimright $canvas .c] $x $y
  }
--- 1067,1071 ----
  proc pdtk_canvas_mouseup {canvas x y b} {
      pdtk_canvas_mouseup2 $canvas $x $y $b
!     statusbar_update [canvastosym $canvas] $x $y
  }
***************
*** 1173,1177 ****
    }
      }
!     statusbar_update [string trimright $canvas .c] $x $y
  }
--- 1172,1176 ----
    }
      }
!     statusbar_update [canvastosym $canvas] $x $y
  }
***************
*** 1191,1200 ****
    }
      }
!     statusbar_update [string trimright $canvas .c] $x $y
  }
proc pdtk_canvas_altkey {name key iso} {
      set key [string tolower $key]
!     set topname [string trimright $name .c]
      puts pdtk_canvas_altkey
      global accels
--- 1190,1199 ----
    }
      }
!     statusbar_update [canvastosym $canvas] $x $y
  }
proc pdtk_canvas_altkey {name key iso} {
      set key [string tolower $key]
!     set topname [canvastosym $name]
      puts pdtk_canvas_altkey
      global accels
***************
*** 1210,1214 ****
  # first get rid of ".c" suffix; we'll refer to the toplevel instead
      set key [string tolower $key]
!     set topname [string trimright $name .c]
      switch -- $key {
        q {if {$shift} {menu_really_quit} else {menu_quit}; return}
--- 1209,1213 ----
  # first get rid of ".c" suffix; we'll refer to the toplevel instead
      set key [string tolower $key]
!     set topname [canvastosym $name]
      switch -- $key {
        q {if {$shift} {menu_really_quit} else {menu_quit}; return}
***************
*** 1713,1717 ****
      if {[lsearch $fi    snd]>=0} {lappend props snd    "send-symbol: " entry {-width 20}}
      if {[lsearch $fi    rcv]>=0} {lappend props rcv "receive-symbol: " entry {-width 20}}
!     lappend props lab "label: "          entry {-width 29}
      lappend props ldx "label x offset: " entry {-width  5}
      lappend props ldy "label y offset: " entry {-width  5}
--- 1712,1716 ----
      if {[lsearch $fi    snd]>=0} {lappend props snd    "send-symbol: " entry {-width 20}}
      if {[lsearch $fi    rcv]>=0} {lappend props rcv "receive-symbol: " entry {-width 20}}
!     lappend props lab "label: "          entry {-width 20}
      lappend props ldx "label x offset: " entry {-width  5}
      lappend props ldy "label y offset: " entry {-width  5}
***************
*** 1972,1976 ****
proc texteditor_send {name} {
!     set topname [string trimright $name .text]
      for {set i 0} {[$name compare [concat 0.0 + [expr $i+1] chars] < end]} {incr i 1} {
      	scan [$name get [concat 0.0 + $i chars]] %c keynum
--- 1971,1975 ----
proc texteditor_send {name} {
!     regsub {.text$} $name name
      for {set i 0} {[$name compare [concat 0.0 + [expr $i+1] chars] < end]} {incr i 1} {
      	scan [$name get [concat 0.0 + $i chars]] %c keynum
***************
*** 1980,1984 ****
proc texteditor_ok {name} {
!     set topname [string trimright $name .text]
      texteditor_send $name
      destroy $topname
--- 1979,1983 ----
proc texteditor_ok {name} {
!     regsub {.text$} $name topname
      texteditor_send $name
      destroy $topname
***************
*** 2418,2422 ****
    listener_append .tcl [.tcl.entry get]
    .tcl.entry delete 0 end
! 	post "tcl: $l\nreturns: [eval $l]"
  }
--- 2417,2421 ----
    listener_append .tcl [.tcl.entry get]
    .tcl.entry delete 0 end
! 	post %s "tcl: $l\nreturns: [eval $l]"
  }