Revision: 9807 http://pure-data.svn.sourceforge.net/pure-data/?rev=9807&view=rev Author: eighthave Date: 2008-05-15 06:03:45 -0700 (Thu, 15 May 2008)

Log Message: ----------- made console-window-related key bindings work when the Pd window has focus, fixing most of bug #1964296 (all except the fact the the "Pd window" menu item doesn't raise the Pd window on GNU/Linux unless that window has been iconified since the Pd window had focus.)

Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/u_main.tk

Modified: branches/pd-extended/v0-40/pd/src/u_main.tk =================================================================== --- branches/pd-extended/v0-40/pd/src/u_main.tk 2008-05-15 08:55:25 UTC (rev 9806) +++ branches/pd-extended/v0-40/pd/src/u_main.tk 2008-05-15 13:03:45 UTC (rev 9807) @@ -391,6 +391,10 @@ proc pdtk_fixwindowmenu {} { global menu_windowlist .mbar.windows delete 0 end + .mbar.windows add command -label {parent window} -state disabled + .mbar.windows add command -label {Pd window} -command menu_raise_console \ + -accelerator [accel_munge "Ctrl+r"] -state disabled + .mbar.windows add separator foreach i $menu_windowlist { .mbar.windows add command -label [lindex $i 0] \ -command [concat menu_domenuwindow [lindex $i 1]] @@ -497,6 +501,7 @@ if {$pd_window eq $top_window} { lower $pd_window } else { + wm deiconify $pd_window raise $pd_window } } @@ -840,16 +845,7 @@ -state disabled .mbar.find add command -label {Find last error} -command {menu_finderror}

-#################### the "Window" menu for the Pd window ##############

-# this does not show up on the Window menu, probably because it is a special -# menu that is supposed to be automatically managed by Tcl/Tk -#.mbar.find add command -label {parent window} -state disabled -#.mbar.windows add command -label {Pd window} -command menu_raise_console \ -# -accelerator [accel_munge "Ctrl+r"] -#.mbar.windows add separator - - ########### functions for menu functions on document windows ########

proc menu_save {name} { @@ -3652,19 +3648,24 @@ global pd_nt # puts stderr [concat key $key shift $shift] # .dummy itemconfig goo -text [concat ---> control-key event $key]; - if {$key == "n" || $key == "N"} {menu_new} - if {$key == "o" || $key == "O"} {menu_open} - if {$pd_nt != 2} { - # Cmd-m is minimize window on Mac OS X - if {$key == "m" || $key == "M"} {menu_send} + if {$shift == 1} { + if {$key == "l" || $key == "L"} {menu_clear_console} + if {$key == "q" || $key == "Q"} {menu_really_quit} + if {$key == "r" || $key == "R"} {menu_toggle_console} } else { - if {$key == "m" || $key == "M"} {menu_minimize} + if {$key == "n" || $key == "N"} {menu_new} + if {$key == "o" || $key == "O"} {menu_open} + if {$key == "q" || $key == "Q"} {menu_quit} + if {$key == "r" || $key == "R"} {menu_raise_console} + if {$pd_nt != 2} { + # Cmd-m is minimize window on Mac OS X + if {$key == "m" || $key == "M"} {menu_send} + } else { + if {$key == "m" || $key == "M"} {menu_minimize} + } + if {$key == "slash"} {menu_audio 1} + if {$key == "period"} {menu_audio 0} } - if {$key == "q" || $key == "Q"} { - if {$shift == 1} {menu_really_quit} else {menu_quit} - } - if {$key == "slash"} {menu_audio 1} - if {$key == "period"} {menu_audio 0} }

######### startup function. ##############

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.