diff -ruN TiMidity++-1.3.1/ChangeLog TiMidity++-1.3.2/ChangeLog --- TiMidity++-1.3.1/ChangeLog Fri Feb 5 14:39:00 1999 +++ TiMidity++-1.3.2/ChangeLog Wed Feb 10 14:37:39 1999 @@ -1,3 +1,64 @@ +-- 1.3.2 +Wed Feb 10 1999 +Summary: + * Patched for BSD/OS. + * Changed icons of motif interface. + * Changed sorting algorithm for xaw and Tck/Tk interface. + * Fixed bugs and probrems of Tcl/Tk interface + +Date: Wed Feb 10 1999 +From: Masanao Izumo +Files: configure.h timidity/timidity.h + Included from timidity.h if configure finds it. +Files: interface/tkpanel.tcl + Fixed bug of Tcl/Tk interface: If a file is added on suffle, it is + possible to be error. Tck may access to out of range of Stat(SuffleList). + +Date: Tue, 09 Feb 1999 04:11:55 +0900 +From: (Masahiko Kimoto) +Files: configure.in timidity/linux_a.c timidity/timidity.h + Patched for BSD/OS. + +Date: Mon, 08 Feb 1999 07:42:46 -0500 +From: Roger Fujii +Files: interface/motif_i.c + interface/motif_bitmaps/{Makefile.in,Makefile.am,back.xbm,fwd.xbm, + next.xbm,pause.xbm,prev.xbm,quit.xbm,restart.xbm,timidity.xbm,Makefile} + Attached is better looking xbms for the motif interface + plus a fix to prevent the last button from resizing + when the window is resized. + +Date: Mon Feb 8 JST 1999 +From: Masanao Izumo +Files: interface/ncurs_c.c + Modified ncurs_c.c. + +Date: Sun Feb 7 1999 +From: Masanao Izumo +Files: interface/vt100_c.c + Bug fixed for Windows. select() from Windows API is not available for file + descriptor, but from EGCS is ok. +Files: interface/browser.tcl + Changed `lsort -dictionary' to `lsort -ascii'. + +Date: Sat, 6 Feb 1999 10:44:42 +0100 (CET) +From: Peter Kleiweg +Files: interface/xaw_i.c + Changed the sorting algorithm for the xaw interface. Now, directories + are listed before regular files. + +Date: Sat, 6 Feb 1999 01:45:20 +0100 (CET) +From: Peter Kleiweg +Files: interface/tkpanel.tcl + Fixed Tck/Tk interface probrem: + The proc MakeShuffleList is broken. The list of numbers it generates + has a `hole' in it. This generates an error when the last number in + the list has been played. + Also, with Tk, whenever a new song starts, the global X11 selection is + changed. This is very annoying when I'm just doing some cut-and-paste + in another application. I can even loose the data I was attempting to + move. So I changed this behavior in tkpanel. + -- 1.3.1 Fri Feb 5 1999 Summary: diff -ruN TiMidity++-1.3.1/NEWS TiMidity++-1.3.2/NEWS --- TiMidity++-1.3.1/NEWS Fri Feb 5 14:39:57 1999 +++ TiMidity++-1.3.2/NEWS Wed Feb 10 12:50:05 1999 @@ -1,3 +1,9 @@ +* 2/10, 1999 + Released TiMidity++ v1.3.2. + * Fixed some bugs and probrems. + * Changed icons of motif interface. + * Changed sorting algorithm for xaw and tcktl interface. + * 2/5, 1999 Released TiMidity++ v1.3.1. * Fixed some bugs. diff -ruN TiMidity++-1.3.1/acinclude.m4 TiMidity++-1.3.2/acinclude.m4 --- TiMidity++-1.3.1/acinclude.m4 Thu Feb 4 18:06:49 1999 +++ TiMidity++-1.3.2/acinclude.m4 Wed Feb 10 13:03:58 1999 @@ -345,3 +345,14 @@ ])dnl fi ]) + + +dnl EXTRACT_CPPFLAGS(CPPFLAGS-to-append,others-to-append,FLAGS) +AC_DEFUN(EXTRACT_CPPFLAGS, +[for f in $3; do + case ".$f" in + .-I?*|.-D?*) $1="[$]$1 $f" ;; + *) $2="[$]$1 $f" ;; + esac +done +]) diff -ruN TiMidity++-1.3.1/aclocal.m4 TiMidity++-1.3.2/aclocal.m4 --- TiMidity++-1.3.1/aclocal.m4 Fri Feb 5 14:36:00 1999 +++ TiMidity++-1.3.2/aclocal.m4 Wed Feb 10 13:04:03 1999 @@ -358,6 +358,17 @@ fi ]) + +dnl EXTRACT_CPPFLAGS(CPPFLAGS-to-append,others-to-append,FLAGS) +AC_DEFUN(EXTRACT_CPPFLAGS, +[for f in $3; do + case ".$f" in + .-I?*|.-D?*) $1="[$]$1 $f" ;; + *) $2="[$]$1 $f" ;; + esac +done +]) + # Define a conditional. AC_DEFUN(AM_CONDITIONAL, diff -ruN TiMidity++-1.3.1/common.makefile.in TiMidity++-1.3.2/common.makefile.in --- TiMidity++-1.3.1/common.makefile.in Fri Jan 29 13:37:22 1999 +++ TiMidity++-1.3.2/common.makefile.in Wed Feb 10 13:15:05 1999 @@ -20,31 +20,8 @@ #SHELL=/bin/sh -########### Compiler and flags. - -#srcdir = @srcdir@ -#top_srcdir = @top_srcdir@ -#VPATH = @srcdir@ -#prefix = @prefix@ -#exec_prefix = @exec_prefix@ - -#bindir = @bindir@ -#sbindir = @sbindir@ -#libexecdir = @libexecdir@ -#datadir = @datadir@ -#sysconfdir = @sysconfdir@ -#sharedstatedir = @sharedstatedir@ -#localstatedir = @localstatedir@ -#libdir = @libdir@ -#infodir = @infodir@ -#mandir = @mandir@ -#includedir = @includedir@ -#oldincludedir = /usr/include - -pkgdatadir = $(datadir)/timidity -pkglibdir = $(libdir)/timidity -pkgincludedir = $(includedir)/timidity +## Package compilations: #CC= @CC@ #CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ @EXTRADEFS@ -DDEFAULT_PATH=\"$(TIMID_DIR)\" @@ -55,17 +32,23 @@ SHCFLAGS = @SHCFLAGS@ #@SET_MAKE@ -########### Install. + +## Package installations: +#prefix = @prefix@ +#exec_prefix = @exec_prefix@ +#bindir = @bindir@ +#libdir = @libdir@ +#mandir = @mandir@ +pkglibdir = $(libdir)/timidity #INSTALL = @INSTALL@ # Where to install the patches, config files, and MIDI files. # If you change this, it's a good idea to recompile the binary, # or you'll need to invoke timidity with the -L option. -#TIMID_DIR = $(prefix)/lib/timidity TIMID_DIR = $(pkglibdir) # Where to install the Tcl code, if you use the Tcl code that is. -TCL_DIR = $(TIMID_DIR) -#TCL_DIR = $(pkgdatadir) +TCL_DIR = $(pkglibdir) + .SUFFIXES: .c .h .ptcl .tcl .o .1 .txt .ps .@so@ diff -ruN TiMidity++-1.3.1/config.h.in TiMidity++-1.3.2/config.h.in --- TiMidity++-1.3.1/config.h.in Tue Feb 2 18:14:02 1999 +++ TiMidity++-1.3.2/config.h.in Tue Feb 9 15:00:40 1999 @@ -119,6 +119,9 @@ /* Define if you have the header file. */ #undef HAVE_LIMITS_H +/* Define if you have the header file. */ +#undef HAVE_MACHINE_ENDIAN_H + /* Define if you have the header file. */ #undef HAVE_MALLOC_H diff -ruN TiMidity++-1.3.1/configure TiMidity++-1.3.2/configure --- TiMidity++-1.3.1/configure Fri Feb 5 14:36:04 1999 +++ TiMidity++-1.3.2/configure Wed Feb 10 13:04:07 1999 @@ -836,7 +836,7 @@ PACKAGE=TiMidity++ -VERSION=1.3.1 +VERSION=1.3.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -3227,7 +3227,7 @@ fi -for ac_hdr in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h unistd.h dlfcn.h glob.h getopt.h errno.h +for ac_hdr in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -4763,15 +4763,26 @@ if test "x$have_alsa" = "xyes"; then EXTRADEFS="$EXTRADEFS -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" - CFLAGS="$CFLAGS $ALSA_CFLAGS" + for f in $ALSA_CFLAGS; do + case ".$f" in + .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; + *) CFLAGS="$CPPFLAGS $f" ;; + esac +done + LIBS="$LIBS $ALSA_LIBS" fi ;; - *-*-bsdi2.?|*-*-bsdi3.?) + *-*-bsdi2.0) EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500" SYSEXTRAS="$SYSEXTRAS bsd20_a.c" echo "$ac_t""yes bsdi" 1>&6 ;; + *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?) + EXTRADEFS="$EXTRADEFS -DAU_LINUX" + SYSEXTRAS="$SYSEXTRAS linux_a.c" + echo "$ac_t""yes bsdi" 1>&6 + ;; *-*-hpux*) EXTRADEFS="$EXTRADEFS -DAU_HPUX" SYSEXTRAS="$SYSEXTRAS hpux_d_a.c hpux_a.c" @@ -4867,12 +4878,12 @@ have_dl=no echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:4871: checking for LoadLibraryExA" >&5 +echo "configure:4882: checking for LoadLibraryExA" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4881,7 +4892,7 @@ LoadLibraryExA(0,0,0); ; return 0; } EOF -if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* wapi_cv_func_LoadLibraryExA=yes else @@ -4904,12 +4915,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4908: checking for shl_load" >&5 +echo "configure:4919: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -4957,12 +4968,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4961: checking for dlopen" >&5 +echo "configure:4972: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5007,12 +5018,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5011: checking for dld_init" >&5 +echo "configure:5022: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -5057,7 +5068,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5061: checking for dld_init in -ldld" >&5 +echo "configure:5072: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5065,7 +5076,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5099,13 +5110,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5103: checking dynamic link method" >&5 +echo "configure:5114: checking dynamic link method" >&5 case "$have_dl" in dlopen) echo "$ac_t""use dl_dlopen.c" 1>&6 SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:5109: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5120: checking whether your dlsym() needs a leading underscore" >&5 if eval "test \"`echo '$''{'timidity_cv_func_dlsym_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5253,17 +5264,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5257: checking for $ac_hdr" >&5 +echo "configure:5268: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5290,7 +5301,7 @@ done echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5294: checking for initscr in -lncurses" >&5 +echo "configure:5305: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5298,7 +5309,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5388,7 +5399,7 @@ enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) KEEPLIBS=$LIBS echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:5392: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5403: checking for SLang_init_tty in -lslang" >&5 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5396,7 +5407,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5460,7 +5471,7 @@ dynamic_targets="$dynamic_targets interface_s.\$(so)" s_so_libs="-lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:5464: checking for initscr in -ltermcap" >&5 +echo "configure:5475: checking for initscr in -ltermcap" >&5 ac_lib_var=`echo termcap'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5468,7 +5479,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5597,7 +5608,7 @@ tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6 -echo "configure:5601: checking for Tcl_Init in -l$l" >&5 +echo "configure:5612: checking for Tcl_Init in -l$l" >&5 ac_lib_var=`echo $l'_'Tcl_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5605,7 +5616,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5640,7 +5651,7 @@ LIBS="$LIBS $tcl_lib" for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do case "x$tk_lib" in x) echo $ac_n "checking for Tk_Init in -l$l""... $ac_c" 1>&6 -echo "configure:5644: checking for Tk_Init in -l$l" >&5 +echo "configure:5655: checking for Tk_Init in -l$l" >&5 ac_lib_var=`echo $l'_'Tk_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5648,7 +5659,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6020,7 +6031,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6024: checking for $ac_word" >&5 +echo "configure:6035: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6051,7 +6062,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6055: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6066: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -6074,7 +6085,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6140,7 +6151,7 @@ } EOF -if { (eval echo configure:6144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6174,7 +6185,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6184,7 +6195,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -6240,12 +6251,24 @@ ENABLE_GTK_FALSE= fi LIBS="$LIBS $GTK_LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" + for f in $GTK_CFLAGS; do + case ".$f" in + .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; + *) CFLAGS="$CPPFLAGS $f" ;; + esac +done + ;; xdynamic) dynamic_targets="$dynamic_targets interface_g.\$(so)" g_so_libs="$GTK_LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" + for f in $GTK_CFLAGS; do + case ".$f" in + .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; + *) CFLAGS="$CPPFLAGS $f" ;; + esac +done + ;; *) @@ -6263,17 +6286,17 @@ fi ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:6267: checking for X11/xpm.h" >&5 +echo "configure:6290: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6296,7 +6319,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:6300: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:6323: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6304,7 +6327,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6387,7 +6410,7 @@ LDFLAGS="$LDFLAGS $offix_lib_dir" LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11" echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:6391: checking for DndInitialize in -lDnd" >&5 +echo "configure:6414: checking for DndInitialize in -lDnd" >&5 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6395,7 +6418,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff -ruN TiMidity++-1.3.1/configure.in TiMidity++-1.3.2/configure.in --- TiMidity++-1.3.1/configure.in Fri Feb 5 13:37:00 1999 +++ TiMidity++-1.3.2/configure.in Wed Feb 10 13:00:45 1999 @@ -54,7 +54,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.3.1, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.3.2, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -239,7 +239,7 @@ AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h unistd.h dlfcn.h glob.h getopt.h errno.h) +AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h) AC_CHECK_HEADER(string.h,, [ EXTRADEFS="$EXTRADEFS -DNO_STRING_H " ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -367,15 +367,20 @@ if test "x$have_alsa" = "xyes"; then EXTRADEFS="$EXTRADEFS -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" - CFLAGS="$CFLAGS $ALSA_CFLAGS" + EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$ALSA_CFLAGS) LIBS="$LIBS $ALSA_LIBS" fi ;; - *-*-bsdi2.?|*-*-bsdi3.?) + *-*-bsdi2.0) EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500" SYSEXTRAS="$SYSEXTRAS bsd20_a.c" AC_MSG_RESULT(yes bsdi) ;; + *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?) + EXTRADEFS="$EXTRADEFS -DAU_LINUX" + SYSEXTRAS="$SYSEXTRAS linux_a.c" + AC_MSG_RESULT(yes bsdi) + ;; *-*-hpux*) EXTRADEFS="$EXTRADEFS -DAU_HPUX" SYSEXTRAS="$SYSEXTRAS hpux_d_a.c hpux_a.c" @@ -725,9 +730,9 @@ [ --enable-gtk Enable GTK+ interface (default is no)], [ AM_PATH_GTK(1.1.3,,enable_gtk=no) ], [ LIBS="$LIBS $GTK_LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" ], + EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$GTK_CFLAGS) ], [ g_so_libs="$GTK_LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" ]) + EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$GTK_CFLAGS) ]) dnl UMP configuration diff -ruN TiMidity++-1.3.1/interface/Makefile.am TiMidity++-1.3.2/interface/Makefile.am --- TiMidity++-1.3.1/interface/Makefile.am Fri Feb 5 13:46:00 1999 +++ TiMidity++-1.3.2/interface/Makefile.am Mon Feb 8 04:45:21 1999 @@ -292,11 +292,10 @@ interface_g.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) +endif clean-compile: -rm -f *.$(so) - -endif install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics) ########## End of Makefile diff -ruN TiMidity++-1.3.1/interface/Makefile.in TiMidity++-1.3.2/interface/Makefile.in --- TiMidity++-1.3.1/interface/Makefile.in Fri Feb 5 14:40:49 1999 +++ TiMidity++-1.3.2/interface/Makefile.in Wed Feb 10 14:37:54 1999 @@ -432,6 +432,19 @@ ../timidity/output.h ../timidity/controls.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/miditrace.h +gtk_c.o: gtk_c.c ../config.h ../timidity/timidity.h ../timidity/common.h \ + ../libarc/url.h ../utils/mblock.h ../timidity/instrum.h \ + ../timidity/playmidi.h ../timidity/output.h \ + ../timidity/controls.h gtk_h.h +gtk_i.o: gtk_i.c ../config.h ../timidity/timidity.h ../timidity/common.h \ + ../libarc/url.h ../utils/mblock.h gtk_h.h pixmaps/playpaus.xpm \ + pixmaps/prevtrk.xpm pixmaps/nexttrk.xpm pixmaps/rew.xpm \ + pixmaps/ff.xpm pixmaps/restart.xpm pixmaps/quit.xpm \ + pixmaps/quiet.xpm pixmaps/loud.xpm pixmaps/open.xpm \ + pixmaps/keyup.xpm pixmaps/keydown.xpm pixmaps/slow.xpm \ + pixmaps/fast.xpm +gtk_p.o: gtk_p.c ../config.h ../timidity/timidity.h \ + ../timidity/controls.h gtk_h.h motif_c.o: motif_c.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/instrum.h ../timidity/playmidi.h \ @@ -677,8 +690,8 @@ @NEEDDLOPEN_TRUE@interface_g.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) @NEEDDLOPEN_TRUE@ $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) -@NEEDDLOPEN_TRUE@clean-compile: -@NEEDDLOPEN_TRUE@ -rm -f *.$(so) +clean-compile: + -rm -f *.$(so) install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics) ########## End of Makefile diff -ruN TiMidity++-1.3.1/interface/browser.tcl TiMidity++-1.3.2/interface/browser.tcl --- TiMidity++-1.3.1/interface/browser.tcl Wed Feb 3 05:11:55 1999 +++ TiMidity++-1.3.2/interface/browser.tcl Sun Feb 7 05:18:56 1999 @@ -233,6 +233,7 @@ proc fs:update {w} { global fs + set sortOption -ascii if ![file isdirectory $fs(curdir)] { if {[file exists $fs(curdir)] || $fs(creatable)} { set fs(found) $fs(curdir) @@ -260,7 +261,7 @@ set patbase "" } - foreach i [lsort -dictionary [glob -nocomplain $patbase$filter]] { + foreach i [lsort $sortOption [glob -nocomplain $patbase$filter]] { if ![regexp "^.*/(\[^/\]+)$" $i full base] { set base $i } @@ -271,7 +272,7 @@ set prev ".." $dir insert end $prev - foreach i [lsort -dictionary [glob -nocomplain $patbase$lookall $patbase$filter]] { + foreach i [lsort $sortOption [glob -nocomplain $patbase$lookall $patbase$filter]] { if {$i == $prev} {continue} if ![regexp "^.*/(\[^/\]+)$" $i full base] { set base $i diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/back.xbm TiMidity++-1.3.2/interface/motif_bitmaps/back.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/back.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/back.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define back_width 49 #define back_height 28 -static char back_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, - 0x00,0x80,0x61,0x00,0x00,0x00,0x00,0x00,0x60,0x78,0x00,0x00,0x00,0x00,0x00, - 0x18,0x7e,0x00,0x00,0x00,0x00,0x00,0x86,0x7f,0x00,0x00,0x00,0x00,0x00,0xe1, - 0x7f,0x00,0x00,0x00,0x00,0x00,0x86,0x7f,0x00,0x00,0x00,0x00,0x00,0x18,0x7e, - 0x00,0x00,0x00,0x00,0x00,0x60,0x78,0x00,0x00,0x00,0x00,0x00,0x80,0x61,0x00, - 0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00, - 0x00,0x1f,0x00,0x00,0x80,0x00,0x00,0x00,0x31,0x00,0x00,0x80,0x00,0x00,0x00, - 0x31,0x00,0x00,0x80,0x00,0x00,0x00,0x31,0x00,0x00,0x80,0x00,0x00,0x00,0x3f, - 0x00,0x00,0xf0,0x00,0x00,0x00,0x31,0x02,0xea,0x99,0x00,0x00,0x00,0x61,0x22, - 0x32,0x88,0x00,0x00,0x00,0x61,0x76,0x13,0x88,0x00,0x00,0x00,0x61,0xdc,0x11, - 0x88,0x01,0x00,0x00,0x3f,0x8c,0x11,0x70,0x07,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char back_bits[] = { + 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x80, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, + 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0xfe, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x8e, 0xff, 0x01, 0x00, 0x00, 0x00, 0x80, 0xe3, 0xff, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x8e, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0xfe, + 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x80, 0xe3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf8, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x10, 0x71, 0x78, 0x3a, 0x00, 0x00, 0x00, 0xf0, 0x80, 0x44, + 0x12, 0x00, 0x00, 0x00, 0x10, 0xf1, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x10, + 0x89, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x10, 0xc9, 0x44, 0x12, 0x00, 0x00, + 0x00, 0xf8, 0xb0, 0x39, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/fwd.xbm TiMidity++-1.3.2/interface/motif_bitmaps/fwd.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/fwd.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/fwd.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define fwd_width 49 #define fwd_height 28 -static char fwd_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00, - 0x00,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x3c,0x0c,0x00,0x00,0x00,0x00,0x00, - 0xfc,0x30,0x00,0x00,0x00,0x00,0x00,0xfc,0xc3,0x00,0x00,0x00,0x00,0x00,0xfc, - 0x0f,0x01,0x00,0x00,0x00,0x00,0xfc,0xc3,0x00,0x00,0x00,0x00,0x00,0xfc,0x30, - 0x00,0x00,0x00,0x00,0x00,0x3c,0x0c,0x00,0x00,0x00,0x00,0x00,0x0c,0x03,0x00, - 0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x7e,0x38,0x00,0x00,0x00,0x00,0x00,0x06,0x0c,0x00,0x00,0x00,0x00,0x00, - 0x06,0x0c,0x00,0x00,0x00,0x00,0x00,0x06,0x0c,0x00,0x00,0x00,0x00,0x00,0x06, - 0x0c,0x00,0xf0,0x00,0x00,0x00,0x7e,0x1c,0x03,0x13,0x01,0x00,0x00,0x06,0x0c, - 0x32,0x11,0x01,0x00,0x00,0x06,0x0c,0x3a,0x11,0x01,0x00,0x00,0x06,0x0c,0xee, - 0x11,0x01,0x00,0x00,0x06,0x0c,0xc4,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char fwd_bits[] = { + 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x3c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xe3, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xfc, 0x8f, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x06, 0x00, + 0x00, 0x00, 0x00, 0xfc, 0x8f, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xe3, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x3f, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x04, 0x00, + 0x00, 0x00, 0x00, 0xca, 0x9d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x8e, 0x48, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x4a, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x82, 0x4a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x82, 0x4a, 0x06, 0x00, 0x00, + 0x00, 0x00, 0x07, 0x85, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/next.xbm TiMidity++-1.3.2/interface/motif_bitmaps/next.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/next.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/next.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define next_width 49 #define next_height 28 -static char next_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x0c,0x00,0x00,0x00, - 0x00,0x0c,0x03,0x0c,0x00,0x00,0x00,0x00,0x3c,0x0c,0x0c,0x00,0x00,0x00,0x00, - 0xfc,0x30,0x0c,0x00,0x00,0x00,0x00,0xfc,0xc3,0x0c,0x00,0x00,0x00,0x00,0xfc, - 0x0f,0x0d,0x00,0x00,0x00,0x00,0xfc,0xc3,0x0c,0x00,0x00,0x00,0x00,0xfc,0x30, - 0x0c,0x00,0x00,0x00,0x00,0x3c,0x0c,0x0c,0x00,0x00,0x00,0x00,0x0c,0x03,0x0c, - 0x00,0x00,0x00,0x00,0x80,0x00,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x86,0x00,0x00,0x04,0x00,0x00,0x00, - 0x8e,0x00,0x00,0x04,0x00,0x00,0x00,0x9a,0x00,0x40,0x02,0x00,0x00,0x00,0x92, - 0xf0,0x22,0x7e,0x00,0x00,0x00,0xb2,0x98,0x24,0x01,0x00,0x00,0x00,0xe2,0x78, - 0x18,0x01,0x00,0x00,0x00,0xc2,0x08,0x18,0x01,0x00,0x00,0x00,0xc2,0xc8,0x24, - 0x23,0x00,0x00,0x00,0x82,0x78,0x42,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char next_bits[] = { + 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x71, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x80, 0xc7, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x1f, + 0x07, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x7f, 0x1c, 0x0c, 0x00, 0x00, 0x00, + 0x80, 0xff, 0x71, 0x0c, 0x00, 0x00, 0x00, 0x80, 0xff, 0xc7, 0x0d, 0x00, + 0x00, 0x00, 0x80, 0xff, 0x71, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x7f, 0x1c, + 0x0c, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x07, 0x0c, 0x00, 0x00, 0x00, 0x80, + 0xc7, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x71, 0x00, 0x0c, 0x00, 0x00, + 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0x00, 0x04, 0x00, + 0x00, 0x00, 0x50, 0x71, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x50, 0x89, 0x24, + 0x04, 0x00, 0x00, 0x00, 0x50, 0xf9, 0x18, 0x04, 0x00, 0x00, 0x00, 0x50, + 0x09, 0x18, 0x04, 0x00, 0x00, 0x00, 0x90, 0x11, 0x24, 0x44, 0x00, 0x00, + 0x00, 0xb8, 0xf1, 0x66, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/pause.xbm TiMidity++-1.3.2/interface/motif_bitmaps/pause.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/pause.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/pause.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define pause_width 49 #define pause_height 28 -static char pause_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x38,0x1c,0x00,0x00,0x00,0x00,0x00,0x38,0x1c,0x00,0x00,0x00,0x00,0x00, - 0x38,0x1c,0x00,0x00,0x00,0x00,0x00,0x38,0x1c,0x00,0x00,0x00,0x00,0x00,0x38, - 0x1c,0x00,0x00,0x00,0x00,0x00,0x38,0x1c,0x00,0x00,0x00,0x00,0x00,0x38,0x1c, - 0x00,0x00,0x00,0x00,0x00,0x38,0x1c,0x00,0x00,0x00,0x00,0x00,0x38,0x1c,0x00, - 0x00,0x00,0x00,0x00,0x38,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0xc0,0x03,0x00,0x00,0x00,0x00,0x00,0x20,0x04,0x00,0x00,0x00,0x00,0x00, - 0x20,0x04,0x00,0x00,0x00,0x00,0x00,0x20,0x04,0x00,0x00,0x00,0x00,0x00,0x20, - 0x04,0x00,0x00,0x00,0x00,0x00,0xe0,0x83,0x43,0x04,0x07,0x07,0x00,0x20,0x40, - 0x42,0x84,0x88,0x08,0x00,0x20,0x00,0x42,0x84,0x81,0x08,0x00,0x20,0xc0,0x43, - 0x04,0x86,0x07,0x00,0x20,0x40,0x42,0x04,0x88,0x00,0x00,0x20,0x40,0x42,0x46, - 0x88,0x08,0x00,0x20,0xc0,0x85,0x89,0x07,0x07,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char pause_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, + 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x24, 0xce, 0x8c, 0xc7, 0x01, 0x00, 0x00, 0x24, 0x90, 0xc8, + 0x24, 0x02, 0x00, 0x00, 0x1c, 0x9e, 0x88, 0xe3, 0x03, 0x00, 0x00, 0x04, + 0x91, 0x08, 0x24, 0x00, 0x00, 0x00, 0x04, 0x99, 0x4c, 0x44, 0x00, 0x00, + 0x00, 0x0e, 0x36, 0xdb, 0xc3, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/prev.xbm TiMidity++-1.3.2/interface/motif_bitmaps/prev.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/prev.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/prev.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define prev_width 49 #define prev_height 28 -static char prev_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x02,0x00,0x00,0x00,0x00, - 0x60,0x80,0x61,0x00,0x00,0x00,0x00,0x60,0x60,0x78,0x00,0x00,0x00,0x00,0x60, - 0x18,0x7e,0x00,0x00,0x00,0x00,0x60,0x86,0x7f,0x00,0x00,0x00,0x00,0x60,0xe1, - 0x7f,0x00,0x00,0x00,0x00,0x60,0x86,0x7f,0x00,0x00,0x00,0x00,0x60,0x18,0x7e, - 0x00,0x00,0x00,0x00,0x60,0x60,0x78,0x00,0x00,0x00,0x00,0x60,0x80,0x61,0x00, - 0x00,0x00,0x00,0x60,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00, - 0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, - 0x60,0x44,0x00,0x00,0x00,0x00,0x41,0x93,0x44,0x00,0x00,0x00,0x00,0xc1,0x88, - 0x28,0x00,0x00,0x00,0x00,0x41,0x78,0x28,0x00,0x00,0x00,0x00,0x41,0x08,0x10, - 0x00,0x00,0x00,0x00,0x41,0xf0,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char prev_bits[] = { + 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x01, 0x70, 0x0c, + 0x00, 0x00, 0x00, 0x80, 0x01, 0x1c, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x01, + 0xc7, 0x0f, 0x00, 0x00, 0x00, 0x80, 0xc1, 0xf1, 0x0f, 0x00, 0x00, 0x00, + 0x80, 0x71, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x1d, 0xff, 0x0f, 0x00, + 0x00, 0x00, 0x80, 0x71, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x80, 0xc1, 0xf1, + 0x0f, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc7, 0x0f, 0x00, 0x00, 0x00, 0x80, + 0x01, 0x1c, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x01, 0x70, 0x0c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x20, 0xd9, 0x38, 0x77, 0x00, 0x00, 0x00, 0x20, 0xb1, 0x44, + 0x22, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x7c, 0x22, 0x00, 0x00, 0x00, 0x20, + 0x10, 0x04, 0x14, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x14, 0x00, 0x00, + 0x00, 0x70, 0xf8, 0x78, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/quit.xbm TiMidity++-1.3.2/interface/motif_bitmaps/quit.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/quit.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/quit.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define quit_width 49 #define quit_height 28 -static char quit_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00, - 0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc, - 0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f, - 0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00, - 0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0xf0,0x00,0x80,0x20,0x00,0x00,0x00, - 0x08,0x01,0x00,0x10,0x00,0x00,0x00,0x04,0x42,0x08,0xf8,0x01,0x00,0x00,0x04, - 0x42,0x88,0x08,0x00,0x00,0x00,0x64,0x42,0x88,0x08,0x00,0x00,0x00,0x44,0x21, - 0x88,0x08,0x01,0x00,0x00,0x88,0x21,0x84,0x18,0x01,0x00,0x00,0x78,0xc6,0x87, - 0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char quit_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, + 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x70, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x88, 0x66, 0x0e, 0x1f, 0x00, 0x00, 0x00, 0x88, 0x44, 0x08, + 0x02, 0x00, 0x00, 0x00, 0x88, 0x44, 0x08, 0x02, 0x00, 0x00, 0x00, 0x88, + 0x44, 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x64, 0x08, 0x22, 0x00, 0x00, + 0x00, 0x70, 0xd8, 0x3e, 0x1c, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_bitmaps/restart.xbm TiMidity++-1.3.2/interface/motif_bitmaps/restart.xbm --- TiMidity++-1.3.1/interface/motif_bitmaps/restart.xbm Mon Nov 2 12:29:08 1998 +++ TiMidity++-1.3.2/interface/motif_bitmaps/restart.xbm Tue Feb 9 13:09:14 1999 @@ -1,17 +1,20 @@ #define restart_width 49 #define restart_height 28 -static char restart_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80, - 0xff,0x01,0x00,0x00,0x00,0x00,0x80,0xff,0x01,0x60,0x00,0x00,0x00,0x80,0xff, - 0x01,0x10,0x00,0x00,0x00,0x80,0xff,0x01,0x0c,0x00,0x00,0x00,0x80,0xff,0x01, - 0x02,0x00,0x00,0x00,0x80,0xff,0x81,0x01,0x00,0x00,0x00,0x80,0xff,0x01,0x02, - 0x00,0x00,0x00,0x80,0xff,0x01,0x0c,0x00,0x00,0x00,0x80,0xff,0x01,0x10,0x00, - 0x00,0x00,0x80,0xff,0x01,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0, - 0x03,0x00,0x02,0x00,0x08,0x00,0x10,0x06,0x00,0x02,0x00,0x08,0x00,0x10,0x04, - 0x00,0x02,0x00,0x38,0x00,0x10,0xe6,0xfb,0x1e,0x00,0x08,0x00,0x10,0x13,0x0a, - 0xc2,0xa3,0x09,0x00,0xf0,0xf1,0x3b,0x62,0xe2,0x08,0x00,0x90,0x13,0x60,0x22, - 0x62,0x08,0x00,0x10,0x16,0x40,0x22,0x22,0x08,0x00,0x10,0xe4,0x79,0xee,0x2d, - 0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00}; +static unsigned char restart_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x00, 0x38, + 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xfe, 0x3f, + 0x80, 0x03, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x00, + 0xfe, 0x3f, 0x38, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x0e, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0xbf, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x0e, + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x38, 0x00, 0x00, 0x00, 0x00, 0xfe, + 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x80, 0x03, 0x00, 0x00, + 0x00, 0xfe, 0x3f, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xfe, 0x3f, 0x00, 0x38, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x80, 0x00, 0x00, 0x10, + 0x00, 0x22, 0x0e, 0xcf, 0xc7, 0xb1, 0xf9, 0x00, 0x22, 0x91, 0x89, 0x00, + 0x62, 0x11, 0x00, 0x1e, 0x1f, 0x87, 0xc0, 0x23, 0x10, 0x00, 0x22, 0x01, + 0x88, 0x20, 0x22, 0x10, 0x00, 0x22, 0x82, 0x88, 0x28, 0x23, 0x10, 0x01, + 0x47, 0x9e, 0x07, 0xc7, 0xf6, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; diff -ruN TiMidity++-1.3.1/interface/motif_i.c TiMidity++-1.3.2/interface/motif_i.c --- TiMidity++-1.3.1/interface/motif_i.c Wed Dec 16 16:29:14 1998 +++ TiMidity++-1.3.2/interface/motif_i.c Tue Feb 9 13:09:38 1999 @@ -1059,7 +1059,7 @@ XtSetArg(al[ac], XmNtopOffset, 10); ac++; XtSetArg(al[ac], XmNbottomOffset, 10); ac++; XtSetArg(al[ac], XmNleftAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; +// XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; XtSetArg(al[ac],XmNtopAttachment,XmATTACH_WIDGET); ac++; XtSetArg(al[ac], XmNtopWidget, locator_scale); ac++; btnForm = XmCreateForm(mainForm,"btnForm", al, ac); @@ -1071,6 +1071,7 @@ XtSetArg(al[ac], XmNleftAttachment, XmATTACH_FORM); ac++; XtSetArg(al[ac], XmNleftOffset, 10); ac++; XtSetArg(al[ac], XmNshadowType, XmSHADOW_OUT); ac++; + XtSetArg(al[ac], XmNshadowThickness, 2); ac++; XtSetArg(al[ac], XmNlabelType, XmPIXMAP); ac++; XtSetArg(al[ac], XmNlabelPixmap, prevPixmap); ac++; XtSetArg(al[ac], XmNhighlightThickness, 2); ac++; @@ -1085,8 +1086,9 @@ XtSetArg(al[ac], XmNtopAttachment, XmATTACH_FORM); ac++; XtSetArg(al[ac], XmNleftAttachment, XmATTACH_WIDGET); ac++; XtSetArg(al[ac], XmNleftWidget, prevBtn); ac++; - XtSetArg(al[ac], XmNleftOffset, 10); ac++; + XtSetArg(al[ac], XmNleftOffset, 2); ac++; XtSetArg(al[ac], XmNshadowType, XmSHADOW_OUT); ac++; + XtSetArg(al[ac], XmNshadowThickness, 2); ac++; XtSetArg(al[ac], XmNlabelType, XmPIXMAP); ac++; XtSetArg(al[ac], XmNlabelPixmap, backPixmap); ac++; XtSetArg(al[ac], XmNhighlightThickness, 2); ac++; diff -ruN TiMidity++-1.3.1/interface/ncurs_c.c TiMidity++-1.3.2/interface/ncurs_c.c --- TiMidity++-1.3.1/interface/ncurs_c.c Wed Jan 20 16:09:17 1999 +++ TiMidity++-1.3.2/interface/ncurs_c.c Mon Feb 8 17:21:24 1999 @@ -46,11 +46,11 @@ #else #include #endif -#define HAVE_VWPRINTW #else /* Windows */ #include #include +#define PD_curses #endif /* __WIN32__ */ #include "timidity.h" @@ -1431,9 +1431,9 @@ SCREEN *dftscr; #endif -#ifdef __WIN32__ +#ifdef PDCURSES PDC_set_ctrl_break(1); -#endif /* __WIN32__ */ +#endif /* PD_curses */ if(!open_init_flag) { @@ -2346,7 +2346,7 @@ return RC_NONE; } -#ifndef HAVE_VWPRINTW +#ifdef PDCURSES static void vwprintw(WINDOW *w, char *fmt, va_list ap) { char *buff; @@ -2359,7 +2359,7 @@ waddstr(w, buff); reuse_mblock(&pool); } -#endif /* HAVE_VWPRINTW */ +#endif /* PDCURSES */ static int cmsg(int type, int verbosity_level, char *fmt, ...) { diff -ruN TiMidity++-1.3.1/interface/tkpanel.tcl TiMidity++-1.3.2/interface/tkpanel.tcl --- TiMidity++-1.3.1/interface/tkpanel.tcl Tue Jan 12 11:36:17 1999 +++ TiMidity++-1.3.2/interface/tkpanel.tcl Wed Feb 10 12:41:09 1999 @@ -142,7 +142,6 @@ .body.file.list insert end $file lappend Stat(FileList) $file } - # MakeShuffleList set Stat(CurIdx) -1 SelectNumber @@ -154,6 +153,9 @@ for {} {$i < $Stat(MaxFiles)} {incr i} { set file [gets stdin] .body.file.list insert end $file + if {$Config(ShufflePlay)} { + lappend Stat(ShuffleList) [llength $Stat(FileList)] + } lappend Stat(FileList) $file } .body.file.list select set $Stat(CurIdx) @@ -235,17 +237,17 @@ # proc MakeShuffleList {} { global Stat - set tmplist {} + set Stat(ShuffleList) {} for {set i 0} {$i < $Stat(MaxFiles)} {incr i} { - lappend tmplist $i + lappend Stat(ShuffleList) $i } - set Stat(ShuffleList) {} - set len $Stat(MaxFiles) + set len [expr $Stat(MaxFiles) - 1] while {$len > 0} { - set pos [my-random $len] - lappend Stat(ShuffleList) [lindex $tmplist $pos] - set tmplist [lreplace $tmplist $pos $pos] - lappend Stat(ShuffleList) [lindex $tmplist $pos] + set pos [my-random [expr $len + 1]] + set tmp [lindex $Stat(ShuffleList) $pos] + set Stat(ShuffleList) [lreplace $Stat(ShuffleList) $pos $pos \ + [lindex $Stat(ShuffleList) $len]] + set Stat(ShuffleList) [lreplace $Stat(ShuffleList) $len $len $tmp] set len [expr $len - 1] } } @@ -299,10 +301,10 @@ if {$idx >= 0} { if {$Stat(new_tcltk)} { - .body.file.list select set $idx +# .body.file.list select set $idx } else { - .body.file.list select from $idx - .body.file.list select to $idx +# .body.file.list select from $idx +# .body.file.list select to $idx } .body.curfile configure -text\ "Playing: [lindex $Stat(FileList) $idx]" @@ -672,7 +674,7 @@ .body.file.list delete 0 end set Stat(MaxFiles) 0 set Stat(FileList) {} - set Stat(SuffleList) {} + set Stat(ShuffleList) {} } } @@ -722,7 +724,11 @@ -variable Config(RepeatPlay) .menu.mode.m add check -label "Shuffle" -underline 0\ -variable Config(ShufflePlay) -command { - if {$Config(ShufflePlay)} {MakeShuffleList} + if {$Config(ShufflePlay)} { + MakeShuffleList + } else { + set Stat(ShuffleList) {} + } } .menu.mode.m add check -label "Auto Start" -underline 5\ -variable Config(AutoStart) diff -ruN TiMidity++-1.3.1/interface/vt100_c.c TiMidity++-1.3.2/interface/vt100_c.c --- TiMidity++-1.3.1/interface/vt100_c.c Tue Feb 2 20:31:05 1999 +++ TiMidity++-1.3.2/interface/vt100_c.c Sun Feb 7 03:39:53 1999 @@ -89,6 +89,7 @@ static void display_lyric(char *lyric, int sep); static void display_title(char *title); static void init_lyric(char *lang); +static char *vt100_getline(void); #define LYRIC_WORD_NOSEP 0 #define LYRIC_WORD_SEP ' ' @@ -102,7 +103,6 @@ { 'c', 'C', 'd', 'D', 'e', 'f', 'F', 'g', 'G', 'a', 'A', 'b' }; -static int read_ready(int fd); static void ctl_note(int status, int ch, int note, int vel); static void ctl_program(int ch, int val, void *vp); @@ -627,13 +627,11 @@ static int ctl_read(int32 *valp) { - char cmd[VT100_COLS]; + char *cmd; - if(read_ready(0) > 0) - { - if(fgets(cmd, VT100_COLS, stdin) == NULL) - return RC_NONE; - switch(cmd[0]) + if((cmd = vt100_getline()) == NULL) + return RC_NONE; + switch(cmd[0]) { case 'q': trace_flush(); @@ -705,7 +703,7 @@ return RC_TOGGLE_SNDSPEC; } - if(cmd[0] == '\033' && cmd[1] == '[') + if(cmd[0] == '\033' && cmd[1] == '[') { switch(cmd[2]) { @@ -724,7 +722,6 @@ } return RC_NONE; } - } return RC_NONE; } @@ -792,23 +789,64 @@ return 0; } -static int read_ready(int fd) +#if !defined(__WIN32__) || defined(__CYGWIN32__) +/* UNIX */ +static char *vt100_getline(void) { + static char cmd[VT100_COLS]; fd_set fds; int cnt; struct timeval timeout; FD_ZERO(&fds); - FD_SET(fd, &fds); + FD_SET(0, &fds); timeout.tv_sec = timeout.tv_usec = 0; - if((cnt = select(fd + 1, &fds, NULL, NULL, &timeout)) < 0) + if((cnt = select(1, &fds, NULL, NULL, &timeout)) < 0) { perror("select"); - return -1; + return NULL; + } + + if(cnt > 0 && FD_ISSET(0, &fds) != 0) + { + if(fgets(cmd, sizeof(cmd), stdin) == NULL) + { + rewind(stdin); + return NULL; + } + return cmd; } - return cnt > 0 && FD_ISSET(fd, &fds) != 0; + return NULL; } +#else +#include +static char *vt100_getline(void) +{ + static char cmd[VT100_COLS]; + static int cmdlen = 0; + int c; + + if(kbhit()) + { + c = getch(); + if(c == 'q' || c == 3 || c == 4) + return "q"; + if(c == '\r') + c = '\n'; + if(cmdlen < sizeof(cmd) - 1) + cmd[cmdlen++] = (char)c; + if(c == '\n') + { + cmd[cmdlen] = '\0'; + cmdlen = 0; + return cmd; + } + } + return NULL; +} +#endif + /* Indicator */ diff -ruN TiMidity++-1.3.1/interface/xaw_i.c TiMidity++-1.3.2/interface/xaw_i.c --- TiMidity++-1.3.1/interface/xaw_i.c Wed Feb 3 05:11:55 1999 +++ TiMidity++-1.3.2/interface/xaw_i.c Tue Feb 9 12:39:20 1999 @@ -94,12 +94,6 @@ static int currwidth = 2; static int rotatewidth[] = {TRACE_WIDTH_SHORT, 592, 638}; -int dirlist_cmp (const void *p1, const void *p2) -{ - return strcasecmp (*((char **)p1), *((char **)p2)); -} - - typedef struct { int col; /* column number */ char **cap; /* caption strings array */ @@ -1149,6 +1143,28 @@ lrs.string = ""; dirlist[0] = (char *)NULL; setDirList(load_flist, cwd_l, &lrs); } +} + +/* + * sort algorithm for DirList: + * - directories before files + */ +static int dirlist_cmp (const void *p1, const void *p2) +{ + int i1, i2; + char *s1, *s2; + + s1 = *((char **)p1); + s2 = *((char **)p2); + i1 = strlen (s1) - 1; + i2 = strlen (s2) - 1; + if (i1 >= 0 && i2 >= 0) { + if (s1 [i1] == '/' && s2 [i2] != '/') + return -1; + if (s1 [i1] != '/' && s2 [i2] == '/') + return 1; + } + return strcmp (s1, s2); } static void setDirList(Widget list, Widget label, XawListReturnStruct *lrs) { diff -ruN TiMidity++-1.3.1/stamp-h1.in TiMidity++-1.3.2/stamp-h1.in --- TiMidity++-1.3.1/stamp-h1.in Fri Feb 5 14:36:01 1999 +++ TiMidity++-1.3.2/stamp-h1.in Wed Feb 10 13:06:10 1999 @@ -0,0 +1 @@ +timestamp diff -ruN TiMidity++-1.3.1/stamp-h2.in TiMidity++-1.3.2/stamp-h2.in --- TiMidity++-1.3.1/stamp-h2.in Fri Feb 5 14:36:01 1999 +++ TiMidity++-1.3.2/stamp-h2.in Wed Feb 10 13:06:13 1999 @@ -0,0 +1 @@ +timestamp diff -ruN TiMidity++-1.3.1/timidity/linux_a.c TiMidity++-1.3.2/timidity/linux_a.c --- TiMidity++-1.3.1/timidity/linux_a.c Tue Feb 2 15:56:30 1999 +++ TiMidity++-1.3.2/timidity/linux_a.c Tue Feb 9 14:23:03 1999 @@ -48,6 +48,10 @@ #include #endif +#ifdef __bsdi__ +#include +#endif + #include "timidity.h" #include "common.h" #include "output.h" diff -ruN TiMidity++-1.3.1/timidity/load_mod.c TiMidity++-1.3.2/timidity/load_mod.c --- TiMidity++-1.3.1/timidity/load_mod.c Mon Nov 30 17:38:46 1998 +++ TiMidity++-1.3.2/timidity/load_mod.c Mon Feb 8 04:40:47 1999 @@ -27,6 +27,9 @@ #endif /* HAVE_CONFIG_H */ #include +#ifndef __WIN32__ +#include +#endif /* __WIN32__ */ #ifndef NO_STRING_H #include diff -ruN TiMidity++-1.3.1/timidity/timidity.h TiMidity++-1.3.2/timidity/timidity.h --- TiMidity++-1.3.1/timidity/timidity.h Wed Feb 3 17:30:26 1999 +++ TiMidity++-1.3.2/timidity/timidity.h Tue Feb 9 15:01:41 1999 @@ -343,6 +343,16 @@ to a new machine with other than 32-bit, big-endian words. */ /**************************************************************************/ + +#include +#ifdef HAVE_ERRNO_H +#include +#endif /* HAVE_ERRNO_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include /* for __byte_swap_*() */ +#endif + + #ifndef NO_VOLATILE #define VOLATILE_TOUCH(val) /* do nothing */ #define VOLATILE volatile @@ -368,11 +378,15 @@ /* Byte order */ #ifdef WORDS_BIGENDIAN -#define BIG_ENDIAN +#ifndef BIG_ENDIAN +#define BIG_ENDIAN 4321 +#endif #undef LITTLE_ENDIAN #else #undef BIG_ENDIAN -#define LITTLE_ENDIAN +#ifndef LITTLE_ENDIAN +#define LITTLE_ENDIAN 1234 +#endif #endif /* DEC MMS has 64 bit long words */ @@ -505,11 +519,6 @@ /* #define MODULATION_WHEEL_RATE (current_play_tempo/500000.0/32.0) */ #define VIBRATO_DEPTH_TUNING (1.0/4.0) - -#include -#ifdef HAVE_ERRNO_H -#include -#endif /* HAVE_ERRNO_H */ #ifdef HPUX #undef mono