Pd-cvs January 2009

pd-cvs@lists.iem.at

23 participants
357 discussions

SF.net SVN: pure-data:[10548] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 10548 http://pure-data.svn.sourceforge.net/pure-data/?rev=10548&view=rev Author: eighthave Date: 2009-01-14 02:46:47 +0000 (Wed, 14 Jan 2009) Log Message: ----------- - cleaned up global pd_opendir, pd_savedir, and pd_saveasdir - set "fontlist" box/font sizes to fit with "tk scaling 1" Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-14 01:20:48 UTC (rev 10547) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-14 02:46:47 UTC (rev 10548) @@ -25,6 +25,10 @@ # for testing which platform we are running on ("aqua", "win32", or "x11") set windowingsystem "" +set pd_opendir [pwd] +set pd_savedir [pwd] +set pd_saveasdir [pwd] + #------------------------------------------------------------------------------# # packages for this project @@ -64,6 +68,12 @@ # $menuitem = 'menu' item # $mycanvas = 'canvas' # $canvasitem = 'canvas' item +# +# +## Prefix Names for Procs +#---------------------------- +# pdtk called from 'pd' +# canvas manipulates a canvas # ------------------------------------------------------------------------------ # quoting functions @@ -121,7 +131,7 @@ pdtk_post "version: $version" pdtk_post "args: $args" set oldtclversion 0 - set fontlist "8 5 8 9 6 10 10 7 11 12 7 12 14 8 14 16 10 16 18 11 18 24 14 24 30 18 30 36 22 36" + set fontlist "8 5 10 9 6 11 10 6 13 12 7 15 14 8 17 16 10 20 18 11 22 24 14 30 30 18 37 36 22 45" pdsend "pd init [pdtk_enquote [pwd]] $oldtclversion $fontlist ;" # TODO what else is needed from the original? } Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-14 01:20:48 UTC (rev 10547) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-14 02:46:47 UTC (rev 10548) @@ -40,10 +40,9 @@ } proc ::pd_menucommands::menu_open {} { - global pd_opendir filetypes set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes $filetypes \ - -initialdir $pd_opendir] + -filetypes $::filetypes \ + -initialdir $::pd_opendir] if {$filename ne ""} { open_file $filename } Modified: branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl =================================================================== --- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-14 01:20:48 UTC (rev 10547) +++ branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-14 02:46:47 UTC (rev 10548) @@ -21,11 +21,9 @@ } -set pd_opendir [pwd] proc open_file {filename} { - global pd_opendir set directory [string range $filename 0 [expr [string last / $filename] - 1]] - set pd_opendir $directory + set ::pd_opendir $directory set basename [string range $filename [expr [string last / $filename] + 1] end] if {[string last .pd $filename] >= 0} { pdsend "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10547] branches/pd-devel/0.41.4/src/pd_connect.tcl
by eighthave＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 10547 http://pure-data.svn.sourceforge.net/pure-data/?rev=10547&view=rev Author: eighthave Date: 2009-01-14 01:20:48 +0000 (Wed, 14 Jan 2009) Log Message: ----------- switched socket channel to non-blocking, and changed reading the socket channel from 'gets' to 'read' Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd_connect.tcl Modified: branches/pd-devel/0.41.4/src/pd_connect.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-14 00:28:54 UTC (rev 10546) +++ branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-14 01:20:48 UTC (rev 10547) @@ -10,7 +10,7 @@ } proc ::pd_connect::configure_socket {sock} { - fconfigure $sock -blocking 1 -buffering line + fconfigure $sock -blocking 0 -buffering line fileevent $sock readable {::pd_connect::pd_readsocket ""} } @@ -49,7 +49,6 @@ # send a pd/FUDI message from Tcl to Pd. This function aims to behave like a # [send] in Pd, except the first argument is the name to send to. proc ::pd_connect::pdsend {message} { # 'args' is special, it gets everything - puts "pdsend $message" variable pd_socket if {[catch {puts $pd_socket $message} errorname]} { puts stderr "pdsend errorname: >>$errorname<<" @@ -61,7 +60,7 @@ # TODO this currently drops leading whitespace, like tabs proc ::pd_connect::pd_readsocket {cmd_from_pd} { variable pd_socket - append cmd_from_pd [gets $pd_socket] + append cmd_from_pd [read $pd_socket] puts stderr "cmd_from_pd: $cmd_from_pd" if {[catch {uplevel #0 $cmd_from_pd} errorname]} { global errorInfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10546] branches/pd-devel/0.41.4/src/pd.tk
by eighthave＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 10546 http://pure-data.svn.sourceforge.net/pure-data/?rev=10546&view=rev Author: eighthave Date: 2009-01-14 00:28:54 +0000 (Wed, 14 Jan 2009) Log Message: ----------- oops, forgot to use the pdwindow proc for the toplevel . bindings Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 23:45:57 UTC (rev 10545) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-14 00:28:54 UTC (rev 10546) @@ -173,7 +173,7 @@ ::pd_menus::create_menubar .menubar . configure -menu .menubar -width 400 -height 250 ::pd_menus::configure_pdwindow .menubar - ::pd_bindings::window_bindings . + ::pd_bindings::pdwindow_bindings . # TODO move this to its own proc for clarity wm title . "Pd-devel" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10545] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 10545 http://pure-data.svn.sourceforge.net/pure-data/?rev=10545&view=rev Author: eighthave Date: 2009-01-13 23:45:57 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - it turns out that "." needs to be in the auto-path after all - updated comments to make sense and be current Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_connect.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 23:17:19 UTC (rev 10544) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 23:45:57 UTC (rev 10545) @@ -13,7 +13,6 @@ package require Tcl 8.3 package require Tk - ## replace Tk widgets with Tile/Ttk widgets (Tile/Ttk is included in Tcl/Tk 8.5) #package require tile #namespace import -force ttk::* @@ -21,15 +20,16 @@ #------------------------------------------------------------------------------# # global variables - # file types for Open/Save panels set filetypes "" - # for testing which platform we are running on ("aqua", "win32", or "x11") set windowingsystem "" #------------------------------------------------------------------------------# # packages for this project + +# packages are stored in the same directory as the main script and executable +set auto_path [linsert $auto_path 0 "."] package require pd_connect package require pd_menus package require pd_bindings @@ -47,14 +47,13 @@ #------------------------------------------------------------------------------# # coding style # - -# +# these are preliminary ideas, we'll change them as we work things out: # - when possible use "" doublequotes to delimit messages -# - instead of 'global myvar' use '$::myvar' +# - use '$::myvar' instead of 'global myvar' # - for the sake of clarity, there should not be any inline code, everything -# should be in a procedure that is ultimately triggered from main() +# should be in a proc that is ultimately triggered from main() +# - if a menu_* proc creates a panel, that proc is called menu_*_panel # -# ## Names for Common Variables #---------------------------- # @@ -128,7 +127,7 @@ } # ------------------------------------------------------------------------------ -# canvas support functions +# support functions ##### routine to ask user if OK and, if so, send a message on to Pd ###### proc pdtk_check {message reply_to_pd default} { Modified: branches/pd-devel/0.41.4/src/pd_connect.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-13 23:17:19 UTC (rev 10544) +++ branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-13 23:45:57 UTC (rev 10545) @@ -14,7 +14,7 @@ fileevent $sock readable {::pd_connect::pd_readsocket ""} } -# if pd opens first, it starts pd-gui, then pd-gui connects to port 5400 +# if pd opens first, it starts pd-gui, then pd-gui connects to the port pd sent proc ::pd_connect::to_pd {port} { puts "::pd_connect::to_pd" variable pd_socket @@ -27,8 +27,8 @@ ::pd_connect::configure_socket $pd_socket } -# if pd-gui opens first, it creates socket, and pd connects to port 5600. If -# it can't create, then it keeps adding 1 to the port and tries again +# if pd-gui opens first, it creates socket and requests a port. The function +# then returns the portnumber it receives. pd then connects to that port. proc ::pd_connect::create_socket {} { puts "::pd_connect::create_socket" if {[catch {set sock [socket -server ::pd_connect::from_pd -myaddr localhost 0]}]} { @@ -58,7 +58,7 @@ } # TODO exit if the other side drops the socket -# TODO this currently drops whitespace, like tabs +# TODO this currently drops leading whitespace, like tabs proc ::pd_connect::pd_readsocket {cmd_from_pd} { variable pd_socket append cmd_from_pd [gets $pd_socket] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10544] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 10544 http://pure-data.svn.sourceforge.net/pure-data/?rev=10544&view=rev Author: eighthave Date: 2009-01-13 23:17:19 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - created placeholder panels for find, message, and preferences - rename panel procs to be consistent - rearranged key bindings to the above panels appropriately - flushed out the apple events some after reading some Tcl source code Modified Paths: -------------- branches/pd-devel/0.41.4/src/apple_events.tcl branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pd_menus.tcl Modified: branches/pd-devel/0.41.4/src/apple_events.tcl =================================================================== --- branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 21:45:24 UTC (rev 10543) +++ branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 23:17:19 UTC (rev 10544) @@ -10,8 +10,9 @@ set ::tk::mac::antialiasedtext 1 # kAEOpenDocuments -proc ::tk::mac::OpenDocument {} { +proc ::tk::mac::OpenDocument {args} { # TODO + # args will be a list of all the documents dropped on your app, or double-clicked } # kEventAppHidden @@ -26,17 +27,25 @@ # kAEShowPreferences proc ::tk::mac::ShowPreferences {} { - puts "apple prefs menu item callback" - puts "::tk::mac::ShowPreferences " - # TODO - #menu_preferences + menu_preferences_panel } # kAEQuitApplication -#proc exit {} { -# # TODO sort this out... +#proc ::tk::mac::Quit {} { +# # TODO sort this out... how to quit pd-gui after sending the message # puts stderr "Custom exit proc" -# # this proc overrides the built-in exit so we can grab the Quit event # pdsend "pd verifyquit;" -# ::exit #} + +# these I gleaned by reading the source (tkMacOSXHLEvents.c) +proc ::tk::mac::PrintDocument {args} { + # TODO what's $mytoplevel here?. I am guessing args would be the same as + # ::tk::mac::OpenDocument + #menu_print $mytoplevel +} + +proc ::tk::mac::OpenApplication {} { +} + +proc ::tk::mac::ReopenApplication {} { +} Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 21:45:24 UTC (rev 10543) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 23:17:19 UTC (rev 10544) @@ -24,16 +24,15 @@ # File menu bind $mytoplevel <$modifier-Key-b> "menu_helpbrowser" + bind $mytoplevel <$modifier-Key-f> "menu_find_panel $mytoplevel" bind $mytoplevel <$modifier-Key-n> "menu_new" bind $mytoplevel <$modifier-Key-o> "menu_open" bind $mytoplevel <$modifier-Key-p> "menu_print $mytoplevel" bind $mytoplevel <$modifier-Key-q> "pdsend \"pd verifyquit ;\"" bind $mytoplevel <$modifier-Key-r> "menu_raiseconsole" - bind $mytoplevel <$modifier-Key-w> "pdsend \"$mytoplevel menuclose 0 ;\"" bind $mytoplevel <$modifier-Shift-Key-L> "menu_clear_console" bind $mytoplevel <$modifier-Shift-Key-Q> "pdsend \"pd quit ;\"" bind $mytoplevel <$modifier-Shift-Key-R> "menu_toggle_console" - bind $mytoplevel <$modifier-Shift-Key-W> "pdsend \"$mytoplevel menuclose 1 ;\"" # DSP control bind $mytoplevel <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" @@ -89,10 +88,10 @@ bind $mytoplevel <$modifier-Key-c> "pdsend \"$mytoplevel copy ;\"" bind $mytoplevel <$modifier-Key-d> "pdsend \"$mytoplevel duplicate ;\"" bind $mytoplevel <$modifier-Key-e> "pdsend \"$mytoplevel editmode 0 ;\"" - bind $mytoplevel <$modifier-Key-f> "menu_findobject $mytoplevel" bind $mytoplevel <$modifier-Key-g> "pdsend \"$mytoplevel findagain ;\"" bind $mytoplevel <$modifier-Key-s> "pdsend \"$mytoplevel menusave ;\"" bind $mytoplevel <$modifier-Key-v> "pdsend \"$mytoplevel paste ;\"" + bind $mytoplevel <$modifier-Key-w> "pdsend \"$mytoplevel menuclose 0 ;\"" bind $mytoplevel <$modifier-Key-x> "pdsend \"$mytoplevel cut ;\"" bind $mytoplevel <$modifier-Key-z> "menu_undo $mytoplevel" bind $mytoplevel <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" @@ -109,6 +108,7 @@ bind $mytoplevel <$modifier-Shift-Key-T> "pdsend \"$mytoplevel toggle 1 ;\"" bind $mytoplevel <$modifier-Shift-Key-U> "pdsend \"$mytoplevel vumeter 1 ;\"" bind $mytoplevel <$modifier-Shift-Key-V> "pdsend \"$mytoplevel vslider 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-W> "pdsend \"$mytoplevel menuclose 1 ;\"" bind $mytoplevel <$modifier-Shift-Key-Z> "menu_redo $mytoplevel" if {$::windowingsystem eq "aqua"} { @@ -116,7 +116,7 @@ bind $mytoplevel <$modifier-Key-t> "menu_font $mytoplevel" bind $mytoplevel <$modifier-quoteleft> "menu_raisenextwindow" } else { - bind $mytoplevel <$modifier-Key-m> "menu_send" + bind $mytoplevel <$modifier-Key-m> "menu_message_panel" bind $mytoplevel <$modifier-Key-t> "menu_texteditor" } Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 21:45:24 UTC (rev 10543) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 23:17:19 UTC (rev 10544) @@ -49,12 +49,6 @@ } } -proc ::pd_menucommands::menu_send {} { - toplevel .sendpanel - wm title .sendpanel "Send message" - # TODO insert real send panel here -} - proc ::pd_menucommands::menu_print {mytoplevel} { set filename [tk_getSaveFile -initialfile pd.ps \ -defaultextension .ps \ @@ -65,14 +59,54 @@ } # ------------------------------------------------------------------------------ -# functions called from Edit menu +# various panels -proc ::pd_menucommands::menu_preferences {args} { - toplevel .preferences - wm title .preferences "Preferences" - # TODO insert real preference panel here +proc ::pd_menucommands::menu_message_panel {} { + if {[winfo exists .message]} { + raise .message + } else { + # TODO insert real message panel here + toplevel .message + wm title .message "Message..." + ::pd_bindings::panel_bindings .message + frame .message.frame + label .message.label -text "message" -width 30 -height 15 + pack .message.label .message.frame -side top -expand yes -fill both + } } +proc ::pd_menucommands::menu_find_panel {mytoplevel} { + if {[winfo exists .find]} { + raise .find + } else { + # TODO insert real find panel here + toplevel .find + wm title .find "Find..." + ::pd_bindings::panel_bindings .find + frame .find.frame + label .find.label -text "find" -width 30 -height 15 + pack .find.label .find.frame -side top -expand yes -fill both + } + # TODO this panel should probably receive <FocusIn> events so that it will + # find in which ever window has focus then "OK' is clicked. It will need + # to filter out the Pd window, unless someone implements searching in the + # console text. hmm that would be nice! +} + +proc ::pd_menucommands::menu_preferences_panel {} { + if {[winfo exists .preferences]} { + raise .preferences + } else { + # TODO insert real preference panel here + toplevel .preferences + wm title .preferences "Preferences" + ::pd_bindings::panel_bindings .preferences + frame .preferences.frame + label .preferences.label -text "preferences" -width 30 -height 15 + pack .preferences.label .preferences.frame -side top -expand yes -fill both + } +} + # ------------------------------------------------------------------------------ # window management functions Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 21:45:24 UTC (rev 10543) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 23:17:19 UTC (rev 10544) @@ -84,7 +84,7 @@ $mymenu entryconfigure [say "Save As..."] -command "pdsend \"$mytoplevel menusaveas ;\"" # $mymenu entryconfigure "Revert*" -command "menu_revert $mytoplevel" $mymenu entryconfigure [say "Close"] -command "pdsend \"$mytoplevel menuclose 0 ;\"" - $mymenu entryconfigure [say "Message"] -command "menu_send" + $mymenu entryconfigure [say "Message"] -command "menu_message_panel" $mymenu entryconfigure [say "Print..."] -command "menu_print $mytoplevel" } @@ -138,7 +138,7 @@ if {$::windowingsystem ne "aqua"} { $mymenu add separator $mymenu add command -label [say "Preferences"] \ - -command "menu_preferences" + -command "menu_preferences_panel" } } @@ -181,7 +181,7 @@ proc ::pd_menus::build_find_menu {mymenu mytoplevel} { variable accelerator $mymenu add command -label [say "Find..."] -accelerator "$accelerator+F" \ - -command "menu_findobject $mytoplevel" + -command "menu_find_panel $mytoplevel" $mymenu add command -label [say "Find Again"] -accelerator "$accelerator+G" \ -command "pdsend \"$mytoplevel findagain ;\"" $mymenu add command -label [say "Find last error"] \ @@ -237,9 +237,9 @@ $mymenu.apple add command -label [say "About Pd"] \ -command "menu_doc_open doc/1.manual 1.introduction.txt" $mymenu add cascade -label "Apple" -menu $mymenu.apple + $mymenu.apple add separator # starting in 8.4.14, this is created automatically if {[regsub -- {[0-9]\.[0-9]\.([0-9][0-9]*)} [info patchlevel] {\1}] < 14} { - $mymenu.apple add separator $mymenu.apple add command -label [say "Preferences..."] \ -command "menu_preferences" -accelerator "Cmd+," } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10543] branches/pd-devel/0.41.4/src/makefile.in
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10543 http://pure-data.svn.sourceforge.net/pure-data/?rev=10543&view=rev Author: eighthave Date: 2009-01-13 21:45:24 +0000 (Tue, 13 Jan 2009) Log Message: ----------- oops, I mistakenly removed 'externs' from the 'all' target, put it back, and cleaned that bit up a bit Modified Paths: -------------- branches/pd-devel/0.41.4/src/makefile.in Modified: branches/pd-devel/0.41.4/src/makefile.in =================================================================== --- branches/pd-devel/0.41.4/src/makefile.in 2009-01-13 21:35:57 UTC (rev 10542) +++ branches/pd-devel/0.41.4/src/makefile.in 2009-01-13 21:45:24 UTC (rev 10543) @@ -75,10 +75,9 @@ # ------------------ targets ------------------------------------ # -.PHONY: pd externs all +.PHONY: pd externs all bin -all: pd $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ - $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk +all: bin externs bin: pd $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10542] branches/pd-devel/0.41.4/src/makefile.in
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10542 http://pure-data.svn.sourceforge.net/pure-data/?rev=10542&view=rev Author: eighthave Date: 2009-01-13 21:35:57 +0000 (Tue, 13 Jan 2009) Log Message: ----------- removed the last vestages of the Tcl/C build stuff since it is unneeded now Modified Paths: -------------- branches/pd-devel/0.41.4/src/makefile.in Modified: branches/pd-devel/0.41.4/src/makefile.in =================================================================== --- branches/pd-devel/0.41.4/src/makefile.in 2009-01-13 18:57:06 UTC (rev 10541) +++ branches/pd-devel/0.41.4/src/makefile.in 2009-01-13 21:35:57 UTC (rev 10542) @@ -21,8 +21,6 @@ CPPFLAGS = @CPPFLAGS@ MORECFLAGS = @MORECFLAGS@ -GINCLUDE = $(CPPFLAGS) @GUIFLAGS@ -GLIB = @LIBS@ LDFLAGS = @LDFLAGS@ LIB = @PDLIB@ @@ -77,31 +75,22 @@ # ------------------ targets ------------------------------------ # -.PHONY: pd gui externs all +.PHONY: pd externs all -all: pd $(BIN_DIR)/pd-watchdog gui $(BIN_DIR)/pdsend \ +all: pd $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk -bin: pd $(BIN_DIR)/pd-watchdog gui $(BIN_DIR)/pdsend \ +bin: pd $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(OBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c -$(GOBJ) : %.o : %.c - $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c - $(ASIOOBJ): %.o : %.cpp $(CXX) $(CFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.cpp pd: $(PDEXEC) -ifneq ($(GSRC),) -gui: $(BIN_DIR)/$(GUINAME) -else -gui: -endif - pd-watchdog: $(BIN_DIR)/pd-watchdog $(BIN_DIR): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10541] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10541 http://pure-data.svn.sourceforge.net/pure-data/?rev=10541&view=rev Author: eighthave Date: 2009-01-13 18:57:06 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - added prototype for saveas proc - moved pdtk_canvas_new from pd.tk to pdtk_canvas.tcl - added sketch for proper "file modified, save? yes, no, cancel" dialog Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pdtk_canvas.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 18:42:17 UTC (rev 10540) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 18:57:06 UTC (rev 10541) @@ -141,44 +141,16 @@ } } -# TODO it probably makes sense to add a new function for -type yesnocancel -# dialogs that would be useful for "Save, Discard, Cancel" dialogs +# TODO it probably makes sense to add a new function for for "Save, Discard, +# Cancel" dialogs using tk_dialog +proc pdtk_check_modified {message reply_to_pd default} { +} proc pdtk_fixwindowmenu {} { #TODO figure out how to do this cleanly puts stderr "Running pdtk_fixwindowmenu" } -proc pdtk_canvas_new {mytoplevel width height geometry editable} { - # TODO check size of window - toplevel $mytoplevel -width $width -height $height - ::pd_menus::create_menubar $mytoplevel.menubar - $mytoplevel configure -menu $mytoplevel.menubar - - # TODO slide off screen windows into view - wm geometry $mytoplevel $geometry - if {$::windowingsystem eq "aqua"} { - wm minsize $mytoplevel 50 20 - } else { # leave room for the menubar - wm minsize $mytoplevel 310 30 - } - canvas $mytoplevel.c -width $width -height $height -background white \ - -highlightthickness 0 - # TODO add scrollbars here - pack $mytoplevel.c -side left -expand 1 -fill both - - ::pd_bindings::canvas_bindings $mytoplevel - - # the popup menu for the canvas - menu $mytoplevel.popup -tearoff false - $mytoplevel.popup add command -label "Properties" \ - -command "popup_action $mytoplevel 0" - $mytoplevel.popup add command -label "Open" \ - -command "popup_action $mytoplevel 1" - $mytoplevel.popup add command -label "Help" \ - -command "popup_action $mytoplevel 2" -} - proc check_font {$fontname} { # TODO check to see if the requested font exists using [font families] } Modified: branches/pd-devel/0.41.4/src/pdtk_canvas.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 18:42:17 UTC (rev 10540) +++ branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 18:57:06 UTC (rev 10541) @@ -6,10 +6,41 @@ namespace eval ::pdtk_canvas:: { } -proc pdtk_canvas_checkgeometry {mytoplevel} { - # TODO check and relocate window accordingly +#------------------------------------------------------------------------------# +# canvas new/saveas + +proc pdtk_canvas_new {mytoplevel width height geometry editable} { + # TODO check size of window + toplevel $mytoplevel -width $width -height $height + ::pd_menus::create_menubar $mytoplevel.menubar + $mytoplevel configure -menu $mytoplevel.menubar + + # TODO slide off screen windows into view + wm geometry $mytoplevel $geometry + if {$::windowingsystem eq "aqua"} { # no menubar, it can be small + wm minsize $mytoplevel 50 20 + } else { # leave room for the menubar + wm minsize $mytoplevel 310 30 + } + canvas $mytoplevel.c -width $width -height $height -background white \ + -highlightthickness 0 + # TODO add scrollbars here + pack $mytoplevel.c -side left -expand 1 -fill both + + ::pd_bindings::canvas_bindings $mytoplevel + + # the popup menu for the canvas + menu $mytoplevel.popup -tearoff false + $mytoplevel.popup add command -label "Properties" \ + -command "popup_action $mytoplevel 0" + $mytoplevel.popup add command -label "Open" \ + -command "popup_action $mytoplevel 1" + $mytoplevel.popup add command -label "Help" \ + -command "popup_action $mytoplevel 2" } +proc pdtk_canvas_saveas {name initfile initdir} { +} #------------------------------------------------------------------------------# # mouse usage @@ -65,3 +96,7 @@ proc pdtk_canvas_getscroll {mytoplevel} { # TODO make this work } + +proc pdtk_canvas_checkgeometry {mytoplevel} { + # TODO check and relocate window accordingly +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10540] branches/pd-devel/0.41.4/src/pd_menus.tcl
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10540 http://pure-data.svn.sourceforge.net/pure-data/?rev=10540&view=rev Author: eighthave Date: 2009-01-13 18:42:17 +0000 (Tue, 13 Jan 2009) Log Message: ----------- reordered functions for readability and added code snippet for console show/hide Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd_menus.tcl Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 18:39:26 UTC (rev 10539) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 18:42:17 UTC (rev 10540) @@ -75,120 +75,6 @@ } # ------------------------------------------------------------------------------ -# menu building functions for Mac OS X/aqua - -# for Mac OS X only -proc ::pd_menus::create_apple_menu {mymenu} { - puts stderr BUILD_APPLE_MENU - # TODO this should open a Pd patch called about.pd - menu $mymenu.apple - $mymenu.apple add command -label [say "About Pd"] \ - -command "menu_doc_open doc/1.manual 1.introduction.txt" - $mymenu add cascade -label "Apple" -menu $mymenu.apple - # starting in 8.4.14, this is created automatically - if {[regsub -- {[0-9]\.[0-9]\.([0-9][0-9]*)} [info patchlevel] {\1}] < 14} { - $mymenu.apple add separator - $mymenu.apple add command -label [say "Preferences..."] \ - -command "menu_preferences" -accelerator "Cmd+," - } -} - -proc ::pd_menus::build_file_menu_aqua {mymenu} { - variable accelerator - $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" - $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" - $mymenu add cascade -label [say "Open Recent"] - $mymenu add separator - $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" - $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" - $mymenu add command -label [say "Save As..."] -accelerator "$accelerator+Shift+S" - #$mymenu add command -label [say "Save All"] - $mymenu add command -label [say "Revert to Saved"] - $mymenu add separator - $mymenu add command -label [say "Message"] - $mymenu add separator - $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" -} - -# the "Edit", "Put", and "Find" menus do not have cross-platform differences - -proc ::pd_menus::build_media_menu_aqua {mymenu} { -} - -proc ::pd_menus::build_window_menu_aqua {mymenu} { -} - -# the "Help" does not have cross-platform differences - -# ------------------------------------------------------------------------------ -# menu building functions for UNIX/X11 - -proc ::pd_menus::build_file_menu_x11 {mymenu} { - variable accelerator - $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" - $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" - $mymenu add separator - $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" - $mymenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" - # $mymenu add command -label "Revert" - $mymenu add separator - $mymenu add command -label [say "Message"] -accelerator "$accelerator+M" - $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" - $mymenu add separator - $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" - $mymenu add command -label [say "Quit"] -accelerator "$accelerator+Q" \ - -command "pdsend \"pd verifyquit ;\"" -} - -# the "Edit", "Put", and "Find" menus do not have cross-platform differences - -proc ::pd_menus::build_media_menu_x11 {mymenu} { -} - -proc ::pd_menus::build_window_menu_x11 {mymenu} { -} - -# the "Help" does not have cross-platform differences - -# ------------------------------------------------------------------------------ -# menu building functions for Windows/Win32 - -# for Windows only -proc ::pd_menus::create_system_menu {mymenu} { - $mymenu add cascade -menu [menu $mymenu.system] - # TODO add Close, Minimize, etc and whatever else is on the little menu - # that is on the top left corner of the window frame -} - -proc ::pd_menus::build_file_menu_win32 {mymenu} { - variable accelerator - $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" - $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" - $mymenu add separator - $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" - $mymenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" - # $mymenu add command -label "Revert" - $mymenu add separator - $mymenu add command -label [say "Message"] -accelerator "$accelerator+M" - $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" - $mymenu add separator - $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" - $mymenu add command -label [say "Quit"] -accelerator "$accelerator+Q"\ - -command "pdsend \"pd verifyquit ;\"" -} - -# the "Edit", "Put", and "Find" menus do not have cross-platform differences - -proc ::pd_menus::build_media_menu_win32 {mymenu} { -} - -proc ::pd_menus::build_window_menu_win32 {mymenu} { -} - -# the "Help" does not have cross-platform differences - - -# ------------------------------------------------------------------------------ # menu building functions proc ::pd_menus::build_file_menu {mymenu mytoplevel} { [format build_file_menu_%s $::windowingsystem] $mymenu @@ -245,6 +131,10 @@ # $mymenu entryconfigure "Edit Mode" -indicatoron false # } + #if { ! [catch {console hide}]} { + # TODO set up menu item to show/hide the Tcl/Tk console, if it available + #} + if {$::windowingsystem ne "aqua"} { $mymenu add separator $mymenu add command -label [say "Preferences"] \ @@ -335,3 +225,117 @@ $mymenu add command -label {Browser ...} \ -command "placeholder menu_helpbrowser \$help_top_directory" } + +# ------------------------------------------------------------------------------ +# menu building functions for Mac OS X/aqua + +# for Mac OS X only +proc ::pd_menus::create_apple_menu {mymenu} { + puts stderr BUILD_APPLE_MENU + # TODO this should open a Pd patch called about.pd + menu $mymenu.apple + $mymenu.apple add command -label [say "About Pd"] \ + -command "menu_doc_open doc/1.manual 1.introduction.txt" + $mymenu add cascade -label "Apple" -menu $mymenu.apple + # starting in 8.4.14, this is created automatically + if {[regsub -- {[0-9]\.[0-9]\.([0-9][0-9]*)} [info patchlevel] {\1}] < 14} { + $mymenu.apple add separator + $mymenu.apple add command -label [say "Preferences..."] \ + -command "menu_preferences" -accelerator "Cmd+," + } +} + +proc ::pd_menus::build_file_menu_aqua {mymenu} { + variable accelerator + $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" + $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" + $mymenu add cascade -label [say "Open Recent"] + $mymenu add separator + $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" + $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" + $mymenu add command -label [say "Save As..."] -accelerator "$accelerator+Shift+S" + #$mymenu add command -label [say "Save All"] + $mymenu add command -label [say "Revert to Saved"] + $mymenu add separator + $mymenu add command -label [say "Message"] + $mymenu add separator + $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" +} + +# the "Edit", "Put", and "Find" menus do not have cross-platform differences + +proc ::pd_menus::build_media_menu_aqua {mymenu} { +} + +proc ::pd_menus::build_window_menu_aqua {mymenu} { +} + +# the "Help" does not have cross-platform differences + +# ------------------------------------------------------------------------------ +# menu building functions for UNIX/X11 + +proc ::pd_menus::build_file_menu_x11 {mymenu} { + variable accelerator + $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" + $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" + $mymenu add separator + $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" + $mymenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" + # $mymenu add command -label "Revert" + $mymenu add separator + $mymenu add command -label [say "Message"] -accelerator "$accelerator+M" + $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" + $mymenu add separator + $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" + $mymenu add command -label [say "Quit"] -accelerator "$accelerator+Q" \ + -command "pdsend \"pd verifyquit ;\"" +} + +# the "Edit", "Put", and "Find" menus do not have cross-platform differences + +proc ::pd_menus::build_media_menu_x11 {mymenu} { +} + +proc ::pd_menus::build_window_menu_x11 {mymenu} { +} + +# the "Help" does not have cross-platform differences + +# ------------------------------------------------------------------------------ +# menu building functions for Windows/Win32 + +# for Windows only +proc ::pd_menus::create_system_menu {mymenu} { + $mymenu add cascade -menu [menu $mymenu.system] + # TODO add Close, Minimize, etc and whatever else is on the little menu + # that is on the top left corner of the window frame +} + +proc ::pd_menus::build_file_menu_win32 {mymenu} { + variable accelerator + $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" + $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" + $mymenu add separator + $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" + $mymenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" + # $mymenu add command -label "Revert" + $mymenu add separator + $mymenu add command -label [say "Message"] -accelerator "$accelerator+M" + $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" + $mymenu add separator + $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" + $mymenu add command -label [say "Quit"] -accelerator "$accelerator+Q"\ + -command "pdsend \"pd verifyquit ;\"" +} + +# the "Edit", "Put", and "Find" menus do not have cross-platform differences + +proc ::pd_menus::build_media_menu_win32 {mymenu} { +} + +proc ::pd_menus::build_window_menu_win32 {mymenu} { +} + +# the "Help" does not have cross-platform differences + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10539] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10539 http://pure-data.svn.sourceforge.net/pure-data/?rev=10539&view=rev Author: eighthave Date: 2009-01-13 18:39:26 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - replaced [tk windowingsystem] with $::windowingsystem to make supporting Tcl/Tk 8.3 easy and the code easier to read for non-Tclers - moved config procs out of 'namespace eval' because its cleaner and is needed to support the global variable $::windowingsystem - moved some commented bits of code around to more appropriate places Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_menus.tcl branches/pd-devel/0.41.4/src/pdtk_text.tcl branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 18:14:05 UTC (rev 10538) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 18:39:26 UTC (rev 10539) @@ -14,14 +14,22 @@ package require Tcl 8.3 package require Tk -## replace Tk widgets with Ttk widgets +## replace Tk widgets with Tile/Ttk widgets (Tile/Ttk is included in Tcl/Tk 8.5) #package require tile #namespace import -force ttk::* -# set . as first dir in auto_path -set auto_path [linsert $auto_path 0 "/Users/hans/code/pure-data/branches/pd-devel/0.41.4/src"] -set auto_path [linsert $auto_path 0 "."] +#------------------------------------------------------------------------------# +# global variables + +# file types for Open/Save panels +set filetypes "" + +# for testing which platform we are running on ("aqua", "win32", or "x11") +set windowingsystem "" + +#------------------------------------------------------------------------------# +# packages for this project package require pd_connect package require pd_menus package require pd_bindings @@ -43,9 +51,10 @@ # # - when possible use "" doublequotes to delimit messages # - instead of 'global myvar' use '$::myvar' +# - for the sake of clarity, there should not be any inline code, everything +# should be in a procedure that is ultimately triggered from main() # # -# ## Names for Common Variables #---------------------------- # @@ -57,36 +66,6 @@ # $mycanvas = 'canvas' # $canvasitem = 'canvas' item - - -#------------------------------------------------------------------------------# -# global variables - - -# file types for Open/Save panels -set filetypes "" - -# for the sake of clarity, I think there should not be any inline code, -# everything should be in a procedure that is ultimately triggered from main() -# -hans(a)eds.org - -#array set cmd_ops {} - -# the only arg for pd.tk is the port number to connect to 'pd' on, but this -# code would be useful for opening files via drag-n-drop, the open panel, etc. -#for {set i 0} {$i < $argc} {incr i} { -# global cmd_ops files_to_open -# set o [lindex $argv $i] -# switch -regexp -- $o { -# ^-lang\$ {incr i; set cmd_ops(lang) [lindex $argv $i]} -# default {lappend files_to_open [lindex $argv $i]} -# } -#} - -# no english support yet, so I am commenting this out -#if {![info exists cmd_ops(lang)]} {set cmd_ops(lang) "en"} -#init_locale - # ------------------------------------------------------------------------------ # quoting functions @@ -101,7 +80,13 @@ # init functions proc init {} { - switch -- [tk windowingsystem] { + # we are not using Tk scaling, so fix it to 1 on all platforms. This + # guarantees that patches will be pixel-exact on every platform + tk scaling 1 + + # Tcl/Tk 8.3 doesn't have [tk windowingsystem] + set ::windowingsystem [tk windowingsystem] + switch -- $::windowingsystem { "x11" { # add control to show/hide hidden files in the open panel (load # the tk_getOpenFile dialog once, otherwise it will not work) @@ -172,7 +157,7 @@ # TODO slide off screen windows into view wm geometry $mytoplevel $geometry - if {[tk windowingsystem] eq "aqua"} { + if {$::windowingsystem eq "aqua"} { wm minsize $mytoplevel 50 20 } else { # leave room for the menubar wm minsize $mytoplevel 310 30 @@ -207,10 +192,11 @@ post_tclinfo pdtk_post "Starting pd.tk with main($argc $argv)" init - # we are not using Tk scaling, so fix it to 1 on all platforms. This - # guarantees that patches will be pixel-exact on every platform - tk scaling 1 + # no english support yet, so I am commenting this out + #if {![info exists cmd_ops(lang)]} {set cmd_ops(lang) "en"} + #init_locale + # TODO check args for -stderr and set pdtk_post accordingly ::pd_menus::create_menubar .menubar Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 18:14:05 UTC (rev 10538) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 18:39:26 UTC (rev 10539) @@ -9,18 +9,19 @@ namespace export window_bindings namespace export panel_bindings namespace export canvas_bindings +} +proc ::pd_bindings::window_bindings {mytoplevel} { + variable modifier + # for key bindings - if {[tk windowingsystem] eq "aqua"} { + puts "::windowingsystem $::windowingsystem" + if {$::windowingsystem eq "aqua"} { set modifier "Mod1" } else { set modifier "Control" } -} -proc ::pd_bindings::window_bindings {mytoplevel} { - variable modifier - # File menu bind $mytoplevel <$modifier-Key-b> "menu_helpbrowser" bind $mytoplevel <$modifier-Key-n> "menu_new" @@ -74,10 +75,10 @@ proc ::pd_bindings::canvas_bindings {mytoplevel} { variable modifier + set mycanvas $mytoplevel.c window_bindings $mytoplevel - set mycanvas $mytoplevel.c - + # key bindings ------------------------------------------------------------- bind $mytoplevel <$modifier-Key-1> "pdsend \"$mytoplevel obj ;\"" bind $mytoplevel <$modifier-Key-2> "pdsend \"$mytoplevel msg ;\"" @@ -110,7 +111,7 @@ bind $mytoplevel <$modifier-Shift-Key-V> "pdsend \"$mytoplevel vslider 1 ;\"" bind $mytoplevel <$modifier-Shift-Key-Z> "menu_redo $mytoplevel" - if {[tk windowingsystem] eq "aqua"} { + if {$::windowingsystem eq "aqua"} { bind $mytoplevel <$modifier-Key-m> "menu_minimize $mytoplevel" bind $mytoplevel <$modifier-Key-t> "menu_font $mytoplevel" bind $mytoplevel <$modifier-quoteleft> "menu_raisenextwindow" @@ -127,7 +128,7 @@ bind $mycanvas <ButtonRelease> "pdtk_canvas_mouseup %W %x %y %b" bind $mycanvas <$modifier-Button> "pdtk_canvas_mouse %W %x %y %b 0" # TODO look into "virtual events' for a means for getting Shift-Button, etc. - switch {[tk windowingsystem]} { + switch {$::windowingsystem} { "aqua" { # on Mac OS X, emulate a rightclick with Ctrl-click bind $mycanvas <Ctrl-Button> "pdtk_canvas_rightclick %W %x %y %b" Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 18:14:05 UTC (rev 10538) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 18:39:26 UTC (rev 10539) @@ -28,12 +28,6 @@ namespace export create_menubar namespace export configure_pdwindow - if {[tk windowingsystem] eq "aqua"} { - set accelerator "Cmd" - } else { - set accelerator "Ctrl" - } - # turn off tearoff menus globally option add *tearOff 0 } @@ -41,16 +35,22 @@ # ------------------------------------------------------------------------------ # proc ::pd_menus::create_menubar {mymenubar} { + variable accelerator + if {$::windowingsystem eq "aqua"} { + set accelerator "Cmd" + } else { + set accelerator "Ctrl" + } menu $mymenubar set menulist "file edit put find media window help" - if { [tk windowingsystem] eq "aqua" } {create_apple_menu $mymenubar} - if { [tk windowingsystem] eq "win32" } {create_system_menu $mymenubar} + if { $::windowingsystem eq "aqua" } {create_apple_menu $mymenubar} + if { $::windowingsystem eq "win32" } {create_system_menu $mymenubar} foreach mymenu $menulist { menu $mymenubar.$mymenu $mymenubar add cascade -label [string totitle $mymenu] \ -menu $mymenubar.$mymenu [format build_%s_menu $mymenu] $mymenubar.$mymenu PLACEHOLDER - if {[tk windowingsystem] eq "win32"} { + if {$::windowingsystem eq "win32"} { # fix menu font size on Windows with tk scaling = 1 $mymenubar.$mymenu configure -font menufont } @@ -191,7 +191,7 @@ # ------------------------------------------------------------------------------ # menu building functions proc ::pd_menus::build_file_menu {mymenu mytoplevel} { - [format build_file_menu_%s [tk windowingsystem]] $mymenu + [format build_file_menu_%s $::windowingsystem] $mymenu $mymenu entryconfigure [say "new_file"] -command "menu_new" $mymenu entryconfigure [say "Open"] -command "menu_open" $mymenu entryconfigure [say "Save"] -command "pdsend \"$mytoplevel menusave ;\"" @@ -220,7 +220,7 @@ $mymenu add command -label [say "Select All"] -accelerator "$accelerator+A" \ -command "pdsend \"$mytoplevel selectall ;\"" $mymenu add separator - if {[tk windowingsystem] eq "aqua"} { + if {$::windowingsystem eq "aqua"} { $mymenu add command -label [say "Text Editor"] \ -command "menu_texteditor $mytoplevel" $mymenu add command -label [say "Font"] -accelerator "$accelerator+T" \ @@ -245,7 +245,7 @@ # $mymenu entryconfigure "Edit Mode" -indicatoron false # } - if {[tk windowingsystem] ne "aqua"} { + if {$::windowingsystem ne "aqua"} { $mymenu add separator $mymenu add command -label [say "Preferences"] \ -command "menu_preferences" @@ -313,7 +313,7 @@ proc ::pd_menus::build_window_menu {mymenu mytoplevel} { variable accelerator - if {[tk windowingsystem] eq "aqua"} { + if {$::windowingsystem eq "aqua"} { $mymenu add command -label [say "Minimize"] -command "menu_minimize ." \ -accelerator "$accelerator+M" $mymenu add command -label [say "Zoom"] -command "menu_zoom ." @@ -326,7 +326,7 @@ } proc ::pd_menus::build_help_menu {mymenu mytoplevel} { - if {[tk windowingsystem] ne "aqua"} { + if {$::windowingsystem ne "aqua"} { $mymenu add command -label {About Pd} \ -command "placeholder menu_doc_open doc/1.manual 1.introduction.txt" } Modified: branches/pd-devel/0.41.4/src/pdtk_text.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_text.tcl 2009-01-13 18:14:05 UTC (rev 10538) +++ branches/pd-devel/0.41.4/src/pdtk_text.tcl 2009-01-13 18:39:26 UTC (rev 10539) @@ -13,7 +13,7 @@ -anchor nw -font "$::font_family $font_size $::font_weight" $mycanvas bind $canvasitem <Home> "$mycanvas icursor $canvasitem 0" $mycanvas bind $canvasitem <End> "$mycanvas icursor $canvasitem end" - if {[tk windowingsystem] eq "aqua"} { # emacs bindings for Mac OS X + if {$::windowingsystem eq "aqua"} { # emacs bindings for Mac OS X $mycanvas bind $canvasitem <Control-a> "$mycanvas icursor $canvasitem 0" $mycanvas bind $canvasitem <Control-e> "$mycanvas icursor $canvasitem end" } Modified: branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl =================================================================== --- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-13 18:14:05 UTC (rev 10538) +++ branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-13 18:39:26 UTC (rev 10539) @@ -32,6 +32,20 @@ } } + +#array set cmd_ops {} + +# the only arg for pd.tk is the port number to connect to 'pd' on, but this +# code would be useful for opening files via drag-n-drop, the open panel, etc. +#for {set i 0} {$i < $argc} {incr i} { +# global cmd_ops files_to_open +# set o [lindex $argv $i] +# switch -regexp -- $o { +# ^-lang\$ {incr i; set cmd_ops(lang) [lindex $argv $i]} +# default {lappend files_to_open [lindex $argv $i]} +# } +#} + # ------------------------------------------------------------------------------ # lost pdtk functions... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2009