[PD-cvs] packages/patches make_sizes_pixel_accurate_on_every_platform-0.40.3.patch, 1.1, 1.2
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Wed Jul 25 22:30:39 CEST 2007
Update of /cvsroot/pure-data/packages/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19288
Modified Files:
make_sizes_pixel_accurate_on_every_platform-0.40.3.patch
Log Message:
got things working on 0.40.3, everything seems to work ok; this patch applies cleanly to 0.41.0-test04 and also seems to work fine
Index: make_sizes_pixel_accurate_on_every_platform-0.40.3.patch
===================================================================
RCS file: /cvsroot/pure-data/packages/patches/make_sizes_pixel_accurate_on_every_platform-0.40.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** make_sizes_pixel_accurate_on_every_platform-0.40.3.patch 25 Jul 2007 19:07:40 -0000 1.1
--- make_sizes_pixel_accurate_on_every_platform-0.40.3.patch 25 Jul 2007 20:30:36 -0000 1.2
***************
*** 1,28 ****
! 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.3
! diff -u -w -r1.5 -r1.5.4.3
! --- g_all_guis.h 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_all_guis.h 8 Jul 2007 21:56:30 -0000 1.5.4.3
! @@ -144,7 +144,7 @@
! int x_w;
! int x_ldx;
! int x_ldy;
! - char x_font[16];
! + char x_font[MAXPDSTRING]; /* font names can be long! */
! t_iem_fstyle_flags x_fsf;
! int x_fontsize;
! t_iem_init_symargs x_isa;
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.3
! diff -u -w -r1.8 -r1.8.2.3
! --- g_all_guis.c 16 Aug 2005 04:06:28 -0000 1.8
! +++ g_all_guis.c 19 May 2007 05:29:33 -0000 1.8.2.3
! @@ -434,7 +434,7 @@
else
{
--- 1,12 ----
! ? configure
! ? makefile
Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
! retrieving revision 1.9
! diff -u -w -r1.9 g_all_guis.c
! --- g_all_guis.c 11 Aug 2006 20:09:07 -0000 1.9
! +++ g_all_guis.c 25 Jul 2007 20:26:19 -0000
! @@ -438,7 +438,7 @@
else
{
***************
*** 33,37 ****
iemgui->x_fsf.x_font_style = f;
f = (int)atom_getintarg(1, ac, av);
! @@ -442,8 +442,9 @@
f = 4;
iemgui->x_fontsize = f;
--- 17,21 ----
iemgui->x_fsf.x_font_style = f;
f = (int)atom_getintarg(1, ac, av);
! @@ -446,8 +446,9 @@
f = 4;
iemgui->x_fontsize = f;
***************
*** 45,49 ****
void iemgui_size(void *x, t_iemgui *iemgui)
! @@ -618,7 +619,7 @@
else
{
--- 29,33 ----
void iemgui_size(void *x, t_iemgui *iemgui)
! @@ -622,7 +623,7 @@
else
{
***************
*** 54,65 ****
iemgui->x_fsf.x_font_style = f;
if(fs < 4)
Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
! retrieving revision 1.4
! retrieving revision 1.4.12.3
! diff -u -w -r1.4 -r1.4.12.3
! --- g_bang.c 6 Sep 2004 20:20:33 -0000 1.4
! +++ g_bang.c 19 May 2007 05:29:33 -0000 1.4.12.3
@@ -55,11 +55,12 @@
xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1,
--- 38,64 ----
iemgui->x_fsf.x_font_style = f;
if(fs < 4)
+ Index: g_all_guis.h
+ ===================================================================
+ RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v
+ retrieving revision 1.5
+ diff -u -w -r1.5 g_all_guis.h
+ --- g_all_guis.h 16 Aug 2005 04:06:28 -0000 1.5
+ +++ g_all_guis.h 25 Jul 2007 20:26:19 -0000
+ @@ -144,7 +144,7 @@
+ int x_w;
+ int x_ldx;
+ int x_ldy;
+ - char x_font[16];
+ + char x_font[MAXPDSTRING]; /* font names can be long! */
+ t_iem_fstyle_flags x_fsf;
+ int x_fontsize;
+ t_iem_init_symargs x_isa;
Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
! retrieving revision 1.5
! diff -u -w -r1.5 g_bang.c
! --- g_bang.c 8 Sep 2006 23:45:30 -0000 1.5
! +++ g_bang.c 25 Jul 2007 20:26:19 -0000
@@ -55,11 +55,12 @@
xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1,
***************
*** 109,117 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v
! retrieving revision 1.9
! retrieving revision 1.9.2.5
! diff -u -w -r1.9 -r1.9.2.5
! --- g_graph.c 15 Sep 2005 03:17:27 -0000 1.9
! +++ g_graph.c 19 May 2007 05:29:33 -0000 1.9.2.5
@@ -741,9 +741,9 @@
{
--- 108,115 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v
! retrieving revision 1.10
! diff -u -w -r1.10 g_graph.c
! --- g_graph.c 3 Jun 2006 19:13:07 -0000 1.10
! +++ g_graph.c 25 Jul 2007 20:26:19 -0000
@@ -741,9 +741,9 @@
{
***************
*** 127,131 ****
/* draw ticks on horizontal borders. If lperb field is
! @@ -821,21 +829,22 @@
/* draw x labels */
for (i = 0; i < x->gl_nxlabels; i++)
--- 125,129 ----
/* draw ticks on horizontal borders. If lperb field is
! @@ -823,21 +823,22 @@
/* draw x labels */
for (i = 0; i < x->gl_nxlabels; i++)
***************
*** 159,167 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v
! retrieving revision 1.6
! retrieving revision 1.6.2.3
! diff -u -w -r1.6 -r1.6.2.3
! --- g_hdial.c 16 Aug 2005 04:06:28 -0000 1.6
! +++ g_hdial.c 19 May 2007 05:29:33 -0000 1.6.2.3
@@ -73,10 +73,10 @@
x->x_drawn = x->x_on;
--- 157,164 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v
! retrieving revision 1.7
! diff -u -w -r1.7 g_hdial.c
! --- g_hdial.c 8 Sep 2006 23:45:30 -0000 1.7
! +++ g_hdial.c 25 Jul 2007 20:26:19 -0000
@@ -73,10 +73,10 @@
x->x_drawn = x->x_on;
***************
*** 209,217 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v
! retrieving revision 1.5
! retrieving revision 1.5.2.3
! diff -u -w -r1.5 -r1.5.2.3
! --- g_hslider.c 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_hslider.c 19 May 2007 05:29:33 -0000 1.5.2.3
@@ -76,11 +76,12 @@
canvas, r, ypos+1, r,
--- 206,213 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v
! retrieving revision 1.6
! diff -u -w -r1.6 g_hslider.c
! --- g_hslider.c 8 Sep 2006 23:45:30 -0000 1.6
! +++ g_hslider.c 25 Jul 2007 20:26:19 -0000
@@ -76,11 +76,12 @@
canvas, r, ypos+1, r,
***************
*** 262,269 ****
RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v
retrieving revision 1.5
! retrieving revision 1.5.14.3
! diff -u -w -r1.5 -r1.5.14.3
--- g_mycanvas.c 6 Sep 2004 20:20:34 -0000 1.5
! +++ g_mycanvas.c 19 May 2007 05:29:33 -0000 1.5.14.3
@@ -44,10 +44,11 @@
xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
--- 258,264 ----
RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v
retrieving revision 1.5
! diff -u -w -r1.5 g_mycanvas.c
--- g_mycanvas.c 6 Sep 2004 20:20:34 -0000 1.5
! +++ g_mycanvas.c 25 Jul 2007 20:26:19 -0000
@@ -44,10 +44,11 @@
xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
***************
*** 313,321 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
! retrieving revision 1.7
! retrieving revision 1.7.2.3
! diff -u -w -r1.7 -r1.7.2.3
! --- g_numbox.c 16 Aug 2005 04:06:28 -0000 1.7
! +++ g_numbox.c 19 May 2007 05:29:33 -0000 1.7.2.3
@@ -195,15 +195,17 @@
xpos, ypos + x->x_gui.x_h,
--- 308,315 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
! retrieving revision 1.8
! diff -u -w -r1.8 g_numbox.c
! --- g_numbox.c 8 Sep 2006 23:45:30 -0000 1.8
! +++ g_numbox.c 25 Jul 2007 20:26:19 -0000
@@ -195,15 +195,17 @@
xpos, ypos + x->x_gui.x_h,
***************
*** 378,386 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v
! retrieving revision 1.5
! retrieving revision 1.5.2.4
! diff -u -w -r1.5 -r1.5.2.4
! --- g_rtext.c 2 Jul 2005 05:03:06 -0000 1.5
! +++ g_rtext.c 19 May 2007 04:04:30 -0000 1.5.2.4
@@ -15,10 +15,16 @@
#include "g_canvas.h"
--- 372,379 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v
! retrieving revision 1.6
! diff -u -w -r1.6 g_rtext.c
! --- g_rtext.c 11 Aug 2006 20:09:07 -0000 1.6
! +++ g_rtext.c 25 Jul 2007 20:26:19 -0000
@@ -15,10 +15,16 @@
#include "g_canvas.h"
***************
*** 407,416 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_template.c,v
! retrieving revision 1.13
! retrieving revision 1.13.2.4
! diff -u -w -r1.13 -r1.13.2.4
! --- g_template.c 21 Aug 2005 17:46:52 -0000 1.13
! +++ g_template.c 19 May 2007 05:29:33 -0000 1.13.2.4
! @@ -2090,8 +2090,8 @@
drawnumber_sprintf(x, buf, &at);
sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}",
--- 400,408 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_template.c,v
! retrieving revision 1.18
! diff -u -w -r1.18 g_template.c
! --- g_template.c 9 Oct 2006 04:36:12 -0000 1.18
! +++ g_template.c 25 Jul 2007 20:26:19 -0000
! @@ -2126,8 +2126,8 @@
drawnumber_sprintf(x, buf, &at);
sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}",
***************
*** 426,434 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v
! retrieving revision 1.4
! retrieving revision 1.4.12.3
! diff -u -w -r1.4 -r1.4.12.3
! --- g_toggle.c 6 Sep 2004 20:20:34 -0000 1.4
! +++ g_toggle.c 19 May 2007 05:29:33 -0000 1.4.12.3
@@ -61,11 +61,12 @@
canvas, xx+w+1, yy + x->x_gui.x_h-w-1, xx + x->x_gui.x_w-w, yy+w, w,
--- 418,425 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v
! retrieving revision 1.5
! diff -u -w -r1.5 g_toggle.c
! --- g_toggle.c 8 Sep 2006 23:45:30 -0000 1.5
! +++ g_toggle.c 25 Jul 2007 20:26:19 -0000
@@ -61,11 +61,12 @@
canvas, xx+w+1, yy + x->x_gui.x_h-w-1, xx + x->x_gui.x_w-w, yy+w, w,
***************
*** 478,486 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v
! retrieving revision 1.5
! retrieving revision 1.5.2.3
! diff -u -w -r1.5 -r1.5.2.3
! --- g_vdial.c 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_vdial.c 19 May 2007 05:29:33 -0000 1.5.2.3
@@ -75,10 +75,10 @@
x->x_drawn = x->x_on;
--- 469,476 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v
! retrieving revision 1.6
! diff -u -w -r1.6 g_vdial.c
! --- g_vdial.c 8 Sep 2006 23:45:30 -0000 1.6
! +++ g_vdial.c 25 Jul 2007 20:26:19 -0000
@@ -75,10 +75,10 @@
x->x_drawn = x->x_on;
***************
*** 528,536 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v
! retrieving revision 1.5
! retrieving revision 1.5.2.3
! diff -u -w -r1.5 -r1.5.2.3
! --- g_vslider.c 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_vslider.c 19 May 2007 05:29:33 -0000 1.5.2.3
@@ -59,10 +59,11 @@
canvas, xpos+1, r,
--- 518,525 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v
! retrieving revision 1.6
! diff -u -w -r1.6 g_vslider.c
! --- g_vslider.c 8 Sep 2006 23:45:30 -0000 1.6
! +++ g_vslider.c 25 Jul 2007 20:26:19 -0000
@@ -59,10 +59,11 @@
canvas, xpos+1, r,
***************
*** 580,587 ****
RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v
retrieving revision 1.5
! retrieving revision 1.5.4.3
! diff -u -w -r1.5 -r1.5.4.3
--- g_vumeter.c 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_vumeter.c 19 May 2007 05:29:33 -0000 1.5.4.3
@@ -116,17 +116,19 @@
canvas, quad1, yyy, quad3, yyy, x->x_led_size, iemgui_color_hex[led_col], x, i);
--- 569,575 ----
RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v
retrieving revision 1.5
! diff -u -w -r1.5 g_vumeter.c
--- g_vumeter.c 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_vumeter.c 25 Jul 2007 20:26:19 -0000
@@ -116,17 +116,19 @@
canvas, quad1, yyy, quad3, yyy, x->x_led_size, iemgui_color_hex[led_col], x, i);
***************
*** 706,715 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
! retrieving revision 1.8
! retrieving revision 1.8.2.10
! diff -u -w -r1.8 -r1.8.2.10
! --- m_pd.h 19 Aug 2005 23:28:03 -0000 1.8
! +++ m_pd.h 18 Jul 2007 14:05:55 -0000 1.8.2.10
! @@ -363,6 +366,8 @@
EXTERN void canvas_makefilename(t_glist *c, char *file,
char *result,int resultsize);
--- 694,702 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
! retrieving revision 1.16.2.2
! diff -u -w -r1.16.2.2 m_pd.h
! --- m_pd.h 18 Jul 2007 00:20:12 -0000 1.16.2.2
! +++ m_pd.h 25 Jul 2007 20:26:19 -0000
! @@ -368,6 +368,8 @@
EXTERN void canvas_makefilename(t_glist *c, char *file,
char *result,int resultsize);
***************
*** 723,736 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
! retrieving revision 1.14
! retrieving revision 1.14.2.5
! diff -u -w -r1.14 -r1.14.2.5
! --- s_inter.c 15 Oct 2005 23:14:28 -0000 1.14
! +++ s_inter.c 18 Jul 2007 14:05:55 -0000 1.14.2.5
! @@ -85,9 +88,7 @@
! t_socketreceivefn sr_socketreceivefn;
! };
! -extern char *pd_version;
extern int sys_guisetportnumber;
-extern char sys_font[]; /* tb: typeface */
--- 710,720 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
! retrieving revision 1.18.2.1
! diff -u -w -r1.18.2.1 s_inter.c
! --- s_inter.c 18 Jul 2007 00:20:12 -0000 1.18.2.1
! +++ s_inter.c 25 Jul 2007 20:26:19 -0000
! @@ -87,7 +87,6 @@
! extern char *pd_version;
extern int sys_guisetportnumber;
-extern char sys_font[]; /* tb: typeface */
***************
*** 738,742 ****
static int sys_nfdpoll;
static t_fdpoll *sys_fdpoll;
! @@ -842,7 +843,8 @@
#define FIRSTPORTNUM 5400
--- 722,726 ----
static int sys_nfdpoll;
static t_fdpoll *sys_fdpoll;
! @@ -844,7 +843,8 @@
#define FIRSTPORTNUM 5400
***************
*** 747,752 ****
8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28,
24, 15, 28};
!
! @@ -1245,8 +1248,8 @@
#endif
sys_get_audio_apis(buf);
--- 731,736 ----
8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28,
24, 15, 28};
! #define NDEFAULTFONT (sizeof(defaultfontshit)/sizeof(*defaultfontshit))
! @@ -1248,8 +1248,8 @@
#endif
sys_get_audio_apis(buf);
***************
*** 754,759 ****
- sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2,
- sys_font);
! + sys_vgui("pdtk_pd_startup %s %s {%s} %s\n", buf, buf2, sys_font,
! + sys_fontweight);
}
return (0);
--- 738,743 ----
- sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2,
- sys_font);
! + sys_vgui("pdtk_pd_startup {%s} %s %s {%s} %s\n", pd_version, buf, buf2,
! + sys_font, sys_fontweight);
}
return (0);
***************
*** 762,771 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
! retrieving revision 1.20
! retrieving revision 1.20.2.9
! diff -u -w -r1.20 -r1.20.2.9
! --- s_main.c 2 Dec 2005 04:58:24 -0000 1.20
! +++ s_main.c 9 Jul 2007 17:42:04 -0000 1.20.2.9
! @@ -56,7 +57,12 @@
int sys_midiindevlist[MAXMIDIINDEV] = {1};
int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
--- 746,754 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
! retrieving revision 1.28
! diff -u -w -r1.28 s_main.c
! --- s_main.c 4 Oct 2006 19:35:06 -0000 1.28
! +++ s_main.c 25 Jul 2007 20:26:19 -0000
! @@ -58,7 +58,12 @@
int sys_midiindevlist[MAXMIDIINDEV] = {1};
int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
***************
*** 780,784 ****
static int sys_main_srate;
static int sys_main_advance;
!
@@ -106,8 +111,8 @@
in the six fonts. */
--- 763,767 ----
static int sys_main_srate;
static int sys_main_advance;
! static int sys_listplease;
@@ -106,8 +111,8 @@
in the six fonts. */
***************
*** 787,805 ****
- {8, 6, 10, 0, 0, 0}, {10, 7, 13, 0, 0, 0}, {12, 9, 16, 0, 0, 0},
- {16, 10, 20, 0, 0, 0}, {24, 15, 25, 0, 0, 0}, {36, 25, 45, 0, 0, 0}};
! + {8, 5, 11, 0, 0, 0}, {10, 6, 13, 0, 0, 0}, {12, 7, 16, 0, 0, 0},
! + {16, 10, 19, 0, 0, 0}, {24, 14, 29, 0, 0, 0}, {36, 23, 44, 0, 0, 0}};
#define NFONT (sizeof(sys_fontlist)/sizeof(*sys_fontlist))
/* here are the actual font size structs on msp's systems:
! @@ -141,7 +147,7 @@
!
! int sys_hostfontsize(int fontsize)
! {
! - return (sys_findfont(fontsize)->fi_hostfontsize);
! + return (0 - fontsize);
! }
!
! int sys_fontwidth(int fontsize)
! @@ -155,11 +161,7 @@
}
--- 770,779 ----
- {8, 6, 10, 0, 0, 0}, {10, 7, 13, 0, 0, 0}, {12, 9, 16, 0, 0, 0},
- {16, 10, 20, 0, 0, 0}, {24, 15, 25, 0, 0, 0}, {36, 25, 45, 0, 0, 0}};
! + {8, 5, 11, 8, 5, 11}, {10, 6, 13, 10, 6, 13}, {12, 7, 16, 12, 7, 16},
! + {16, 10, 19, 16, 10, 19}, {24, 14, 29, 24, 14, 29}, {36, 23, 44, 36, 23, 44}};
#define NFONT (sizeof(sys_fontlist)/sizeof(*sys_fontlist))
/* here are the actual font size structs on msp's systems:
! @@ -158,11 +163,7 @@
}
***************
*** 813,817 ****
static void openit(const char *dirname, const char *filename)
{
! @@ -206,11 +211,6 @@
atom_getintarg(3 * j + 3, argc, argv) <= wantwidth)
best = j;
--- 787,791 ----
static void openit(const char *dirname, const char *filename)
{
! @@ -206,11 +207,6 @@
atom_getintarg(3 * j + 3, argc, argv) <= wantwidth)
best = j;
***************
*** 825,829 ****
#if 0
for (i = 0; i < 6; i++)
! @@ -358,8 +364,9 @@
"-helppath <path> -- add to help file search path\n",
"-open <file> -- open file(s) on startup\n",
--- 799,803 ----
#if 0
for (i = 0; i < 6; i++)
! @@ -382,8 +378,9 @@
"-helppath <path> -- add to help file search path\n",
"-open <file> -- open file(s) on startup\n",
***************
*** 837,841 ****
"-version -- don't run Pd; just print out which version it is \n",
"-d <n> -- specify debug level\n",
! @@ -737,21 +737,25 @@
sys_externlist = namelist_append_files(sys_externlist, argv[1]);
argc -= 2; argv += 2;
--- 811,815 ----
"-version -- don't run Pd; just print out which version it is \n",
"-d <n> -- specify debug level\n",
! @@ -737,21 +734,25 @@
sys_externlist = namelist_append_files(sys_externlist, argv[1]);
argc -= 2; argv += 2;
***************
*** 870,878 ****
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
! retrieving revision 1.17
! retrieving revision 1.17.2.21
! diff -u -w -r1.17 -r1.17.2.21
! --- u_main.tk 15 Oct 2005 23:14:28 -0000 1.17
! +++ u_main.tk 23 Jul 2007 20:49:13 -0000 1.17.2.21
@@ -1,14 +1,4 @@
#!/usr/bin/wish
--- 844,851 ----
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
! retrieving revision 1.25
! diff -u -w -r1.25 u_main.tk
! --- u_main.tk 9 Oct 2006 04:36:12 -0000 1.25
! +++ u_main.tk 25 Jul 2007 20:26:19 -0000
@@ -1,14 +1,4 @@
#!/usr/bin/wish
***************
*** 947,951 ****
load $pd_guidir/bin/libPdTcl.dylib
set pd_tearoff 0
! @@ -128,6 +148,15 @@
.mbar add cascade -label "Help" -menu .mbar.help
}
--- 920,924 ----
load $pd_guidir/bin/libPdTcl.dylib
set pd_tearoff 0
! @@ -132,6 +150,15 @@
.mbar add cascade -label "Help" -menu .mbar.help
}
***************
*** 963,967 ****
set ctrls_meter_on 0
set ctrls_inlevel 0
! @@ -136,15 +165,14 @@
frame .controls.switches
checkbutton .controls.switches.audiobutton -text {compute audio} \
--- 936,940 ----
set ctrls_meter_on 0
set ctrls_inlevel 0
! @@ -140,15 +167,14 @@
frame .controls.switches
checkbutton .controls.switches.audiobutton -text {compute audio} \
***************
*** 981,985 ****
frame .controls.inout
frame .controls.inout.in
! @@ -171,7 +199,7 @@
--- 954,958 ----
frame .controls.inout
frame .controls.inout.in
! @@ -175,7 +201,7 @@
***************
*** 990,994 ****
# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
scrollbar .printout.scroll -command ".printout.text yview"
! @@ -364,7 +360,7 @@
global pd_myversion
set name [format ".help%d" $doc_number]
--- 963,967 ----
# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
scrollbar .printout.scroll -command ".printout.text yview"
! @@ -364,7 +390,7 @@
global pd_myversion
set name [format ".help%d" $doc_number]
***************
*** 999,1003 ****
scrollbar $name.scroll -command "$name.text yview"
pack $name.scroll -side right -fill y
! @@ -1120,6 +1162,18 @@
$name.popup add command -label {Help} \
-command [concat popup_action $name 2]
--- 972,976 ----
scrollbar $name.scroll -command "$name.text yview"
pack $name.scroll -side right -fill y
! @@ -1142,6 +1168,18 @@
$name.popup add command -label {Help} \
-command [concat popup_action $name 2]
***************
*** 1018,1022 ****
wm protocol $name WM_DELETE_WINDOW [concat menu_close $name]
! @@ -1239,6 +1295,7 @@
global pd_nt
global pd_array_listview_page
--- 991,995 ----
wm protocol $name WM_DELETE_WINDOW [concat menu_close $name]
! @@ -1266,6 +1304,7 @@
global pd_nt
global pd_array_listview_page
***************
*** 1026,1030 ****
set pd_array_listview_id($arrayName) $id
set windowName [format ".%sArrayWindow" $arrayName]
! @@ -1252,8 +1309,7 @@
set $windowName.lb [listbox $windowName.lb -height 20 -width 25\
-selectmode extended \
--- 999,1003 ----
set pd_array_listview_id($arrayName) $id
set windowName [format ".%sArrayWindow" $arrayName]
! @@ -1279,8 +1318,7 @@
set $windowName.lb [listbox $windowName.lb -height 20 -width 25\
-selectmode extended \
***************
*** 1036,1040 ****
set $windowName.lb.sb [scrollbar $windowName.lb.sb \
-command "$windowName.lb yview" -orient vertical]
! @@ -1357,9 +1413,7 @@
proc pdtk_array_listview_edit {arrayName page font} {
global pd_array_listview_entry
--- 1009,1013 ----
set $windowName.lb.sb [scrollbar $windowName.lb.sb \
-command "$windowName.lb yview" -orient vertical]
! @@ -1384,9 +1422,7 @@
proc pdtk_array_listview_edit {arrayName page font} {
global pd_array_listview_entry
***************
*** 1047,1051 ****
if {[winfo exists $lbName.entry]} {
pdtk_array_listview_update_entry \
! @@ -1371,7 +1425,7 @@
set bbox [$lbName bbox $itemNum]
set y [expr [lindex $bbox 1] - 4]
--- 1020,1024 ----
if {[winfo exists $lbName.entry]} {
pdtk_array_listview_update_entry \
! @@ -1398,7 +1434,7 @@
set bbox [$lbName bbox $itemNum]
set y [expr [lindex $bbox 1] - 4]
***************
*** 1056,1060 ****
place configure $lbName.entry -relx 0 -y $y -relwidth 1
lower $lbName.entry
! @@ -1853,6 +1925,8 @@
set vid [string trimleft $id .]
--- 1029,1033 ----
place configure $lbName.entry -relx 0 -y $y -relwidth 1
lower $lbName.entry
! @@ -1874,6 +1910,8 @@
set vid [string trimleft $id .]
***************
*** 1065,1069 ****
global $var_gatomwidth
set var_gatomlo [concat gatomlo_$vid]
! @@ -1877,87 +1951,96 @@
set $var_gatomsymto [gatom_unescape $symto]
--- 1038,1042 ----
global $var_gatomwidth
set var_gatomlo [concat gatomlo_$vid]
! @@ -1898,87 +1936,96 @@
set $var_gatomsymto [gatom_unescape $symto]
***************
*** 1232,1236 ****
$id.params.entry select from 0
$id.params.entry select adjust end
! @@ -2110,7 +2193,7 @@
if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} {
--- 1205,1209 ----
$id.params.entry select from 0
$id.params.entry select adjust end
! @@ -2131,7 +2178,7 @@
if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} {
***************
*** 1241,1245 ****
}
! @@ -2124,20 +2207,20 @@
set var_iemgui_lcol [concat iemgui_lcol_$vid]
global $var_iemgui_lcol
--- 1214,1218 ----
}
! @@ -2145,20 +2192,20 @@
set var_iemgui_lcol [concat iemgui_lcol_$vid]
global $var_iemgui_lcol
***************
*** 1265,1269 ****
-activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
-foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! @@ -2221,17 +2304,27 @@
}
}
--- 1238,1242 ----
-activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
-foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! @@ -2242,17 +2289,27 @@
}
}
***************
*** 1299,1303 ****
proc iemgui_lb {id} {
! @@ -2377,6 +2470,9 @@
set vid [string trimleft $id .]
--- 1272,1276 ----
proc iemgui_lb {id} {
! @@ -2398,6 +2455,9 @@
set vid [string trimleft $id .]
***************
*** 1309,1313 ****
global $var_iemgui_wdt
set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid]
! @@ -2464,7 +2560,8 @@
set $var_iemgui_l2_f1_b0 0
--- 1282,1286 ----
global $var_iemgui_wdt
set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid]
! @@ -2485,7 +2545,8 @@
set $var_iemgui_l2_f1_b0 0
***************
*** 1319,1323 ****
frame $id.dim
! @@ -2497,7 +2594,7 @@
$id.rng.max_lab $id.rng.max_ent -side left} }
--- 1292,1296 ----
frame $id.dim
! @@ -2518,7 +2579,7 @@
$id.rng.max_lab $id.rng.max_ent -side left} }
***************
*** 1328,1332 ****
frame $id.para
! @@ -2526,157 +2623,189 @@
pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1}
if {[eval concat $$var_iemgui_steady] >= 0} {
--- 1301,1305 ----
frame $id.para
! @@ -2547,157 +2608,189 @@
pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1}
if {[eval concat $$var_iemgui_steady] >= 0} {
***************
*** 1528,1564 ****
- label $id.space3 -text "------or click color preset:-------"
- pack $id.space3 -side top
- -
- - 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
+ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
+ -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge
--- 1501,1504 ----
***************
*** 1614,1617 ****
--- 1554,1590 ----
+ $id.colors.r3.c8 $id.colors.r3.c9 -side left
+ - 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
+ -
-
- label $id.space4 -text "---------------------------------"
***************
*** 1642,1646 ****
if {[info tclversion] < 8.4} {
bind $id <Key-Tab> {tkTabToWindow [tk_focusNext %W]}
! @@ -2691,24 +2820,24 @@
bind $id.rng.min_ent <KeyPress-Return> [concat iemgui_ok $id]
bind $id.rng.max_ent <KeyPress-Return> [concat iemgui_ok $id]
--- 1615,1619 ----
if {[info tclversion] < 8.4} {
bind $id <Key-Tab> {tkTabToWindow [tk_focusNext %W]}
! @@ -2712,24 +2805,24 @@
bind $id.rng.min_ent <KeyPress-Return> [concat iemgui_ok $id]
bind $id.rng.max_ent <KeyPress-Return> [concat iemgui_ok $id]
***************
*** 1679,1683 ****
$id.dim.w_ent select from 0
! @@ -2786,6 +2915,7 @@
toplevel $id
--- 1652,1656 ----
$id.dim.w_ent select from 0
! @@ -2807,6 +2900,7 @@
toplevel $id
***************
*** 1687,1713 ****
frame $id.name
! @@ -3264,10 +3260,9 @@
# seven "useful" font sizes.
# tb: user defined typefaces
-proc pdtk_pd_startup {version apilist midiapilist fontname} {
! +proc pdtk_pd_startup {apilist midiapilist fontname_from_pd fontweight_from_pd} {
# puts stderr [concat $version $apilist $fontname]
- global pd_myversion pd_apilist pd_midiapilist
! - set pd_myversion $version
! + global pd_apilist pd_midiapilist pd_nt
set pd_apilist $apilist
set pd_midiapilist $midiapilist
global pd_fontlist
! @@ -3275,7 +3270,7 @@
set fontlist ""
foreach i {8 9 10 12 14 16 18 24 30 36} {
- set font [concat $fontname -$i bold]
! + set font [format {{%s} -%d %s} $fontname_from_pd $i $fontweight_from_pd]
set pd_fontlist [linsert $pd_fontlist 100000 $font]
set width0 [font measure $font x]
set height0 [lindex [font metrics $font] 5]
! @@ -3498,8 +3633,12 @@
# create a popup menu
--- 1660,1689 ----
frame $id.name
! @@ -3264,18 +3358,21 @@
# seven "useful" font sizes.
# tb: user defined typefaces
-proc pdtk_pd_startup {version apilist midiapilist fontname} {
! +proc pdtk_pd_startup {version apilist midiapilist fontname_from_pd fontweight_from_pd} {
# puts stderr [concat $version $apilist $fontname]
- global pd_myversion pd_apilist pd_midiapilist
! + global pd_myversion pd_apilist pd_midiapilist pd_nt
! set pd_myversion $version
set pd_apilist $apilist
set pd_midiapilist $midiapilist
+ + global fontname fontweight
+ + set fontname $fontname_from_pd
+ + set fontweight $fontweight_from_pd
global pd_fontlist
! set pd_fontlist {}
set fontlist ""
foreach i {8 9 10 12 14 16 18 24 30 36} {
- set font [concat $fontname -$i bold]
! + set font [format {{%s} %d %s} $fontname_from_pd $i $fontweight_from_pd]
set pd_fontlist [linsert $pd_fontlist 100000 $font]
set width0 [font measure $font x]
set height0 [lindex [font metrics $font] 5]
! @@ -3522,8 +3619,12 @@
# create a popup menu
***************
*** 1722,1726 ****
for {set x 0} {$x<[llength $devlist]} {incr x} {
$name.popup add command -label [lindex $devlist $x] \
! @@ -3771,8 +3910,12 @@
# create a popup menu
--- 1698,1702 ----
for {set x 0} {$x<[llength $devlist]} {incr x} {
$name.popup add command -label [lindex $devlist $x] \
! @@ -3798,8 +3899,12 @@
# create a popup menu
More information about the Pd-cvs
mailing list