Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26359
Modified Files:
Tag: branch-v0-39-2-extended
g_all_guis.c 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 m_pd.h s_inter.c s_main.c u_main.tk
Log Message:
* created -weight flag to set the font weight throughout, including iemguis
* set up some Tcl/Tk font aliases for the fonts for the console, text window,
and properties panel highlight text.
* set Mac OS X to default to Monaco instead of Bitstream Vera Sans Mono since
it is installed on every Mac OS X machine and is quite close to Vera Sans
Mono. Plus I think Monaco looks better. (Perhaps Windows should default to
Lucida Console, since I think all Windows machines come with that font).
Index: g_toggle.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v
retrieving revision 1.4.12.2
retrieving revision 1.4.12.3
diff -C2 -d -r1.4.12.2 -r1.4.12.3
*** g_toggle.c 28 Jan 2007 21:51:55 -0000 1.4.12.2
--- g_toggle.c 19 May 2007 05:29:33 -0000 1.4.12.3
***************
*** 62,70 ****
(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,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
--- 62,71 ----
(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 %s} -fill #%6.6x -tags %lxLABEL\n",
canvas, xx+x->x_gui.x_ldx,
yy+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
***************
*** 121,126 ****
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:"");
--- 122,127 ----
t_canvas *canvas=glist_getcanvas(glist);
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -C2 -d -r1.20.2.6 -r1.20.2.7
*** s_main.c 15 May 2007 04:58:58 -0000 1.20.2.6
--- s_main.c 19 May 2007 05:29:33 -0000 1.20.2.7
***************
*** 58,62 ****
--- 58,67 ----
int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
+ #ifdef __APPLE__
+ char sys_font[] = "Monaco"; /* tb: font name */
+ #else
char sys_font[] = "Bitstream Vera Sans Mono"; /* tb: font name */
+ #endif
+ char sys_fontweight[] = "normal"; /* currently only used for iemguis */
static int sys_main_srate;
static int sys_main_advance;
***************
*** 361,365 ****
"-lib <file> -- load object library(s)\n",
"-font <n> -- specify default font size in points\n",
! "-typeface <name> -- specify default font (default: DejaVu Sans)\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",
--- 366,371 ----
"-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",
! "-weight <name> -- specify default font weight (normal, bold, etc.)\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",
***************
*** 727,730 ****
--- 733,742 ----
argv += 2;
}
+ else if (!strcmp(*argv, "-weight") && argc > 1)
+ {
+ strcpy(sys_fontweight,*(argv+1));
+ argc -= 2;
+ argv += 2;
+ }
/* } tb */
else if (!strcmp(*argv, "-verbose"))
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.11
retrieving revision 1.17.2.12
diff -C2 -d -r1.17.2.11 -r1.17.2.12
*** u_main.tk 17 May 2007 03:50:48 -0000 1.17.2.11
--- u_main.tk 19 May 2007 05:29:34 -0000 1.17.2.12
***************
*** 1,3 ****
--- 1,14 ----
#!/usr/bin/wish
+ # Copyright (c) 1997-1999 Miller Puckette.
+ # For information on usage and redistribution, and for a DISCLAIMER OF ALL
+ # WARRANTIES, see the file, "LICENSE.txt," in this distribution.
+
+ # changed by Thomas Musil 09.2001
+ # between "pdtk_graph_dialog -- dialog window for graphs"
+ # and "pdtk_array_dialog -- dialog window for arrays"
+ # a new dialogbox was inserted, named:
+ # "pdtk_iemgui_dialog -- dialog window for iem guis"
+ #
+ # all this changes are labeled with #######iemlib##########
# set pd_nt (bad name) 0 for unix, 1 for microsoft, and 2 for Mac OSX.
***************
*** 11,30 ****
}
# Pd-0.39.2-extended hacks to make font/box sizes the same across platform
puts stderr "tk scaling is [tk scaling]"
tk scaling 1
! # Copyright (c) 1997-1999 Miller Puckette.
! # For information on usage and redistribution, and for a DISCLAIMER OF ALL
! # WARRANTIES, see the file, "LICENSE.txt," in this distribution.
- # changed by Thomas Musil 09.2001
- # between "pdtk_graph_dialog -- dialog window for graphs"
- # and "pdtk_array_dialog -- dialog window for arrays"
- # a new dialogbox was inserted, named:
- # "pdtk_iemgui_dialog -- dialog window for iem guis"
- #
- # all this changes are labeled with #######iemlib##########
# Tearoff is set to true by default:
--- 22,50 ----
}
+ # start Pd-extended font hacks -----------------------------
+
# Pd-0.39.2-extended hacks to make font/box sizes the same across platform
puts stderr "tk scaling is [tk scaling]"
tk scaling 1
+ if { $tcl_platform(os) == "Darwin" } {
+ # Mac OS X
+ # set defaultFontFamily Monaco
+ set defaultFontFamily {Bitstream Vera Sans Mono}
+ } else {
+ # all other platforms
+ set defaultFontFamily {Bitstream Vera Sans Mono}
+ }
+ # this font is for the Pd Window console text
+ font create consoleFont -family $defaultFontFamily -size 12 -weight normal
! # this font is for text in Pd windows
! font create textFont -family {Times} -size 14 -weight normal
!
! # for text in Properties Panels and other panes
! font create highlightFont -family $defaultFontFamily -size 14 -weight bold
!
! # end Pd-extended font hacks -----------------------------
# Tearoff is set to true by default:
***************
*** 187,191 ****
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"
--- 207,211 ----
frame .printout
! text .printout.text -relief raised -bd 2 -font consoleFont \
-yscrollcommand ".printout.scroll set" -width 80
# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
***************
*** 370,374 ****
set name [format ".help%d" $doc_number]
toplevel $name
! text $name.text -relief raised -bd 2 -font {times 14 normal} \
-yscrollcommand "$name.scroll set" -background white
scrollbar $name.scroll -command "$name.text yview"
--- 390,394 ----
set name [format ".help%d" $doc_number]
toplevel $name
! text $name.text -relief raised -bd 2 -font textFont \
-yscrollcommand "$name.scroll set" -background white
scrollbar $name.scroll -command "$name.text yview"
***************
*** 1280,1283 ****
--- 1300,1304 ----
global pd_array_listview_page
global pd_array_listview_id
+ global fontweight
set pd_array_listview_page($arrayName) $page
set pd_array_listview_id($arrayName) $id
***************
*** 1293,1298 ****
-selectmode extended \
-relief solid -background white -borderwidth 1 \
! -font [format {{Bitstream Vera Sans Mono} %d normal} \
! $font] \
-yscrollcommand "$windowName.lb.sb set"]
set $windowName.lb.sb [scrollbar $windowName.lb.sb \
--- 1314,1319 ----
-selectmode extended \
-relief solid -background white -borderwidth 1 \
! -font [format {{Bitstream Vera Sans Mono} %d \
! %s} $font $fontweight] \
-yscrollcommand "$windowName.lb.sb set"]
set $windowName.lb.sb [scrollbar $windowName.lb.sb \
***************
*** 1398,1401 ****
--- 1419,1423 ----
global pd_array_listview_entry
global pd_nt
+ global fontweight
set lbName [format ".%sArrayWindow.lb" $arrayName]
if {[winfo exists $lbName.entry]} {
***************
*** 1409,1413 ****
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
--- 1431,1435 ----
set y [expr [lindex $bbox 1] - 4]
set $lbName.entry [entry $lbName.entry \
! -font [format {{Bitstream Vera Sans Mono} %d %s} $font $fontweight]]
$lbName.entry insert 0 []
place configure $lbName.entry -relx 0 -y $y -relwidth 1
***************
*** 1989,1993 ****
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
! -font {{Bitstream Vera Sans Mono} 12 bold}
pack $id.s_r -side top -fill x
frame $id.s_r.paramsymto
--- 2011,2015 ----
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
! -font highlightFont
pack $id.s_r -side top -fill x
frame $id.s_r.paramsymto
***************
*** 2288,2291 ****
--- 2310,2314 ----
set var_iemgui_gn_f [concat iemgui_gn_f_$vid]
global $var_iemgui_gn_f
+ global fontweight
set $var_iemgui_gn_f $gn_f
***************
*** 2296,2300 ****
2 { set current_font "Times" }
}
! set current_font_spec "{$current_font} 12 normal"
$id.label.fontpopup_label configure -text $current_font \
--- 2319,2323 ----
2 { set current_font "Times" }
}
! set current_font_spec "{$current_font} 12 $fontweight"
$id.label.fontpopup_label configure -text $current_font \
***************
*** 2449,2452 ****
--- 2472,2476 ----
global pd_nt
+ global fontweight
set var_iemgui_wdt [concat iemgui_wdt_$vid]
***************
*** 2604,2609 ****
pack $id.spacer0 -side top
! labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \
! -font {{Bitstream Vera Sans Mono} 12 bold}
pack $id.s_r -side top -fill x -ipadx 5
frame $id.s_r.send
--- 2628,2632 ----
pack $id.spacer0 -side top
! labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" -font highlightFont
pack $id.s_r -side top -fill x -ipadx 5
frame $id.s_r.send
***************
*** 2632,2639 ****
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! -font {{Bitstream Vera Sans Mono} 12 bold}
pack $id.label -side top -fill x
entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \
! -font [list $current_font 12 normal]
pack $id.label.name_entry -side top -expand yes -fill both -padx 5
--- 2655,2662 ----
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! -font highlightFont
pack $id.label -side top -fill x
entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \
! -font [list $current_font 12 $fontweight]
pack $id.label.name_entry -side top -expand yes -fill both -padx 5
***************
*** 2649,2653 ****
label $id.label.fontpopup_label -text $current_font \
! -relief groove -font {$current_font 12 normal} -padx 5
pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x
label $id.label.fontsize_label -text "size" -width 4
--- 2672,2676 ----
label $id.label.fontpopup_label -text $current_font \
! -relief groove -font [list $current_font 12 $fontweight] -padx 5
pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x
label $id.label.fontsize_label -text "size" -width 4
***************
*** 2658,2670 ****
$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.label.fontpopup_label <Button> \
--- 2681,2693 ----
$id.popup add command \
-label "Bitstream Vera Sans Mono" \
! -font [format {{Bitstream Vera Sans Mono} 12 %s} $fontweight] \
-command "iemgui_toggle_font $id 0"
$id.popup add command \
-label "Helvetica" \
! -font [format {Helvetica 12 %s} $fontweight] \
-command "iemgui_toggle_font $id 1"
$id.popup add command \
-label "Times" \
! -font [format {Times 12 %s} $fontweight] \
-command "iemgui_toggle_font $id 2"
bind $id.label.fontpopup_label <Button> \
***************
*** 2674,2679 ****
pack $id.spacer2 -side top
! labelframe $id.colors -borderwidth 1 -text "colors" \
! -font {{Bitstream Vera Sans Mono} 12 bold}
pack $id.colors -fill x -ipadx 5 -ipady 4
--- 2697,2701 ----
pack $id.spacer2 -side top
! labelframe $id.colors -borderwidth 1 -text "colors" -font highlightFont
pack $id.colors -fill x -ipadx 5 -ipady 4
***************
*** 2705,2709 ****
-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.colors.sections.fr_bk -text "o=||=o" -width 6 \
--- 2727,2731 ----
-foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \
-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \
! -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge
} else {
label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \
***************
*** 2712,2716 ****
-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.colors.sections.lb_bk -text "testlabel" -width 9 \
--- 2734,2738 ----
-foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge
}
label $id.colors.sections.lb_bk -text "testlabel" -width 9 \
***************
*** 2719,2723 ****
-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.colors.sections.lb_bk $id.colors.sections.fr_bk \
-side right -anchor e -expand yes -fill both -pady 7
--- 2741,2745 ----
-foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
! -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge
pack $id.colors.sections.lb_bk $id.colors.sections.fr_bk \
-side right -anchor e -expand yes -fill both -pady 7
***************
*** 3341,3358 ****
# tb: user defined typefaces
! proc pdtk_pd_startup {apilist midiapilist fontname} {
# puts stderr [concat $apilist $midiapilist $fontname]
! global pd_apilist pd_midiapilist
set pd_apilist $apilist
set pd_midiapilist $midiapilist
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]
--- 3363,3382 ----
# tb: user defined typefaces
! proc pdtk_pd_startup {apilist midiapilist fontname fontweight_from_pd} {
# puts stderr [concat $apilist $midiapilist $fontname]
! global pd_apilist pd_midiapilist
set pd_apilist $apilist
set pd_midiapilist $midiapilist
global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7
+ global fontweight
+ set fontweight $fontweight_from_pd
! set pd_font1 [format {{%s} -8 %s} $fontname $fontweight]
! set pd_font2 [format {{%s} -10 %s} $fontname $fontweight]
! set pd_font3 [format {{%s} -12 %s} $fontname $fontweight]
! set pd_font4 [format {{%s} -14 %s} $fontname $fontweight]
! set pd_font5 [format {{%s} -16 %s} $fontname $fontweight]
! set pd_font6 [format {{%s} -24 %s} $fontname $fontweight]
! set pd_font7 [format {{%s} -36 %s} $fontname $fontweight]
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.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** g_vdial.c 28 Jan 2007 21:50:54 -0000 1.5.2.2
--- g_vdial.c 19 May 2007 05:29:33 -0000 1.5.2.3
***************
*** 76,83 ****
}
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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize,
x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
--- 76,83 ----
}
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
***************
*** 142,147 ****
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,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
--- 142,147 ----
int n=x->x_number, i;
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** g_all_guis.c 28 Jan 2007 21:50:53 -0000 1.8.2.2
--- g_all_guis.c 19 May 2007 05:29:33 -0000 1.8.2.3
***************
*** 443,448 ****
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);
}
--- 443,449 ----
iemgui->x_fontsize = f;
if(glist_isvisible(iemgui->x_glist))
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s}\n",
! glist_getcanvas(iemgui->x_glist), x, iemgui->x_font,
! iemgui->x_fontsize, sys_fontweight);
}
Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -d -r1.14.2.2 -r1.14.2.3
*** s_inter.c 28 Jan 2007 21:50:54 -0000 1.14.2.2
--- s_inter.c 19 May 2007 05:29:33 -0000 1.14.2.3
***************
*** 1248,1252 ****
sys_get_audio_apis(buf);
sys_get_midi_apis(buf2);
! sys_vgui("pdtk_pd_startup %s %s {%s}\n", buf, buf2, sys_font);
}
return (0);
--- 1248,1253 ----
sys_get_audio_apis(buf);
sys_get_midi_apis(buf2);
! sys_vgui("pdtk_pd_startup %s %s {%s} %s\n", buf, buf2, sys_font,
! sys_fontweight);
}
return (0);
Index: g_mycanvas.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v
retrieving revision 1.5.14.2
retrieving revision 1.5.14.3
diff -C2 -d -r1.5.14.2 -r1.5.14.3
*** g_mycanvas.c 28 Jan 2007 21:50:53 -0000 1.5.14.2
--- g_mycanvas.c 19 May 2007 05:29:33 -0000 1.5.14.3
***************
*** 45,52 ****
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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
}
--- 45,53 ----
x->x_gui.x_bcol, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
}
***************
*** 85,90 ****
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:"");
}
--- 86,92 ----
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 %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
}
Index: m_pd.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -d -r1.8.2.5 -r1.8.2.6
*** m_pd.h 15 Apr 2007 02:49:54 -0000 1.8.2.5
--- m_pd.h 19 May 2007 05:29:33 -0000 1.8.2.6
***************
*** 367,371 ****
char *result,int resultsize);
EXTERN t_symbol *canvas_getdir(t_glist *x);
! extern char sys_font[]; /* default typeface set in s_main.c */
EXTERN int sys_fontwidth(int fontsize);
EXTERN int sys_fontheight(int fontsize);
--- 367,372 ----
char *result,int resultsize);
EXTERN t_symbol *canvas_getdir(t_glist *x);
! EXTERN char sys_font[]; /* default typeface set in s_main.c */
! EXTERN char sys_fontweight[]; /* default font weight set in s_main.c */
EXTERN int sys_fontwidth(int fontsize);
EXTERN int sys_fontheight(int fontsize);
Index: g_vslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** g_vslider.c 28 Jan 2007 21:51:55 -0000 1.5.2.2
--- g_vslider.c 19 May 2007 05:29:33 -0000 1.5.2.3
***************
*** 60,67 ****
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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
--- 60,68 ----
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 %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
***************
*** 123,128 ****
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:"");
--- 124,129 ----
t_canvas *canvas=glist_getcanvas(glist);
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
Index: g_graph.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -d -r1.9.2.4 -r1.9.2.5
*** g_graph.c 22 Feb 2007 04:52:19 -0000 1.9.2.4
--- g_graph.c 19 May 2007 05:29:33 -0000 1.9.2.5
***************
*** 748,754 ****
t_symbol *s = garray_getname((t_garray *)g);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw\
! -font {{%s} %d normal} -tags %s\n",
(long)glist_getcanvas(x), x1, ymin, s->s_name, sys_font,
! sys_hostfontsize(glist_getfont(x)), tag);
}
--- 748,754 ----
t_symbol *s = garray_getname((t_garray *)g);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw\
! -font {{%s} %d %s} -tags %s\n",
(long)glist_getcanvas(x), x1, ymin, s->s_name, sys_font,
! sys_hostfontsize(glist_getfont(x)), sys_fontweight, tag);
}
***************
*** 830,848 ****
for (i = 0; i < x->gl_nxlabels; i++)
sys_vgui(".x%lx.c create text\
! %d %d -text {%s} -font {{%s} %d normal} -tags %s\n",
glist_getcanvas(x),
(int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)),
(int)glist_ytopixels(x, x->gl_xlabely),
! x->gl_xlabel[i]->s_name, sys_font, glist_getfont(x), tag);
/* draw y labels */
for (i = 0; i < x->gl_nylabels; i++)
sys_vgui(".x%lx.c create text\
! %d %d -text {%s} -font {{%s} %d normal} -tags %s\n",
glist_getcanvas(x),
(int)glist_xtopixels(x, x->gl_ylabelx),
(int)glist_ytopixels(x, atof(x->gl_ylabel[i]->s_name)),
x->gl_ylabel[i]->s_name, sys_font,
! glist_getfont(x), tag);
/* draw contents of graph as glist */
--- 830,849 ----
for (i = 0; i < x->gl_nxlabels; i++)
sys_vgui(".x%lx.c create text\
! %d %d -text {%s} -font {{%s} %d %s} -tags %s\n",
glist_getcanvas(x),
(int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)),
(int)glist_ytopixels(x, x->gl_xlabely),
! x->gl_xlabel[i]->s_name, sys_font,
! glist_getfont(x), sys_fontweight, tag);
/* draw y labels */
for (i = 0; i < x->gl_nylabels; i++)
sys_vgui(".x%lx.c create text\
! %d %d -text {%s} -font {{%s} %d %s} -tags %s\n",
glist_getcanvas(x),
(int)glist_xtopixels(x, x->gl_ylabelx),
(int)glist_ytopixels(x, atof(x->gl_ylabel[i]->s_name)),
x->gl_ylabel[i]->s_name, sys_font,
! glist_getfont(x), sys_fontweight, tag);
/* draw contents of graph as glist */
Index: g_vumeter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -C2 -d -r1.5.4.2 -r1.5.4.3
*** g_vumeter.c 28 Jan 2007 21:51:55 -0000 1.5.4.2
--- g_vumeter.c 19 May 2007 05:29:33 -0000 1.5.4.3
***************
*** 117,123 ****
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);
}
if(x->x_scale)
--- 117,124 ----
if(((i+2)&3) && (x->x_scale))
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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,
! sys_fontweight, x->x_gui.x_lcol, x, i);
}
if(x->x_scale)
***************
*** 126,131 ****
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);
}
--- 127,133 ----
yyy = k4 + k1*(k2-i);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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, sys_fontweight,
x->x_gui.x_lcol, x, i);
}
***************
*** 137,144 ****
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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
{
--- 139,147 ----
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 %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
{
***************
*** 275,280 ****
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);
}
--- 278,284 ----
x->x_led_size);
if(((i+2)&3) && (x->x_scale))
! sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d %s} -fill #%6.6x\n",
! canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font,
! x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol);
}
***************
*** 282,291 ****
{
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,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
--- 286,296 ----
{
i=IEM_VU_STEPS+1;
! sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d %s} -fill #%6.6x\n",
! canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font,
! x->x_gui.x_fontsize, sys_fontweight,
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 %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
***************
*** 477,490 ****
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);
}
i=IEM_VU_STEPS+1;
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);
}
}
--- 482,497 ----
if((i+2)&3)
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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,
! sys_fontweight, x->x_gui.x_lcol, x, i);
}
i=IEM_VU_STEPS+1;
yyy = k4 + k1*(k2-i);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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, sys_fontweight,
! sys_fontweight, x->x_gui.x_lcol, x, i);
}
}
Index: g_hdial.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** g_hdial.c 28 Jan 2007 21:50:53 -0000 1.6.2.2
--- g_hdial.c 19 May 2007 05:29:33 -0000 1.6.2.3
***************
*** 74,81 ****
}
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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize,
x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
--- 74,81 ----
}
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
***************
*** 142,147 ****
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,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
--- 142,147 ----
int n=x->x_number, i;
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
Index: g_hslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** g_hslider.c 28 Jan 2007 21:50:53 -0000 1.5.2.2
--- g_hslider.c 19 May 2007 05:29:33 -0000 1.5.2.3
***************
*** 77,85 ****
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,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
--- 77,86 ----
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 %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
***************
*** 137,142 ****
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:"");
--- 138,143 ----
t_canvas *canvas=glist_getcanvas(glist);
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
retrieving revision 1.4.12.2
retrieving revision 1.4.12.3
diff -C2 -d -r1.4.12.2 -r1.4.12.3
*** g_bang.c 28 Jan 2007 21:50:53 -0000 1.4.12.2
--- g_bang.c 19 May 2007 05:29:33 -0000 1.4.12.3
***************
*** 56,64 ****
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,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
--- 56,65 ----
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 %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
***************
*** 116,121 ****
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:"");
--- 117,122 ----
t_canvas *canvas=glist_getcanvas(glist);
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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:"");
Index: g_numbox.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -d -r1.7.2.2 -r1.7.2.3
*** g_numbox.c 28 Jan 2007 21:50:53 -0000 1.7.2.2
--- g_numbox.c 19 May 2007 05:29:33 -0000 1.7.2.3
***************
*** 196,208 ****
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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
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);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
--- 196,210 ----
x->x_gui.x_fcol, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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:"",
! x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
! x->x_gui.x_lcol, x);
my_numbox_ftoa(x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
! -font {{%s} %d %s} -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, sys_fontweight,
! x->x_gui.x_fcol, x);
if(!x->x_gui.x_fsf.x_snd_able)
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %lxOUT%d\n",
***************
*** 270,279 ****
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);
sys_vgui(".x%lx.c itemconfigure %lxBASE1 -fill #%6.6x\n", canvas,
--- 272,281 ----
t_canvas *canvas=glist_getcanvas(glist);
! sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
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 %s} -fill #%6.6x \n",
! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol);
sys_vgui(".x%lx.c itemconfigure %lxBASE1 -fill #%6.6x\n", canvas,
Index: g_template.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_template.c,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -d -r1.13.2.3 -r1.13.2.4
*** g_template.c 28 Jan 2007 21:50:54 -0000 1.13.2.3
--- g_template.c 19 May 2007 05:29:33 -0000 1.13.2.4
***************
*** 2091,2096 ****
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 {{%s} %d normal}", sys_font,
! sys_hostfontsize(glist_getfont(glist)));
sys_vgui(" -tags drawnumber%lx\n", data);
}
--- 2091,2096 ----
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 {{%s} %d %s}", sys_font,
! sys_hostfontsize(glist_getfont(glist)), sys_fontweight);
sys_vgui(" -tags drawnumber%lx\n", data);
}
