Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv23207
Modified Files: Tag: devel_0_37 configure configure.in d_global.c s_inter.c u_main.tk Log Message: fixed throw/catch problem, merged millers u_main.tk, changed configure.in
Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.1.1.4.2.6 retrieving revision 1.1.1.4.2.7 diff -C2 -d -r1.1.1.4.2.6 -r1.1.1.4.2.7 *** configure 18 Nov 2003 10:34:08 -0000 1.1.1.4.2.6 --- configure 24 Nov 2003 16:27:47 -0000 1.1.1.4.2.7 *************** *** 1,5 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.53. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --- 1,5 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # [...5402 lines suppressed...] ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 6835,6840 **** if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null ! $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which --- 6176,6184 ---- if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.1.1.4.2.6 retrieving revision 1.1.1.4.2.7 diff -C2 -d -r1.1.1.4.2.6 -r1.1.1.4.2.7 *** configure.in 18 Nov 2003 10:34:09 -0000 1.1.1.4.2.6 --- configure.in 24 Nov 2003 16:27:49 -0000 1.1.1.4.2.7 *************** *** 58,65 **** echo "dynamic link support required" || exit 1)
- dnl Checking for `sin' function in -lffm: - dnl ffm is the fast math library on the alpha - AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm") - dnl Checking for `sin' function in -lm: AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm", --- 58,61 ---- *************** *** 77,139 **** echo "no X11 found" || exit 1, -L$x_libraries)
! dnl look for tcl 8.x... do I really have to go through all this!?
! foundit=no ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl.h,foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.7/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.6/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.5/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.4/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.3/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.2/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! echo no tcl header found ! exit -1 ! fi
! AC_CHECK_LIB(tcl8.7, main,, ! AC_CHECK_LIB(tcl8.6, main,, ! AC_CHECK_LIB(tcl8.5, main,, ! AC_CHECK_LIB(tcl8.4, main,, ! AC_CHECK_LIB(tcl8.3, main,, ! AC_CHECK_LIB(tcl8.2, main,, ! AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found || exit 1)))))))
! AC_CHECK_LIB(tk8.7, main,, ! AC_CHECK_LIB(tk8.6, main,, ! AC_CHECK_LIB(tk8.5, main,, ! AC_CHECK_LIB(tk8.4, main,, ! AC_CHECK_LIB(tk8.3, main,, ! AC_CHECK_LIB(tk8.2, main,, ! AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1)))))))
if test `uname -s` = Linux; --- 73,101 ---- echo "no X11 found" || exit 1, -L$x_libraries)
! dnl look for tcl 8.x...
! tcllib=""
! AC_CHECK_LIB(tcl8.7, main,tcllib=tcl8.7, ! AC_CHECK_LIB(tcl8.6, main,tcllib=tcl8.6, ! AC_CHECK_LIB(tcl8.5, main,tcllib=tcl8.5, ! AC_CHECK_LIB(tcl8.4, main,tcllib=tcl8.4, ! AC_CHECK_LIB(tcl8.3, main,tcllib=tcl8.3, ! AC_CHECK_LIB(tcl8.2, main,tcllib=tcl8.2, ! AC_CHECK_LIB(tcl8.0, main,tcllib=tcl8.0,echo no tcl library found || exit 1)))))))
! LIBS="$LIBS -l$tcllib" ! tklib=${tcllib/tcl/tk} ! ! AC_CHECK_LIB($tklib, main,,echo no tk library found || exit 1)
+ foundit=no + AC_CHECK_HEADER(tcl.h,foundit=yes,) + + if test "$foundit" = "no"; then + AC_CHECK_HEADER($tcllib/tcl.h, + GUIFLAGS="$GUIFLAGS -I/usr/include/$tcllib", + [echo no tcl header found];exit -1) + fi
if test `uname -s` = Linux; *************** *** 149,155 **** dnl Checking for JACK
! AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no)
LDFLAGS="-Wl,-export-dynamic" --- 111,119 ---- dnl Checking for JACK
! if test "$jack" = "yes"; then ! AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no) ! fi
LDFLAGS="-Wl,-export-dynamic"
Index: d_global.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_global.c,v retrieving revision 1.1.1.2.8.1 retrieving revision 1.1.1.2.8.2 diff -C2 -d -r1.1.1.2.8.1 -r1.1.1.2.8.2 *** d_global.c 18 Nov 2003 10:34:10 -0000 1.1.1.2.8.1 --- d_global.c 24 Nov 2003 16:27:49 -0000 1.1.1.2.8.2 *************** *** 243,247 **** while (n--) { ! *out = (PD_BADFLOAT(*in) ? 0 : *in); out++; in++; --- 243,247 ---- while (n--) { ! *out += (PD_BADFLOAT(*in) ? 0 : *in); out++; in++;
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.6 retrieving revision 1.1.1.3.2.7 diff -C2 -d -r1.1.1.3.2.6 -r1.1.1.3.2.7 *** s_inter.c 25 Sep 2003 20:06:19 -0000 1.1.1.3.2.6 --- s_inter.c 24 Nov 2003 16:27:49 -0000 1.1.1.3.2.7 *************** *** 595,599 **** for (i = 1; i < 22; i++) SETFLOAT(zz + i, defaultfontshit[i-1]); ! glob_initfromgui(0, 0, 22, zz); } else --- 595,600 ---- for (i = 1; i < 22; i++) SETFLOAT(zz + i, defaultfontshit[i-1]); ! SETFLOAT(zz+22,0); ! glob_initfromgui(0, 0, 23, zz); } else
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.6 retrieving revision 1.1.1.4.2.7 diff -C2 -d -r1.1.1.4.2.6 -r1.1.1.4.2.7 *** u_main.tk 19 Oct 2003 19:45:29 -0000 1.1.1.4.2.6 --- u_main.tk 24 Nov 2003 16:27:49 -0000 1.1.1.4.2.7 *************** *** 1,3 **** ! set pd_nt 0 # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX. The first # line is automatically munged by the relevant makefiles.) --- 1,3 ---- ! set pd_nt 1 # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX. The first # line is automatically munged by the relevant makefiles.) *************** *** 124,127 **** --- 124,132 ---- bind . <Control-Key> {pdtk_pd_ctrlkey %W %K 0} bind . <Control-Shift-Key> {pdtk_pd_ctrlkey %W %K 1} + if {$pd_nt == 2} { + bind . <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind . <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} + } +
wm title . "Pd" *************** *** 287,291 ****
set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes { {{documentation} {.pd .txt .htm .html}} } \ -initialdir $help_directory]
--- 292,296 ----
set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes { {{documentation} {.pd .txt .htm}} } \ -initialdir $help_directory]
*************** *** 925,928 **** --- 930,937 ---- bind $name.c <Alt-Key> {pdtk_canvas_altkey %W %K %A} # bind $name.c <Mod1-Key> {puts stderr [concat mod1 %W %K %A]} + if {$pd_nt == 2} { + bind $name.c <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind $name.c <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} + } bind $name.c <Key> {pdtk_canvas_key %W %K %A 0} bind $name.c <Shift-Key> {pdtk_canvas_key %W %K %A 1} *************** *** 2642,2645 **** --- 2651,2663 ---- set height7 [lindex [font metrics -*-courier-bold--normal--36-*] 5]
+ set tclpatch [info patchlevel] + if {$tclpatch == "8.3.0" || \ + $tclpatch == "8.3.1" || \ + $tclpatch == "8.3.2" || \ + $tclpatch == "8.3.3" } { + set oldtclversion 1 + } else { + set oldtclversion 0 + } pd [concat pd init [pdtk_enquote [pwd]] \ 8 $width1 $height1 \ *************** *** 2650,2654 **** 24 $width6 $height6 \ 36 $width7 $height7 \ ! ;];
# add the audio and help menus to the Pd window. We delayed this --- 2668,2672 ---- 24 $width6 $height6 \ 36 $width7 $height7 \ ! $oldtclversion ;];
# add the audio and help menus to the Pd window. We delayed this