Commit ba0dc79b authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

Improved drawing logic for the console window (pd.tk) plus a version bump for m_pd.h

parent f3ef61ca
...@@ -11,7 +11,7 @@ extern "C" { ...@@ -11,7 +11,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0 #define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42 #define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 5 #define PD_BUGFIX_VERSION 5
#define PD_TEST_VERSION "extended-l2ork-20111130" #define PD_TEST_VERSION "extended-l2ork-20111203"
/* old name for "MSW" flag -- we have to take it for the sake of many old /* old name for "MSW" flag -- we have to take it for the sake of many old
"nmakefiles" for externs, which will define NT and not MSW */ "nmakefiles" for externs, which will define NT and not MSW */
......
...@@ -655,10 +655,11 @@ toplevel .printout ...@@ -655,10 +655,11 @@ toplevel .printout
wm title .printout "Console" wm title .printout "Console"
# initial location of the console window (+x+y) # initial location of the console window (+x+y)
wm geometry .printout +10+170 wm geometry .printout +10+170
# wm minsize .printout 460 194
wm protocol .printout WM_DELETE_WINDOW { .controls.switches.console invoke } wm protocol .printout WM_DELETE_WINDOW { .controls.switches.console invoke }
match_linux_wm [list frame .printout.frame] match_linux_wm [list frame .printout.frame]
text .printout.frame.text -relief sunken -bd 1 -font console_font \ text .printout.frame.text -relief sunken -bd 1 -font console_font \
-yscrollcommand ".printout.frame.scroll set" -width 70 -height 24 \ -yscrollcommand ".printout.frame.scroll set" -width 70 -height 24 \
-highlightthickness 0 -takefocus 0 -fg gray20 -state disabled -highlightthickness 0 -takefocus 0 -fg gray20 -state disabled
#.printout.frame.text tag configure sel -background $linux_wm_hlcolor #.printout.frame.text tag configure sel -background $linux_wm_hlcolor
...@@ -679,11 +680,11 @@ match_linux_wm [list label .printout.bar.label -text "Send Message to Pd:"] ...@@ -679,11 +680,11 @@ match_linux_wm [list label .printout.bar.label -text "Send Message to Pd:"]
pack .printout.frame.scroll -side right -fill y pack .printout.frame.scroll -side right -fill y
pack .printout.frame.text -side left -fill both -expand 1 pack .printout.frame.text -side left -fill both -expand 1
pack .printout.bar -side bottom -fill x -expand 1
pack .printout.frame -fill both -expand 1 pack .printout.frame -fill both -expand 1
pack .printout.bar -side left -fill x -expand 1
pack .printout.bar.clear -side left -padx 3 -pady 3 pack .printout.bar.clear -side left -padx 3 -pady 3
#pack .printout.bar.x -side right -padx 3 -pady 3 #pack .printout.bar.x -side right -padx 3 -pady 3
pack .printout.bar.entry -side right -fill x -expand 1 -padx 5 -pady 3 pack .printout.bar.entry -side right -fill both -expand 1 -padx 5 -pady 3
pack .printout.bar.label -side right -padx 3 -pady 3 pack .printout.bar.label -side right -padx 3 -pady 3
# the console is open by default # the console is open by default
...@@ -696,7 +697,7 @@ wm withdraw .printout ...@@ -696,7 +697,7 @@ wm withdraw .printout
bind .printout.frame.text <Button> {pdtk_update_root_edit_menu 0} bind .printout.frame.text <Button> {pdtk_update_root_edit_menu 0}
bind .printout.frame.text <<Selection>> {pdtk_update_root_edit_menu 1} bind .printout.frame.text <<Selection>> {pdtk_update_root_edit_menu 1}
bind .printout <Control-Next> {menu_raisenextwindow} bind .printout <Control-Next> {menu_raisenextwindow}
bind .printout <Control-w> { .controls.switches.console invoke } bind .printout <Control-w> { .controls.switches.console invoke }
proc pdtk_update_root_edit_menu {value} { proc pdtk_update_root_edit_menu {value} {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment