Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5384
Modified Files: Tag: devel_0_39 pd_base.tk desire.tk Log Message: canvas merge (File->New 2)
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.40 retrieving revision 1.1.2.41 diff -C2 -d -r1.1.2.40 -r1.1.2.41 *** desire.tk 10 Sep 2005 20:30:40 -0000 1.1.2.40 --- desire.tk 11 Sep 2005 11:31:49 -0000 1.1.2.41 *************** *** 38,41 **** --- 38,44 ---- }
+ # carmen's canvas + source pd_base.tk + #some questions to matju --chun # *************** *** 671,675 ****
populate_menu .mbar.file {} { ! {"New" {menu_new} "Ctrl+n"} {"Open" {menu_open} "Ctrl+o"} {} --- 674,679 ----
populate_menu .mbar.file {} { ! {"New" {menu_new} "Ctrl+n"} ! {"New 2" {toplevel .c -width 512 -height 512; ::pd::new .c.c c {}} ""} {"Open" {menu_open} "Ctrl+o"} {} *************** *** 3614,3616 **** } } - --- 3618,3619 ----
Index: pd_base.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_base.tk,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** pd_base.tk 6 Sep 2005 22:58:52 -0000 1.1.2.2 --- pd_base.tk 11 Sep 2005 11:31:49 -0000 1.1.2.3 *************** *** 1,14 **** # Pure-Deleuzian ! # 2005 cdr ! # This software has no license (write one if you feel like it) ! ! # see also: desire.tk. this is an experimental PD GUI focusing on customizable 2d-object visualizations and editing # docs: http://whats-your.name/pd
! foreach _ {snack tkdnd tkpath} { ! if {[catch {package require $_}]} {set has_$_ 0} {set has_$_ 1} }
namespace eval ::pd { source pd_objects.tk --- 1,23 ---- # Pure-Deleuzian ! # 2005 cdr (license of your choice) ! # an experimental canvas focusing on customizable 2d-object visualizations and editing # docs: http://whats-your.name/pd
+ set todo { + io + cables + scale selection + gridlines -> objects + group attr + markers/snap/quant + regions / rects (combine?) + }
! foreach pkg {snack tkdnd tkpath} { ! if {[catch {package require $pkg}]} {set has_$pkg 0} {set has_$pkg 1} }
+ source pre8.5.tcl + namespace eval ::pd { source pd_objects.tk *************** *** 407,411 ****
$m add command -label reload -command {source pd_base.tk} ! $m add command -label "console" -command {tkcon show} $m add command -label "inspector" -command "::pd::inspector $p $t" $m add command -label "msg" -command "::pd::msg" --- 416,420 ----
$m add command -label reload -command {source pd_base.tk} ! $m add command -label "console" -command {source /usr/local/bin/tkcon.tcl; tkcon show} $m add command -label "inspector" -command "::pd::inspector $p $t" $m add command -label "msg" -command "::pd::msg" *************** *** 649,660 **** }}}
! . configure -width 512 -height 512 ! new .c c {} ! ! variable pd_send ! if {[catch {set pd_send [socket localhost 4400]}]} {set pd_send -1} {puts "connected $pd_send"} ! catch { ! set pd_receive [socket -server ::pd::receive_conn 4401] ! } proc receive_conn {s addr port} { fileevent $s readable [list ::pd::receive $s] --- 658,666 ---- }}}
! # variable pd_send ! # if {[catch {set pd_send [socket localhost 4400]}]} {set pd_send -1} {puts "connected $pd_send"} ! # catch { ! # set pd_receive [socket -server ::pd::receive_conn 4401] ! # } proc receive_conn {s addr port} { fileevent $s readable [list ::pd::receive $s] *************** *** 671,687 **** } proc send {msg} { ! variable pd_send ! if {$pd_send ne -1} { ! # puts "sending: $msg" ! puts $pd_send [concat $msg ;] ! flush $pd_send ! } }
} - - catch { - source /usr/local/bin/tkcon.tcl - tk_setPalette white - } --- 677,687 ---- } proc send {msg} { ! # variable pd_send ! # if {$pd_send ne -1} { ! # puts $pd_send [concat $msg ;] ! # flush $pd_send ! # } }
}