Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686

Modified Files: Tag: branch-v0-39-2-extended g_all_guis.c g_all_guis.h g_bang.c g_graph.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_template.c g_toggle.c g_vdial.c g_vslider.c g_vumeter.c s_main.c u_main.tk Log Message:

- Got everything working with Bitstream Vera Sans Mono, this should be the same size and shape on every platform, unlike Courier, which comes from many different providers.

- started cleaning up the IEMGUI properties panels, will do more

- still need to fix the sizes of the boxes. They'll probably just be pegged to a certain size in pixels so that they are guaranteed to be the same on all platforms.

Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.4 retrieving revision 1.4.12.1 diff -C2 -d -r1.4 -r1.4.12.1 *** g_toggle.c 6 Sep 2004 20:20:34 -0000 1.4 --- g_toggle.c 8 Jan 2007 02:07:16 -0000 1.4.12.1 *************** *** 62,66 **** (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xx+x->x_gui.x_ldx, yy+x->x_gui.x_ldy, --- 62,66 ---- (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xx+x->x_gui.x_ldx, yy+x->x_gui.x_ldy, *************** *** 121,125 **** t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 121,125 ---- t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 226,230 ****

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s TOGGLE \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ -----------non-zero-value:----------- %g value: 0.0 empty %g \ --- 226,230 ----

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s |tgl| \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ -----------non-zero-value:----------- %g value: 0.0 empty %g \ *************** *** 365,369 **** int a=IEM_GUI_DEFAULTSIZE, f=0; int ldx=0, ldy=-6; ! int fs=8; float on=0.0, nonzero=1.0; char str[144]; --- 365,369 ---- int a=IEM_GUI_DEFAULTSIZE, f=0; int ldx=0, ldy=-6; ! int fs=10; float on=0.0, nonzero=1.0; char str[144]; *************** *** 408,412 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } x->x_nonzero = (nonzero!=0.0)?nonzero:1.0; if(x->x_gui.x_isa.x_loadinit) --- 408,412 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } x->x_nonzero = (nonzero!=0.0)?nonzero:1.0; if(x->x_gui.x_isa.x_loadinit)

Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -C2 -d -r1.20.2.2 -r1.20.2.3 *** s_main.c 20 Dec 2006 05:54:04 -0000 1.20.2.2 --- s_main.c 8 Jan 2007 02:07:17 -0000 1.20.2.3 *************** *** 58,62 **** int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};

! char sys_font[] = "courier"; /* tb: font name */ static int sys_main_srate; static int sys_main_advance; --- 58,62 ---- int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};

! char sys_font[] = "Bitstream Vera Sans Mono"; /* tb: font name */ static int sys_main_srate; static int sys_main_advance; *************** *** 143,147 **** int sys_hostfontsize(int fontsize) { ! return (sys_findfont(fontsize)->fi_hostfontsize); }

--- 143,149 ---- int sys_hostfontsize(int fontsize) { ! // return (sys_findfont(fontsize)->fi_hostfontsize); ! return (0 - fontsize); ! // return 12; }

*************** *** 361,365 **** "-lib <file> -- load object library(s)\n", "-font <n> -- specify default font size in points\n", ! "-typeface <name> -- specify default font (default: courier)\n", "-verbose -- extra printout on startup and when searching for files\n", "-version -- don't run Pd; just print out which version it is \n", --- 363,367 ---- "-lib <file> -- load object library(s)\n", "-font <n> -- specify default font size in points\n", ! "-typeface <name> -- specify default font (default: Bitstream Vera Sans Mono)\n", "-verbose -- extra printout on startup and when searching for files\n", "-version -- don't run Pd; just print out which version it is \n",

Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -d -r1.17.2.1 -r1.17.2.2 *** u_main.tk 19 Dec 2006 05:55:44 -0000 1.17.2.1 --- u_main.tk 8 Jan 2007 02:07:17 -0000 1.17.2.2 *************** *** 173,177 ****

frame .printout ! text .printout.text -relief raised -bd 2 -font {courier 12 normal} \ -yscrollcommand ".printout.scroll set" -width 80 # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" --- 173,177 ----

frame .printout ! text .printout.text -relief raised -bd 2 -font {{Bitstream Vera Sans Mono} 12 normal} \ -yscrollcommand ".printout.scroll set" -width 80 # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" *************** *** 416,419 **** --- 416,420 ---- toplevel .help_browser -menu .mbar wm title .help_browser "Pd Documentation Browser" + wm resizable .help_browser 0 0 frame .help_browser.frame pack .help_browser.frame -side top -fill both *************** *** 1266,1270 **** -selectmode extended \ -relief solid -background white -borderwidth 1 \ ! -font [format {courier %d bold} \ $font] \ -yscrollcommand "$windowName.lb.sb set"] --- 1267,1271 ---- -selectmode extended \ -relief solid -background white -borderwidth 1 \ ! -font [format {{Bitstream Vera Sans Mono} %d normal} \ $font] \ -yscrollcommand "$windowName.lb.sb set"] *************** *** 1385,1389 **** set y [expr [lindex $bbox 1] - 4] set $lbName.entry [entry $lbName.entry \ ! -font [format {courier %d bold} $font]] $lbName.entry insert 0 [] place configure $lbName.entry -relx 0 -y $y -relwidth 1 --- 1386,1390 ---- set y [expr [lindex $bbox 1] - 4] set $lbName.entry [entry $lbName.entry \ ! -font [format {{Bitstream Vera Sans Mono} %d normal} $font]] $lbName.entry insert 0 [] place configure $lbName.entry -relx 0 -y $y -relwidth 1 *************** *** 2248,2262 **** }

! proc iemgui_toggle_font {id} { set vid [string trimleft $id .]

set var_iemgui_gn_f [concat iemgui_gn_f_$vid] global $var_iemgui_gn_f ! ! set $var_iemgui_gn_f [expr [eval concat $$var_iemgui_gn_f] + 1] ! if {[eval concat $$var_iemgui_gn_f] > 2} {set $var_iemgui_gn_f 0} ! if {[eval concat $$var_iemgui_gn_f] == 0} {$id.gnfs.fb configure -text "courier" -font {courier 10 bold}} ! if {[eval concat $$var_iemgui_gn_f] == 1} {$id.gnfs.fb configure -text "helvetica" -font {helvetica 10 bold}} ! if {[eval concat $$var_iemgui_gn_f] == 2} {$id.gnfs.fb configure -text "times" -font {times 10 bold}} }

--- 2249,2273 ---- }

! proc iemgui_toggle_font {id gn_f} { set vid [string trimleft $id .]

set var_iemgui_gn_f [concat iemgui_gn_f_$vid] global $var_iemgui_gn_f ! ! set $var_iemgui_gn_f $gn_f ! puts stderr "gn_f $var_iemgui_gn_f $gn_f" ! switch -- $gn_f { ! 0 { set current_font "Bitstream Vera Sans Mono"} ! 1 { set current_font "Helvetica" } ! 2 { set current_font "Times" } ! } ! set current_font_spec "{$current_font} 12 normal" ! puts stderr "$gn_f $current_font current: $current_font_spec" ! $id.gnfs.popup_label configure -text $current_font \ ! -font $current_font_spec ! # these act funny, they need to be debugged ! $id.gnam.ent configure -font $current_font_spec ! $id.col_example_choose.fr_bk configure -font $current_font_spec ! $id.col_example_choose.lb_bk configure -font $current_font_spec }

*************** *** 2491,2495 ****

toplevel $id ! wm title $id [format "%s-PROPERTIES" $mainheader] wm protocol $id WM_DELETE_WINDOW [concat iemgui_cancel $id]

--- 2502,2507 ----

toplevel $id ! wm title $id [format "%s Properties" $mainheader] ! wm resizable $id 0 0 wm protocol $id WM_DELETE_WINDOW [concat iemgui_cancel $id]

*************** *** 2559,2621 **** frame $id.snd pack $id.snd -side top ! label $id.snd.dummy1 -text "" -width 2 ! label $id.snd.lab -text "send-symbol:" -width 12 ! entry $id.snd.ent -textvariable $var_iemgui_snd -width 20 if { $snd != "nosndno" } { ! pack $id.snd.dummy1 $id.snd.lab $id.snd.ent -side left}

frame $id.rcv pack $id.rcv -side top ! label $id.rcv.lab -text "receive-symbol:" -width 15 ! entry $id.rcv.ent -textvariable $var_iemgui_rcv -width 20 if { $rcv != "norcvno" } { pack $id.rcv.lab $id.rcv.ent -side left}

! frame $id.gnam ! pack $id.gnam -side top ! label $id.gnam.head -text "--------------label:---------------" ! label $id.gnam.dummy1 -text "" -width 1 ! label $id.gnam.lab -text "name:" -width 6 ! entry $id.gnam.ent -textvariable $var_iemgui_gui_nam -width 29 ! label $id.gnam.dummy2 -text "" -width 1 ! pack $id.gnam.head -side top ! pack $id.gnam.dummy1 $id.gnam.lab $id.gnam.ent $id.gnam.dummy2 -side left

! frame $id.gnxy ! pack $id.gnxy -side top ! label $id.gnxy.x_lab -text "x_off:" -width 6 ! entry $id.gnxy.x_ent -textvariable $var_iemgui_gn_dx -width 5 ! label $id.gnxy.dummy1 -text " " -width 10 ! label $id.gnxy.y_lab -text "y_off:" -width 6 ! entry $id.gnxy.y_ent -textvariable $var_iemgui_gn_dy -width 5 ! pack $id.gnxy.x_lab $id.gnxy.x_ent $id.gnxy.dummy1 \ ! $id.gnxy.y_lab $id.gnxy.y_ent -side left

! frame $id.gnfs pack $id.gnfs -side top ! label $id.gnfs.f_lab -text "font:" -width 6 ! if {[eval concat $$var_iemgui_gn_f] == 0} { ! button $id.gnfs.fb -text "courier" -font {courier 10 bold} -width 7 -command "iemgui_toggle_font $id" } ! if {[eval concat $$var_iemgui_gn_f] == 1} { ! button $id.gnfs.fb -text "helvetica" -font {helvetica 10 bold} -width 7 -command "iemgui_toggle_font $id" } ! if {[eval concat $$var_iemgui_gn_f] == 2} { ! button $id.gnfs.fb -text "times" -font {times 10 bold} -width 7 -command "iemgui_toggle_font $id" } ! label $id.gnfs.dummy1 -text "" -width 1 ! label $id.gnfs.fs_lab -text "fontsize:" -width 8 entry $id.gnfs.fs_ent -textvariable $var_iemgui_gn_fs -width 5 ! pack $id.gnfs.f_lab $id.gnfs.fb $id.gnfs.dummy1 \ ! $id.gnfs.fs_lab $id.gnfs.fs_ent -side left

label $id.col_head -text "--------------colors:--------------" pack $id.col_head -side top

frame $id.col_select pack $id.col_select -side top radiobutton $id.col_select.radio0 -value 0 -variable $var_iemgui_l2_f1_b0 \ ! -text "backgd" -width 5 radiobutton $id.col_select.radio1 -value 1 -variable $var_iemgui_l2_f1_b0 \ ! -text "front" -width 5 radiobutton $id.col_select.radio2 -value 2 -variable $var_iemgui_l2_f1_b0 \ ! -text "label" -width 5 if { [eval concat $$var_iemgui_fcol] >= 0 } { pack $id.col_select.radio0 $id.col_select.radio1 $id.col_select.radio2 -side left --- 2571,2646 ---- frame $id.snd pack $id.snd -side top ! label $id.snd.lab -text " send-symbol:" -width 12 -justify right ! entry $id.snd.ent -textvariable $var_iemgui_snd -width 23 if { $snd != "nosndno" } { ! pack $id.snd.lab $id.snd.ent -side left}

frame $id.rcv pack $id.rcv -side top ! label $id.rcv.lab -text "receive-symbol:" -width 12 -justify right ! entry $id.rcv.ent -textvariable $var_iemgui_rcv -width 23 if { $rcv != "norcvno" } { pack $id.rcv.lab $id.rcv.ent -side left}

! # get the current font name from the int given from C-space (gn_f) ! set current_font "Bitstream Vera Sans Mono" ! if {[eval concat $$var_iemgui_gn_f] == 1} \ ! { set current_font "Helvetica" } ! if {[eval concat $$var_iemgui_gn_f] == 2} \ ! { set current_font "Times" }

! labelframe $id.label -borderwidth 1 -text label -padx 1 -pady 1 ! pack $id.label -side top ! frame $id.label.name ! pack $id.label.name -side top ! label $id.label.name.label -text "name:" -width 4 ! entry $id.label.name.entry -textvariable $var_iemgui_gui_nam -width 30 \ ! -font [list $current_font 12 normal] ! pack $id.label.name.label $id.label.name.entry -side left

! frame $id.label.xy ! pack $id.label.xy -side top ! label $id.label.xy.x_lab -text "x_off:" -width 6 ! entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 ! label $id.label.xy.dummy1 -text " " -width 2 ! label $id.label.xy.y_lab -text "y_off:" -width 6 ! entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 ! pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \ ! $id.label.xy.y_lab $id.label.xy.y_entry -side left ! ! frame $id.gnfs -pady 2 pack $id.gnfs -side top ! label $id.gnfs.size_label -text "size:" -width 4 entry $id.gnfs.fs_ent -textvariable $var_iemgui_gn_fs -width 5 ! label $id.gnfs.popup_label -text $current_font -width 24 -relief groove \ ! -padx 1 -pady 1 -font {$current_font 12 normal} ! pack $id.gnfs.popup_label $id.gnfs.size_label $id.gnfs.fs_ent -side left ! menu $id.popup ! $id.popup add command \ ! -label "Bitstream Vera Sans Mono" \ ! -font {{Bitstream Vera Sans Mono} 12 normal} \ ! -command "iemgui_toggle_font $id 0" ! $id.popup add command \ ! -label "Helvetica" \ ! -font {Helvetica 12 normal} \ ! -command "iemgui_toggle_font $id 1" ! $id.popup add command \ ! -label "Times" \ ! -font {Times 12 normal} \ ! -command "iemgui_toggle_font $id 2" ! bind $id.gnfs.popup_label <Button> [list tk_popup $id.popup %X %Y]

label $id.col_head -text "--------------colors:--------------" pack $id.col_head -side top

+ labelframe $id.colors -borderwidth 1 -text colors frame $id.col_select pack $id.col_select -side top radiobutton $id.col_select.radio0 -value 0 -variable $var_iemgui_l2_f1_b0 \ ! -text "background" -width 10 -justify left radiobutton $id.col_select.radio1 -value 1 -variable $var_iemgui_l2_f1_b0 \ ! -text "front" -width 5 -justify left radiobutton $id.col_select.radio2 -value 2 -variable $var_iemgui_l2_f1_b0 \ ! -text "label" -width 5 -justify left if { [eval concat $$var_iemgui_fcol] >= 0 } { pack $id.col_select.radio0 $id.col_select.radio1 $id.col_select.radio2 -side left *************** *** 2624,2647 **** frame $id.col_example_choose pack $id.col_example_choose -side top ! button $id.col_example_choose.but -text "compose color" -width 10 \ -command "iemgui_choose_col_bkfrlb $id" label $id.col_example_choose.dummy1 -text "" -width 1 if { [eval concat $$var_iemgui_fcol] >= 0 } { ! button $id.col_example_choose.fr_bk -text "o=||=o" -width 5 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ ! -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] -pady 2 } else { ! button $id.col_example_choose.fr_bk -text "o=||=o" -width 5 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ ! -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] -pady 2} ! button $id.col_example_choose.lb_bk -text "testlabel" -width 7 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ ! -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] -pady 2

pack $id.col_example_choose.but $id.col_example_choose.dummy1 \ --- 2649,2676 ---- frame $id.col_example_choose pack $id.col_example_choose -side top ! button $id.col_example_choose.but -text "compose color" -width 12 \ -command "iemgui_choose_col_bkfrlb $id" label $id.col_example_choose.dummy1 -text "" -width 1 if { [eval concat $$var_iemgui_fcol] >= 0 } { ! label $id.col_example_choose.fr_bk -text "o=||=o" -width 6 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ ! -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ ! -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge } else { ! label $id.col_example_choose.fr_bk -text "o=||=o" -width 6 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ ! -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ ! -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge ! } ! label $id.col_example_choose.lb_bk -text "test" -width 7 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ ! -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ ! -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge

pack $id.col_example_choose.but $id.col_example_choose.dummy1 \ *************** *** 2653,2686 **** frame $id.bcol pack $id.bcol -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 } hexcol { 16579836 14737632 12369084 \ ! 16572640 16572608 16579784 14220504 14220540 14476540 16308476 } { ! button $id.bcol.c$i -background [format "#%6.6x" $hexcol] \ ! -activebackground [format "#%6.6x" $hexcol] \ ! -font {courier 2 normal} -padx 7 -pady 6 \ ! -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.bcol.c0 $id.bcol.c1 $id.bcol.c2 $id.bcol.c3 $id.bcol.c4 \ ! $id.bcol.c5 $id.bcol.c6 $id.bcol.c7 $id.bcol.c8 $id.bcol.c9 -side left

frame $id.fcol pack $id.fcol -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 } hexcol { 10526880 8158332 6316128 \ ! 16525352 16559172 15263784 1370132 2684148 3952892 16003312 } { ! button $id.fcol.c$i -background [format "#%6.6x" $hexcol] \ ! -activebackground [format "#%6.6x" $hexcol] \ ! -font {courier 2 normal} -padx 7 -pady 6 \ ! -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.fcol.c0 $id.fcol.c1 $id.fcol.c2 $id.fcol.c3 $id.fcol.c4 \ ! $id.fcol.c5 $id.fcol.c6 $id.fcol.c7 $id.fcol.c8 $id.fcol.c9 -side left

frame $id.lcol pack $id.lcol -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 } hexcol { 4210752 2105376 0 \ ! 9177096 5779456 7874580 2641940 17488 5256 5767248 } { ! button $id.lcol.c$i -background [format "#%6.6x" $hexcol] \ ! -activebackground [format "#%6.6x" $hexcol] \ ! -font {courier 2 normal} -padx 7 -pady 6 \ ! -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.lcol.c0 $id.lcol.c1 $id.lcol.c2 $id.lcol.c3 $id.lcol.c4 \ ! $id.lcol.c5 $id.lcol.c6 $id.lcol.c7 $id.lcol.c8 $id.lcol.c9 -side left

--- 2682,2732 ---- frame $id.bcol pack $id.bcol -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \ ! hexcol { 16579836 14737632 12369084 16572640 16572608 \ ! 16579784 14220504 14220540 14476540 16308476 \ ! 16579784 14220504 14220540 14476540 } \ ! { ! label $id.bcol.c$i -background [format "#%6.6x" $hexcol] \ ! -activebackground [format "#%6.6x" $hexcol] -relief ridge \ ! -font {{Bitstream Vera Sans Mono} 2 normal} -padx 7 -pady 6 ! bind $id.bcol.c$i <Button> [format "iemgui_preset_col %s %d" $id $hexcol] ! } pack $id.bcol.c0 $id.bcol.c1 $id.bcol.c2 $id.bcol.c3 $id.bcol.c4 \ ! $id.bcol.c5 $id.bcol.c6 $id.bcol.c7 $id.bcol.c8 $id.bcol.c9 \ ! $id.bcol.c10 $id.bcol.c11 $id.bcol.c12 $id.bcol.c13 -side left

frame $id.fcol pack $id.fcol -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \ ! hexcol { 10526880 8158332 6316128 16525352 16559172 \ ! 15263784 1370132 2684148 3952892 16003312 \ ! 15263784 1370132 2684148 3952892 } \ ! { ! label $id.fcol.c$i -background [format "#%6.6x" $hexcol] \ ! -activebackground [format "#%6.6x" $hexcol] -relief ridge \ ! -font {{Bitstream Vera Sans Mono} 2 normal} -padx 7 -pady 6 ! bind $id.fcol.c$i <Button> \ ! [format "iemgui_preset_col %s %d" $id $hexcol] ! } pack $id.fcol.c0 $id.fcol.c1 $id.fcol.c2 $id.fcol.c3 $id.fcol.c4 \ ! $id.fcol.c5 $id.fcol.c6 $id.fcol.c7 $id.fcol.c8 $id.fcol.c9 \ ! $id.fcol.c10 $id.fcol.c11 $id.fcol.c12 $id.fcol.c13 -side left

frame $id.lcol pack $id.lcol -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \ ! hexcol { 4210752 2105376 0 9177096 5779456 \ ! 7874580 2641940 17488 5256 5767248 \ ! 7874580 2641940 17488 5256 } \ ! { ! label $id.lcol.c$i -background [format "#%6.6x" $hexcol] \ ! -activebackground [format "#%6.6x" $hexcol] -relief ridge \ ! -font {{Bitstream Vera Sans Mono} 2 normal} -padx 7 -pady 6 ! bind $id.lcol.c$i <Button> \ ! [format "iemgui_preset_col %s %d" $id $hexcol] ! } pack $id.lcol.c0 $id.lcol.c1 $id.lcol.c2 $id.lcol.c3 $id.lcol.c4 \ ! $id.lcol.c5 $id.lcol.c6 $id.lcol.c7 $id.lcol.c8 $id.lcol.c9 \ ! $id.lcol.c10 $id.lcol.c11 $id.lcol.c12 $id.lcol.c13 -side left

*************** *** 2720,2726 **** bind $id.snd.ent <KeyPress-Return> [concat iemgui_ok $id] bind $id.rcv.ent <KeyPress-Return> [concat iemgui_ok $id] ! bind $id.gnam.ent <KeyPress-Return> [concat iemgui_ok $id] ! bind $id.gnxy.x_ent <KeyPress-Return> [concat iemgui_ok $id] ! bind $id.gnxy.y_ent <KeyPress-Return> [concat iemgui_ok $id] bind $id.gnfs.fs_ent <KeyPress-Return> [concat iemgui_ok $id] bind $id.cao.ok <KeyPress-Return> [concat iemgui_ok $id] --- 2766,2772 ---- bind $id.snd.ent <KeyPress-Return> [concat iemgui_ok $id] bind $id.rcv.ent <KeyPress-Return> [concat iemgui_ok $id] ! bind $id.label.name.entry <KeyPress-Return> [concat iemgui_ok $id] ! bind $id.label.xy.x_entry <KeyPress-Return> [concat iemgui_ok $id] ! bind $id.label.xy.y_entry <KeyPress-Return> [concat iemgui_ok $id] bind $id.gnfs.fs_ent <KeyPress-Return> [concat iemgui_ok $id] bind $id.cao.ok <KeyPress-Return> [concat iemgui_ok $id] *************** *** 2732,2738 **** pdtk_standardkeybindings $id.snd.ent pdtk_standardkeybindings $id.rcv.ent ! pdtk_standardkeybindings $id.gnam.ent ! pdtk_standardkeybindings $id.gnxy.x_ent ! pdtk_standardkeybindings $id.gnxy.y_ent pdtk_standardkeybindings $id.gnfs.fs_ent pdtk_standardkeybindings $id.cao.ok --- 2778,2784 ---- pdtk_standardkeybindings $id.snd.ent pdtk_standardkeybindings $id.rcv.ent ! pdtk_standardkeybindings $id.label.name.entry ! pdtk_standardkeybindings $id.label.xy.x_entry ! pdtk_standardkeybindings $id.label.xy.y_entry pdtk_standardkeybindings $id.gnfs.fs_ent pdtk_standardkeybindings $id.cao.ok *************** *** 3207,3222 **** ############ pdtk_text_new -- create a new text object #2########### proc pdtk_text_new {canvasname myname x y text font color} { ! # if {$font < 13} {set fontname [format {courier %d bold} $font]} ! # if {$font >= 13} {set fontname [format {courier %d normal} $font]}

global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7 switch -- $font { ! 8 { set typeface $pd_font1 } ! 10 { set typeface $pd_font2 } ! 12 { set typeface $pd_font3 } ! 14 { set typeface $pd_font4 } ! 16 { set typeface $pd_font5 } ! 24 { set typeface $pd_font6 } ! 36 { set typeface $pd_font7 } }

--- 3253,3268 ---- ############ pdtk_text_new -- create a new text object #2########### proc pdtk_text_new {canvasname myname x y text font color} { ! # if {$font < 13} {set fontname [format {{Bitstream Vera Sans Mono} %d normal} $font]} ! # if {$font >= 13} {set fontname [format {{Bitstream Vera Sans Mono} %d normal} $font]}

global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7 switch -- $font { ! -8 { set typeface $pd_font1 } ! -10 { set typeface $pd_font2 } ! -12 { set typeface $pd_font3 } ! -14 { set typeface $pd_font4 } ! -16 { set typeface $pd_font5 } ! -24 { set typeface $pd_font6 } ! -36 { set typeface $pd_font7 } }

*************** *** 3261,3271 **** global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7

! set pd_font1 [format {%s 8 bold} $fontname] ! set pd_font2 [format {%s 10 bold} $fontname] ! set pd_font3 [format {%s 12 bold} $fontname] ! set pd_font4 [format {%s 14 bold} $fontname] ! set pd_font5 [format {%s 16 bold} $fontname] ! set pd_font6 [format {%s 24 bold} $fontname] ! set pd_font7 [format {%s 36 bold} $fontname]

set width1 [font measure $pd_font1 x] --- 3307,3317 ---- global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7

! set pd_font1 [format {{%s} -8 normal} $fontname] ! set pd_font2 [format {{%s} -10 normal} $fontname] ! set pd_font3 [format {{%s} -12 normal} $fontname] ! set pd_font4 [format {{%s} -14 normal} $fontname] ! set pd_font5 [format {{%s} -16 normal} $fontname] ! set pd_font6 [format {{%s} -24 normal} $fontname] ! set pd_font7 [format {{%s} -36 normal} $fontname]

set width1 [font measure $pd_font1 x]

Index: g_vdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** g_vdial.c 16 Aug 2005 04:06:28 -0000 1.5 --- g_vdial.c 8 Jan 2007 02:07:16 -0000 1.5.2.1 *************** *** 76,80 **** } sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 76,80 ---- } sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 142,146 **** int n=x->x_number, i;

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 142,146 ---- int n=x->x_number, i;

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 266,270 **** if(pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class) hchange = x->x_change; ! sprintf(buf, "pdtk_iemgui_dialog %%s vradio \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ empty 0.0 empty 0.0 empty %d \ --- 266,270 ---- if(pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class) hchange = x->x_change; ! sprintf(buf, "pdtk_iemgui_dialog %%s |vradio| \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ empty 0.0 empty 0.0 empty %d \ *************** *** 552,556 **** int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; int ldx=0, ldy=-6, chg=1, num=8; ! int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; --- 552,556 ---- int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; int ldx=0, ldy=-6, chg=1, num=8; ! int fs=10; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; *************** *** 591,595 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if(num < 1) num = 1; --- 591,595 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if(num < 1) num = 1;

Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** g_all_guis.c 16 Aug 2005 04:06:28 -0000 1.8 --- g_all_guis.c 8 Jan 2007 02:07:16 -0000 1.8.2.1 *************** *** 435,439 **** { f = 0; ! strcpy(iemgui->x_font, "courier"); } iemgui->x_fsf.x_font_style = f; --- 435,439 ---- { f = 0; ! strcpy(iemgui->x_font, "Bitstream Vera Sans Mono"); } iemgui->x_fsf.x_font_style = f; *************** *** 443,447 **** iemgui->x_fontsize = f; if(glist_isvisible(iemgui->x_glist)) ! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold}\n", glist_getcanvas(iemgui->x_glist), x, iemgui->x_font, iemgui->x_fontsize); } --- 443,447 ---- iemgui->x_fontsize = f; if(glist_isvisible(iemgui->x_glist)) ! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal}\n", glist_getcanvas(iemgui->x_glist), x, iemgui->x_font, iemgui->x_fontsize); } *************** *** 619,623 **** { f = 0; ! strcpy(iemgui->x_font, "courier"); } iemgui->x_fsf.x_font_style = f; --- 619,623 ---- { f = 0; ! strcpy(iemgui->x_font, "Bitstream Vera Sans Mono"); } iemgui->x_fsf.x_font_style = f;

Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.5 retrieving revision 1.5.14.1 diff -C2 -d -r1.5 -r1.5.14.1 *** g_mycanvas.c 6 Sep 2004 20:20:34 -0000 1.5 --- g_mycanvas.c 8 Jan 2007 02:07:16 -0000 1.5.14.1 *************** *** 45,49 **** x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 45,49 ---- x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 85,89 **** sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_bcol); ! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); --- 85,89 ---- sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_bcol); ! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); *************** *** 153,157 ****

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s MY_CANVAS \ ------selectable_dimensions(pix):------ %d %d size: 0.0 0.0 empty \ ------visible_rectangle(pix)(pix):------ %d width: %d height: %d \ --- 153,157 ----

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s |cnv| \ ------selectable_dimensions(pix):------ %d %d size: 0.0 0.0 empty \ ------visible_rectangle(pix)(pix):------ %d width: %d height: %d \ *************** *** 332,336 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); --- 332,336 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);

Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** g_all_guis.h 16 Aug 2005 04:06:28 -0000 1.5 --- g_all_guis.h 8 Jan 2007 02:07:16 -0000 1.5.4.1 *************** *** 145,149 **** int x_ldx; int x_ldy; ! char x_font[16]; t_iem_fstyle_flags x_fsf; int x_fontsize; --- 145,149 ---- int x_ldx; int x_ldy; ! char x_font[MAXPDSTRING]; /* font names can be long! */ t_iem_fstyle_flags x_fsf; int x_fontsize;

Index: g_vslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** g_vslider.c 16 Aug 2005 04:06:28 -0000 1.5 --- g_vslider.c 8 Jan 2007 02:07:17 -0000 1.5.2.1 *************** *** 60,64 **** xpos + x->x_gui.x_w, r, x->x_gui.x_fcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 60,64 ---- xpos + x->x_gui.x_w, r, x->x_gui.x_fcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 123,127 **** t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 123,127 ---- t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 278,282 **** iemgui_properties(&x->x_gui, srl);

! sprintf(buf, "pdtk_iemgui_dialog %%s VSLIDER \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ -----------output-range:----------- %g bottom: %g top: %d \ --- 278,282 ---- iemgui_properties(&x->x_gui, srl);

! sprintf(buf, "pdtk_iemgui_dialog %%s |vsl| \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ -----------output-range:----------- %g bottom: %g top: %d \ *************** *** 509,513 **** int w=IEM_GUI_DEFAULTSIZE, h=IEM_SL_DEFAULTSIZE; int lilo=0, f=0, ldx=0, ldy=-8; ! int fs=8, v=0, steady=1; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; --- 509,513 ---- int w=IEM_GUI_DEFAULTSIZE, h=IEM_SL_DEFAULTSIZE; int lilo=0, f=0, ldx=0, ldy=-8; ! int fs=10, v=0, steady=1; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; *************** *** 563,567 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); x->x_gui.x_ldx = ldx; --- 563,567 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); x->x_gui.x_ldx = ldx;

Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** g_graph.c 19 Dec 2006 05:55:44 -0000 1.9.2.1 --- g_graph.c 8 Jan 2007 02:07:16 -0000 1.9.2.2 *************** *** 748,752 **** t_symbol *s = garray_getname((t_garray *)g); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw\ ! -font {courier %d bold} -tags %s\n", (long)glist_getcanvas(x), x1, ymin, s->s_name, sys_hostfontsize(glist_getfont(x)), tag); --- 748,752 ---- t_symbol *s = garray_getname((t_garray *)g); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw\ ! -font {{Bitstream Vera Sans Mono} %d normal} -tags %s\n", (long)glist_getcanvas(x), x1, ymin, s->s_name, sys_hostfontsize(glist_getfont(x)), tag); *************** *** 830,834 **** for (i = 0; i < x->gl_nxlabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -text {%s} -font {courier %d bold} -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)), --- 830,834 ---- for (i = 0; i < x->gl_nxlabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -text {%s} -font {{Bitstream Vera Sans Mono} %d normal} -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)), *************** *** 839,843 **** for (i = 0; i < x->gl_nylabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -text {%s} -font {courier %d bold} -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, x->gl_ylabelx), --- 839,843 ---- for (i = 0; i < x->gl_nylabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -text {%s} -font {{Bitstream Vera Sans Mono} %d normal} -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, x->gl_ylabelx),

Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** g_vumeter.c 16 Aug 2005 04:06:28 -0000 1.5 --- g_vumeter.c 8 Jan 2007 02:07:17 -0000 1.5.4.1 *************** *** 117,121 **** if(((i+2)&3) && (x->x_scale)) sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); --- 117,121 ---- if(((i+2)&3) && (x->x_scale)) sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); *************** *** 126,130 **** yyy = k4 + k1*(k2-i); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); --- 126,130 ---- yyy = k4 + k1*(k2-i); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); *************** *** 137,141 **** mid, ypos+10, x->x_led_size, x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 137,141 ---- mid, ypos+10, x->x_led_size, x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 275,279 **** x->x_led_size); if(((i+2)&3) && (x->x_scale)) ! sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {%s %d bold} -fill #%6.6x\n", canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); --- 275,279 ---- x->x_led_size); if(((i+2)&3) && (x->x_scale)) ! sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d normal} -fill #%6.6x\n", canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); *************** *** 282,290 **** { i=IEM_VU_STEPS+1; ! sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {%s %d bold} -fill #%6.6x\n", canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); } ! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 282,290 ---- { i=IEM_VU_STEPS+1; ! sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d normal} -fill #%6.6x\n", canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); } ! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 477,481 **** if((i+2)&3) sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); --- 477,481 ---- if((i+2)&3) sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); *************** *** 484,488 **** yyy = k4 + k1*(k2-i); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); --- 484,488 ---- yyy = k4 + k1*(k2-i); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxSCALE%d\n", canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x, i); *************** *** 498,502 ****

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s VU-METER \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ empty 0.0 empty 0.0 empty %d \ --- 498,502 ----

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s |vu| \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ empty 0.0 empty 0.0 empty %d \ *************** *** 628,632 **** int bflcol[]={-66577, -1, -1}; int w=IEM_GUI_DEFAULTSIZE, h=IEM_VU_STEPS*IEM_VU_DEFAULTSIZE; ! int ldx=-1, ldy=-8, f=0, fs=8, scale=1; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; --- 628,632 ---- int bflcol[]={-66577, -1, -1}; int w=IEM_GUI_DEFAULTSIZE, h=IEM_VU_STEPS*IEM_VU_DEFAULTSIZE; ! int ldx=-1, ldy=-8, f=0, fs=10, scale=1; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; *************** *** 668,672 **** strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); --- 668,672 ---- strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);

Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** g_hdial.c 16 Aug 2005 04:06:28 -0000 1.6 --- g_hdial.c 8 Jan 2007 02:07:16 -0000 1.6.2.1 *************** *** 74,78 **** } sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 74,78 ---- } sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 142,146 **** int n=x->x_number, i;

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 142,146 ---- int n=x->x_number, i;

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 265,269 **** if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) hchange = x->x_change; ! sprintf(buf, "pdtk_iemgui_dialog %%s hradio \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ empty 0.0 empty 0.0 empty %d \ --- 265,269 ---- if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) hchange = x->x_change; ! sprintf(buf, "pdtk_iemgui_dialog %%s |hradio| \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ empty 0.0 empty 0.0 empty %d \ *************** *** 548,552 **** int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; int ldx=0, ldy=-6, chg=1, num=8; ! int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; --- 548,552 ---- int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; int ldx=0, ldy=-6, chg=1, num=8; ! int fs=10; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; *************** *** 590,594 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if(num < 1) num = 1; --- 590,594 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if(num < 1) num = 1;

Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** g_hslider.c 16 Aug 2005 04:06:28 -0000 1.5 --- g_hslider.c 8 Jan 2007 02:07:16 -0000 1.5.2.1 *************** *** 77,81 **** ypos + x->x_gui.x_h, x->x_gui.x_fcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, --- 77,81 ---- ypos + x->x_gui.x_h, x->x_gui.x_fcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, *************** *** 137,141 **** t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 137,141 ---- t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 286,290 ****

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s HSLIDER \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ -----------output-range:----------- %g left: %g right: %g \ --- 286,290 ----

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s |hsl| \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ -----------output-range:----------- %g left: %g right: %g \ *************** *** 528,532 **** int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; int lilo=0, ldx=-2, ldy=-6, f=0, v=0, steady=1; ! int fs=8; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; --- 528,532 ---- int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; int lilo=0, ldx=-2, ldy=-6, f=0, v=0, steady=1; ! int fs=10; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; *************** *** 587,591 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); --- 587,591 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);

Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.4 retrieving revision 1.4.12.1 diff -C2 -d -r1.4 -r1.4.12.1 *** g_bang.c 6 Sep 2004 20:20:33 -0000 1.4 --- g_bang.c 8 Jan 2007 02:07:16 -0000 1.4.12.1 *************** *** 56,60 **** x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, --- 56,60 ---- x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, *************** *** 116,120 **** t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, --- 116,120 ---- t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, *************** *** 238,242 ****

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s BANG \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ --------flash-time(ms)(ms):--------- %d intrrpt: %d hold: %d \ --- 238,242 ----

iemgui_properties(&x->x_gui, srl); ! sprintf(buf, "pdtk_iemgui_dialog %%s |bang| \ ----------dimensions(pix):----------- %d %d size: 0 0 empty \ --------flash-time(ms)(ms):--------- %d intrrpt: %d hold: %d \ *************** *** 435,439 **** int a=IEM_GUI_DEFAULTSIZE; int ldx=0, ldy=-6; ! int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; --- 435,439 ---- int a=IEM_GUI_DEFAULTSIZE; int ldx=0, ldy=-6; ! int fs=10; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; *************** *** 482,486 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); }

if (x->x_gui.x_fsf.x_rcv_able) --- 482,486 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); }

if (x->x_gui.x_fsf.x_rcv_able)

Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** g_numbox.c 16 Aug 2005 04:06:28 -0000 1.7 --- g_numbox.c 8 Jan 2007 02:07:16 -0000 1.7.2.1 *************** *** 196,200 **** x->x_gui.x_fcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 196,200 ---- x->x_gui.x_fcol, x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 202,206 **** my_numbox_ftoa(x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %lxNUMBER\n", canvas, xpos+half+2, ypos+half+d, x->x_buf, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fcol, x); --- 202,206 ---- my_numbox_ftoa(x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ ! -font {{%s} %d normal} -fill #%6.6x -tags %lxNUMBER\n", canvas, xpos+half+2, ypos+half+d, x->x_buf, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fcol, x); *************** *** 270,278 **** t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%lx.c itemconfigure %lxNUMBER -font {%s %d bold} -fill #%6.6x \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); --- 270,278 ---- t_canvas *canvas=glist_getcanvas(glist);

! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d normal} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%lx.c itemconfigure %lxNUMBER -font {{%s} %d normal} -fill #%6.6x \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); *************** *** 452,456 ****

} ! sprintf(buf, "pdtk_iemgui_dialog %%s NUMBERBOX \ -------dimensions(digits)(pix):------- %d %d width: %d %d height: \ -----------output-range:----------- %g min: %g max: %d \ --- 452,456 ----

} ! sprintf(buf, "pdtk_iemgui_dialog %%s |nbx| \ -------dimensions(digits)(pix):------- %d %d width: %d %d height: \ -----------output-range:----------- %g min: %g max: %d \ *************** *** 807,811 **** else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "courier"); } if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); --- 807,811 ---- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; ! strcpy(x->x_gui.x_font, "Bitstream Vera Sans Mono"); } if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);

Index: g_template.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_template.c,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** g_template.c 19 Dec 2006 05:55:44 -0000 1.13.2.1 --- g_template.c 8 Jan 2007 02:07:16 -0000 1.13.2.2 *************** *** 2091,2095 **** sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", glist_getcanvas(glist), xloc, yloc, colorstring, buf); ! sys_vgui(" -font {courier %d bold}", sys_hostfontsize(glist_getfont(glist))); sys_vgui(" -tags drawnumber%lx\n", data); --- 2091,2095 ---- sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", glist_getcanvas(glist), xloc, yloc, colorstring, buf); ! sys_vgui(" -font {{Bitstream Vera Sans Mono} %d normal}", sys_hostfontsize(glist_getfont(glist))); sys_vgui(" -tags drawnumber%lx\n", data);