From 8bc55f550516b951130922cf6e08e83c3df761f7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 16 Apr 2012 03:37:52 +0000 Subject: quote font name in Tk -font triplets since font names can contain spaces svn path=/trunk/externals/unauthorized/; revision=16125 --- playlist.c | 8 ++++---- scrolllist.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playlist.c b/playlist.c index a3a45fe..f663152 100644 --- a/playlist.c +++ b/playlist.c @@ -147,7 +147,7 @@ static void playlist_update_dir(t_playlist *x, t_glist *glist) sys_vgui(".x%lx.c delete %xTITLE\n", canvas, x); if ( x->x_graphics ) { - sys_vgui(".x%lx.c create text %d %d -width %d -text \"%s\" -anchor w -font %s -tags %xTITLE\n", + sys_vgui(".x%lx.c create text %d %d -width %d -text \"%s\" -anchor w -font {%s} -tags %xTITLE\n", canvas, text_xpix(&x->x_obj, glist)+5, text_ypix(&x->x_obj, glist)-10, @@ -224,7 +224,7 @@ static void playlist_update_dir(t_playlist *x, t_glist *glist) x->x_lastseen = x->x_nentries; strncpy( wrappedname, x->x_dentries[x->x_nentries], MIN(x->x_width/x->x_charwidth, MAXPDSTRING) ); wrappedname[ x->x_width/x->x_charwidth ] = '\0'; - sys_vgui(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" -anchor w -font %s -tags %xENTRY%d\n", + sys_vgui(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" -anchor w -font {%s} -tags %xENTRY%d\n", canvas, text_xpix(&x->x_obj, glist)+5, text_ypix(&x->x_obj, glist)+5+(x->x_nentries-x->x_firstseen)*x->x_charheight, @@ -485,7 +485,7 @@ static void playlist_motion(t_playlist *x, t_floatarg dx, t_floatarg dy) x->x_lastseen = i; strncpy( wrappedname, x->x_dentries[i], x->x_width/x->x_charwidth ); wrappedname[ x->x_width/x->x_charwidth ] = '\0'; - sys_vgui(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" -anchor w -font %s -tags %xENTRY%d\n", + sys_vgui(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" -anchor w -font {%s} -tags %xENTRY%d\n", canvas, text_xpix(&x->x_obj, x->x_glist)+5, text_ypix(&x->x_obj, x->x_glist)+5+(i-x->x_firstseen)*x->x_charheight, @@ -527,7 +527,7 @@ static void playlist_motion(t_playlist *x, t_floatarg dx, t_floatarg dy) strncpy( wrappedname, x->x_dentries[i], x->x_width/x->x_charwidth ); wrappedname[ x->x_width/x->x_charwidth ] = '\0'; sys_vgui(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" \ - -anchor w -font %s -tags %xENTRY%d\n", + -anchor w -font {%s} -tags %xENTRY%d\n", canvas, text_xpix(&x->x_obj, x->x_glist)+5, text_ypix(&x->x_obj, x->x_glist)+5+(i-x->x_firstseen)*x->x_charheight, diff --git a/scrolllist.c b/scrolllist.c index 1a9d1be..40b857c 100644 --- a/scrolllist.c +++ b/scrolllist.c @@ -157,7 +157,7 @@ static void scrolllist_update(t_scrolllist *x, t_glist *glist) // display the entry if displayable if ( ( (i-x->x_firstseen)*x->x_charheight < x->x_height ) && ( x->x_items[i] != NULL ) ) { - SYS_VGUI11(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" -anchor w -font %s -tags %xITEM%d\n", + SYS_VGUI11(".x%lx.c create text %d %d -fill %s -activefill %s -width %d -text \"%s\" -anchor w -font {%s} -tags %xITEM%d\n", canvas, text_xpix(&x->x_obj, glist)+5, text_ypix(&x->x_obj, glist)+5+(i-x->x_firstseen)*x->x_charheight, -- cgit v1.2.1