Update of /cvsroot/pure-data/packages/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4308
Modified Files:
make_sizes_pixel_accurate_on_every_platform-0.40.3.patch
Log Message:
removed misplaced libquicktime chunk from u_main.tk since it is in its own patch
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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** make_sizes_pixel_accurate_on_every_platform-0.40.3.patch 31 Jul 2007 00:57:59 -0000 1.3
--- make_sizes_pixel_accurate_on_every_platform-0.40.3.patch 3 Aug 2007 06:37:46 -0000 1.4
***************
*** 1,4 ****
- ? configure
- ? makefile
Index: g_all_guis.c
===================================================================
--- 1,2 ----
***************
*** 7,11 ****
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
--- 5,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 3 Aug 2007 06:36:34 -0000
@@ -438,7 +438,7 @@
else
***************
*** 44,48 ****
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;
--- 42,46 ----
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 3 Aug 2007 06:36:34 -0000
@@ -144,7 +144,7 @@
int x_w;
***************
*** 60,64 ****
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,
--- 58,62 ----
diff -u -w -r1.5 g_bang.c
--- g_bang.c 8 Sep 2006 23:45:30 -0000 1.5
! +++ g_bang.c 3 Aug 2007 06:36:34 -0000
@@ -55,11 +55,12 @@
xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1,
***************
*** 111,115 ****
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 @@
{
--- 109,113 ----
diff -u -w -r1.10 g_graph.c
--- g_graph.c 3 Jun 2006 19:13:07 -0000 1.10
! +++ g_graph.c 3 Aug 2007 06:36:35 -0000
@@ -741,9 +741,9 @@
{
***************
*** 160,164 ****
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;
--- 158,162 ----
diff -u -w -r1.7 g_hdial.c
--- g_hdial.c 8 Sep 2006 23:45:30 -0000 1.7
! +++ g_hdial.c 3 Aug 2007 06:36:35 -0000
@@ -73,10 +73,10 @@
x->x_drawn = x->x_on;
***************
*** 209,213 ****
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,
--- 207,211 ----
diff -u -w -r1.6 g_hslider.c
--- g_hslider.c 8 Sep 2006 23:45:30 -0000 1.6
! +++ g_hslider.c 3 Aug 2007 06:36:35 -0000
@@ -76,11 +76,12 @@
canvas, r, ypos+1, r,
***************
*** 260,264 ****
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,
--- 258,262 ----
diff -u -w -r1.5 g_mycanvas.c
--- g_mycanvas.c 6 Sep 2004 20:20:34 -0000 1.5
! +++ g_mycanvas.c 3 Aug 2007 06:36:35 -0000
@@ -44,10 +44,11 @@
xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
***************
*** 311,315 ****
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,
--- 309,313 ----
diff -u -w -r1.8 g_numbox.c
--- g_numbox.c 8 Sep 2006 23:45:30 -0000 1.8
! +++ g_numbox.c 3 Aug 2007 06:36:35 -0000
@@ -195,15 +195,17 @@
xpos, ypos + x->x_gui.x_h,
***************
*** 375,379 ****
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"
--- 373,377 ----
diff -u -w -r1.6 g_rtext.c
--- g_rtext.c 11 Aug 2006 20:09:07 -0000 1.6
! +++ g_rtext.c 3 Aug 2007 06:36:35 -0000
@@ -15,10 +15,16 @@
#include "g_canvas.h"
***************
*** 403,407 ****
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);
--- 401,405 ----
diff -u -w -r1.18 g_template.c
--- g_template.c 9 Oct 2006 04:36:12 -0000 1.18
! +++ g_template.c 3 Aug 2007 06:36:36 -0000
@@ -2126,8 +2126,8 @@
drawnumber_sprintf(x, buf, &at);
***************
*** 421,425 ****
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,
--- 419,423 ----
diff -u -w -r1.5 g_toggle.c
--- g_toggle.c 8 Sep 2006 23:45:30 -0000 1.5
! +++ g_toggle.c 3 Aug 2007 06:36:36 -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,
***************
*** 472,476 ****
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;
--- 470,474 ----
diff -u -w -r1.6 g_vdial.c
--- g_vdial.c 8 Sep 2006 23:45:30 -0000 1.6
! +++ g_vdial.c 3 Aug 2007 06:36:36 -0000
@@ -75,10 +75,10 @@
x->x_drawn = x->x_on;
***************
*** 521,525 ****
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,
--- 519,523 ----
diff -u -w -r1.6 g_vslider.c
--- g_vslider.c 8 Sep 2006 23:45:30 -0000 1.6
! +++ g_vslider.c 3 Aug 2007 06:36:36 -0000
@@ -59,10 +59,11 @@
canvas, xpos+1, r,
***************
*** 571,575 ****
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);
--- 569,573 ----
diff -u -w -r1.5 g_vumeter.c
--- g_vumeter.c 16 Aug 2005 04:06:28 -0000 1.5
! +++ g_vumeter.c 3 Aug 2007 06:36:36 -0000
@@ -116,17 +116,19 @@
canvas, quad1, yyy, quad3, yyy, x->x_led_size, iemgui_color_hex[led_col], x, i);
***************
*** 697,701 ****
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,
--- 695,699 ----
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 3 Aug 2007 06:36:36 -0000
@@ -368,6 +368,8 @@
EXTERN void canvas_makefilename(t_glist *c, char *file,
***************
*** 713,717 ****
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 @@
--- 711,715 ----
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 3 Aug 2007 06:36:36 -0000
@@ -87,7 +87,6 @@
***************
*** 749,753 ****
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};
--- 747,751 ----
diff -u -w -r1.28 s_main.c
--- s_main.c 4 Oct 2006 19:35:06 -0000 1.28
! +++ s_main.c 3 Aug 2007 06:36:37 -0000
@@ -58,7 +58,12 @@
int sys_midiindevlist[MAXMIDIINDEV] = {1};
***************
*** 847,851 ****
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
--- 845,849 ----
diff -u -w -r1.25 u_main.tk
--- u_main.tk 9 Oct 2006 04:36:12 -0000 1.25
! +++ u_main.tk 3 Aug 2007 06:36:37 -0000
@@ -1,14 +1,4 @@
#!/usr/bin/wish
***************
*** 899,903 ****
set pd_tearoff 1
! @@ -44,15 +63,14 @@
if {$pd_nt == 2} {
# turn on James Tittle II's fast drawing
--- 897,901 ----
set pd_tearoff 1
! @@ -44,12 +63,8 @@
if {$pd_nt == 2} {
# turn on James Tittle II's fast drawing
***************
*** 914,924 ****
global pd_tearoff
set pd_gui2 [string range $argv0 0 [expr [string last / $argv0 ] - 1]]
! +# this is the embedded libquicktime can find its embedded plugins
! + puts stderr "Setting LIBQUICKTIME_PLUGIN_DIR: $pd_gui2/../../lib/libquicktime"
! + set env(LIBQUICKTIME_PLUGIN_DIR) $pd_gui2/../../lib/libquicktime
! set pd_guidir $pd_gui2/..
! load $pd_guidir/bin/libPdTcl.dylib
! set pd_tearoff 0
! @@ -132,6 +150,15 @@
.mbar add cascade -label "Help" -menu .mbar.help
}
--- 912,916 ----
global pd_tearoff
set pd_gui2 [string range $argv0 0 [expr [string last / $argv0 ] - 1]]
! @@ -132,6 +147,15 @@
.mbar add cascade -label "Help" -menu .mbar.help
}
***************
*** 936,940 ****
set ctrls_meter_on 0
set ctrls_inlevel 0
! @@ -175,7 +201,7 @@
--- 928,932 ----
set ctrls_meter_on 0
set ctrls_inlevel 0
! @@ -175,7 +199,7 @@
***************
*** 945,949 ****
# .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]
--- 937,941 ----
# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
scrollbar .printout.scroll -command ".printout.text yview"
! @@ -364,7 +388,7 @@
global pd_myversion
set name [format ".help%d" $doc_number]
***************
*** 954,958 ****
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]
--- 946,950 ----
scrollbar $name.scroll -command "$name.text yview"
pack $name.scroll -side right -fill y
! @@ -1142,6 +1166,18 @@
$name.popup add command -label {Help} \
-command [concat popup_action $name 2]
***************
*** 973,977 ****
wm protocol $name WM_DELETE_WINDOW [concat menu_close $name]
! @@ -1266,6 +1304,7 @@
global pd_nt
global pd_array_listview_page
--- 965,969 ----
wm protocol $name WM_DELETE_WINDOW [concat menu_close $name]
! @@ -1266,6 +1302,7 @@
global pd_nt
global pd_array_listview_page
***************
*** 981,985 ****
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 \
--- 973,977 ----
set pd_array_listview_id($arrayName) $id
set windowName [format ".%sArrayWindow" $arrayName]
! @@ -1279,8 +1316,7 @@
set $windowName.lb [listbox $windowName.lb -height 20 -width 25\
-selectmode extended \
***************
*** 991,995 ****
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
--- 983,987 ----
set $windowName.lb.sb [scrollbar $windowName.lb.sb \
-command "$windowName.lb yview" -orient vertical]
! @@ -1384,9 +1420,7 @@
proc pdtk_array_listview_edit {arrayName page font} {
global pd_array_listview_entry
***************
*** 1002,1006 ****
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]
--- 994,998 ----
if {[winfo exists $lbName.entry]} {
pdtk_array_listview_update_entry \
! @@ -1398,7 +1432,7 @@
set bbox [$lbName bbox $itemNum]
set y [expr [lindex $bbox 1] - 4]
***************
*** 1011,1015 ****
place configure $lbName.entry -relx 0 -y $y -relwidth 1
lower $lbName.entry
! @@ -1874,6 +1910,8 @@
set vid [string trimleft $id .]
--- 1003,1007 ----
place configure $lbName.entry -relx 0 -y $y -relwidth 1
lower $lbName.entry
! @@ -1874,6 +1908,8 @@
set vid [string trimleft $id .]
***************
*** 1020,1024 ****
global $var_gatomwidth
set var_gatomlo [concat gatomlo_$vid]
! @@ -1898,87 +1936,96 @@
set $var_gatomsymto [gatom_unescape $symto]
--- 1012,1016 ----
global $var_gatomwidth
set var_gatomlo [concat gatomlo_$vid]
! @@ -1898,87 +1934,96 @@
set $var_gatomsymto [gatom_unescape $symto]
***************
*** 1187,1191 ****
$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} {
--- 1179,1183 ----
$id.params.entry select from 0
$id.params.entry select adjust end
! @@ -2131,7 +2176,7 @@
if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} {
***************
*** 1196,1200 ****
}
! @@ -2145,20 +2192,20 @@
set var_iemgui_lcol [concat iemgui_lcol_$vid]
global $var_iemgui_lcol
--- 1188,1192 ----
}
! @@ -2145,20 +2190,20 @@
set var_iemgui_lcol [concat iemgui_lcol_$vid]
global $var_iemgui_lcol
***************
*** 1220,1224 ****
-activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
-foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! @@ -2242,17 +2289,27 @@
}
}
--- 1212,1216 ----
-activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
-foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! @@ -2242,17 +2287,27 @@
}
}
***************
*** 1254,1258 ****
proc iemgui_lb {id} {
! @@ -2398,6 +2455,9 @@
set vid [string trimleft $id .]
--- 1246,1250 ----
proc iemgui_lb {id} {
! @@ -2398,6 +2453,9 @@
set vid [string trimleft $id .]
***************
*** 1264,1268 ****
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
--- 1256,1260 ----
global $var_iemgui_wdt
set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid]
! @@ -2485,7 +2543,8 @@
set $var_iemgui_l2_f1_b0 0
***************
*** 1274,1278 ****
frame $id.dim
! @@ -2518,7 +2579,7 @@
$id.rng.max_lab $id.rng.max_ent -side left} }
--- 1266,1270 ----
frame $id.dim
! @@ -2518,7 +2577,7 @@
$id.rng.max_lab $id.rng.max_ent -side left} }
***************
*** 1283,1287 ****
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} {
--- 1275,1279 ----
frame $id.para
! @@ -2547,157 +2606,189 @@
pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1}
if {[eval concat $$var_iemgui_steady] >= 0} {
***************
*** 1597,1601 ****
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]
--- 1589,1593 ----
if {[info tclversion] < 8.4} {
bind $id <Key-Tab> {tkTabToWindow [tk_focusNext %W]}
! @@ -2712,24 +2803,24 @@
bind $id.rng.min_ent <KeyPress-Return> [concat iemgui_ok $id]
bind $id.rng.max_ent <KeyPress-Return> [concat iemgui_ok $id]
***************
*** 1634,1638 ****
$id.dim.w_ent select from 0
! @@ -2807,6 +2900,7 @@
toplevel $id
--- 1626,1630 ----
$id.dim.w_ent select from 0
! @@ -2807,6 +2898,7 @@
toplevel $id
***************
*** 1642,1646 ****
frame $id.name
! @@ -3264,18 +3358,21 @@
# seven "useful" font sizes.
--- 1634,1638 ----
frame $id.name
! @@ -3264,18 +3356,21 @@
# seven "useful" font sizes.
***************
*** 1667,1671 ****
set width0 [font measure $font x]
set height0 [lindex [font metrics $font] 5]
! @@ -3522,8 +3619,12 @@
# create a popup menu
--- 1659,1663 ----
set width0 [font measure $font x]
set height0 [lindex [font metrics $font] 5]
! @@ -3522,8 +3617,12 @@
# create a popup menu
***************
*** 1680,1684 ****
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
--- 1672,1676 ----
for {set x 0} {$x<[llength $devlist]} {incr x} {
$name.popup add command -label [lindex $devlist $x] \
! @@ -3798,8 +3897,12 @@
# create a popup menu
