--- icewm-1.0.6-pristine/Makefile.in Sun Jan 14 22:49:38 2001 +++ icewm-1.0.6/Makefile.in Mon Jan 15 20:27:28 2001 @@ -11,7 +11,7 @@ SPEC = icewm.spec LSM = icewm.lsm -GUIEVENTSFILES = src/icesound +GUIEVENTSFILES = src/icesound src/icecursor GNOMEFILES = lib/IceWM.desktop WMPROPDIR = $(shell gnome-config --datadir)/gnome/wm-properties/ @@ -30,6 +30,7 @@ guievents: cd src ; $(MAKE) icesound + cd src ; $(MAKE) icecursor gnome: --- icewm-1.0.6-pristine/README.icefx Mon Jan 15 20:00:41 2001 +++ icewm-1.0.6/README.icefx Mon Jan 15 20:27:28 2001 @@ -0,0 +1,30 @@ +IceFX +===== + +Get icewm-1.0.6.src.tar.bz2 +and http://triq.net/icewm/icewm-1.0.6-fx.patch + +Unpack IceWM + tar xvIf icewm-1.0.6.src.tar.bz2 +Apply Patch + cd icewm-1.0.6 + patch -p1 <../icewm-1.0.6-fx.patch + +(If you don't patch a pristine source or this is the developer patch + regenerate configure scripts and headers with autoconf and autoheader ) + +Configure. And enable GUI Events. ESounD will be enabled if detected. + ./configure --enable-guievents + +Build icewm + make +or just the eytra binaries + make guievents + +copy some sound and cursors to ~/.icewm/sounds/ and ~/.icewm/cursors/ + +enjoy ./src/icesound and ./src/icecursor + + +Author : Christian W. Zuckschwerdt +Latest patch and Sound/Cursor-Themes : http://triq.net/icewm/ --- icewm-1.0.6-pristine/configure Sun Jan 14 22:49:44 2001 +++ icewm-1.0.6/configure Mon Jan 15 20:27:36 2001 @@ -20,12 +20,16 @@ ac_help="$ac_help --enable-nls Enable internationalized message" ac_help="$ac_help - --enable-guievents Enable GUI events for icesound (experimental)" + --enable-guievents Enable GUI events for icesound and icecursor" +ac_help="$ac_help + --disable-esd Don't compile ESounD support(NEW)" ac_help="$ac_help --disable-sm Don't use X shared memory extension" ac_help="$ac_help --disable-shape Don't use X shape extension" ac_help="$ac_help + --disable-xmu Don't use X misc util extension(NEW)" +ac_help="$ac_help --disable-prefs Disable configurable preferences" ac_help="$ac_help --disable-keyconf Disable configurable keybindings" @@ -565,7 +569,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:569: checking for $ac_word" >&5 +echo "configure:573: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -595,7 +599,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:599: checking for $ac_word" >&5 +echo "configure:603: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -646,7 +650,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:650: checking for $ac_word" >&5 +echo "configure:654: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -678,7 +682,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:682: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:686: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -689,12 +693,12 @@ cat > conftest.$ac_ext << EOF -#line 693 "configure" +#line 697 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -720,12 +724,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:724: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:729: checking whether we are using GNU C" >&5 +echo "configure:733: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -734,7 +738,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -753,7 +757,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:757: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:761: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -787,7 +791,7 @@ echo $ac_n "checking whether the C compiler ($CC) understands C++""... $ac_c" 1>&6 -echo "configure:791: checking whether the C compiler ($CC) understands C++" >&5 +echo "configure:795: checking whether the C compiler ($CC) understands C++" >&5 cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1; then +if { ac_try='rm conftest; $CC -o conftest conftest.C; test -f ./conftest'; { (eval echo configure:803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1; then ice_prog_gxx=yes CXX=$CC else @@ -816,7 +820,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:820: checking for $ac_word" >&5 +echo "configure:824: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -848,7 +852,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:852: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:856: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -859,12 +863,12 @@ cat > conftest.$ac_ext << EOF -#line 863 "configure" +#line 867 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -890,12 +894,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:894: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:898: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:899: checking whether we are using GNU C++" >&5 +echo "configure:903: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -904,7 +908,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -923,7 +927,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:927: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:931: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -959,7 +963,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:963: checking for $ac_word" >&5 +echo "configure:967: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -989,7 +993,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:993: checking for $ac_word" >&5 +echo "configure:997: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1040,7 +1044,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1044: checking for $ac_word" >&5 +echo "configure:1048: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1072,7 +1076,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1076: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1080: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1083,12 +1087,12 @@ cat > conftest.$ac_ext << EOF -#line 1087 "configure" +#line 1091 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1114,12 +1118,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1118: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1122: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1123: checking whether we are using GNU C" >&5 +echo "configure:1127: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1128,7 +1132,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1147,7 +1151,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1151: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1155: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1185,16 +1189,16 @@ ice_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-fno-rtti $CXXFLAGS" echo $ac_n "checking whether the C++ compiler ($CXX) accepts no_rtti""... $ac_c" 1>&6 -echo "configure:1189: checking whether the C++ compiler ($CXX) accepts no_rtti" >&5 +echo "configure:1193: checking whether the C++ compiler ($CXX) accepts no_rtti" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ice_tmp_result=yes else @@ -1211,16 +1215,16 @@ ice_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-fno-exceptions $CXXFLAGS" echo $ac_n "checking whether the C++ compiler ($CXX) accepts no_exceptions""... $ac_c" 1>&6 -echo "configure:1215: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5 +echo "configure:1219: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ice_tmp_result=yes else @@ -1238,16 +1242,16 @@ ice_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-fno-handle-exceptions $CXXFLAGS" echo $ac_n "checking whether the C++ compiler ($CXX) accepts no_exceptions""... $ac_c" 1>&6 -echo "configure:1242: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5 +echo "configure:1246: checking whether the C++ compiler ($CXX) accepts no_exceptions" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ice_tmp_result=yes else @@ -1268,16 +1272,16 @@ ice_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W $CXXFLAGS" echo $ac_n "checking whether the C++ compiler ($CXX) accepts warn_xxx""... $ac_c" 1>&6 -echo "configure:1272: checking whether the C++ compiler ($CXX) accepts warn_xxx" >&5 +echo "configure:1276: checking whether the C++ compiler ($CXX) accepts warn_xxx" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ice_tmp_result=yes else @@ -1294,16 +1298,16 @@ ice_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-fpermissive $CXXFLAGS" echo $ac_n "checking whether the C++ compiler ($CXX) accepts permissive""... $ac_c" 1>&6 -echo "configure:1298: checking whether the C++ compiler ($CXX) accepts permissive" >&5 +echo "configure:1302: checking whether the C++ compiler ($CXX) accepts permissive" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ice_tmp_result=yes else @@ -1325,12 +1329,12 @@ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1329: checking for Cygwin environment" >&5 +echo "configure:1333: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1388,7 +1392,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1392: checking for a BSD compatible install" >&5 +echo "configure:1396: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1447,12 +1451,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1451: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1455: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1460,7 +1464,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1485,7 +1489,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1489: checking for opendir in -ldir" >&5 +echo "configure:1493: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1493,7 +1497,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1529,7 +1533,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1533: checking for opendir in -lx" >&5 +echo "configure:1537: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1537,7 +1541,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1574,12 +1578,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1578: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1582: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1595,7 +1599,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1616,7 +1620,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1620: checking how to run the C++ preprocessor" >&5 +echo "configure:1624: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1629,12 +1633,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1662,17 +1666,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1666: checking for $ac_hdr" >&5 +echo "configure:1670: 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:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1703,17 +1707,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1707: checking for $ac_hdr" >&5 +echo "configure:1711: 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:1717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1736,16 +1740,16 @@ LIBS="$LIBS -lkstat" echo $ac_n "checking if have old kstat""... $ac_c" 1>&6 -echo "configure:1740: checking if have old kstat" >&5 +echo "configure:1744: checking if have old kstat" >&5 cat > conftest.$ac_ext < int main() { kstat_named_t k; k.value.ui32 ; return 0; } EOF -if { (eval echo configure:1749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1765,12 +1769,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1769: checking for ANSI C header files" >&5 +echo "configure:1773: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1778,7 +1782,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1795,7 +1799,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1813,7 +1817,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1834,7 +1838,7 @@ : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1872,12 +1876,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1876: checking for size_t" >&5 +echo "configure:1880: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1905,12 +1909,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1909: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1913: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1919,7 +1923,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1940,12 +1944,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1944: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1948: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1953,7 +1957,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1975,12 +1979,12 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1979: checking return type of signal handlers" >&5 +echo "configure:1983: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1997,7 +2001,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2016,12 +2020,12 @@ echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2020: checking for strftime" >&5 +echo "configure:2024: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+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${ac_exeext}; then +if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2069,7 +2073,7 @@ echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2073: checking for strftime in -lintl" >&5 +echo "configure:2077: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2077,7 +2081,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2118,12 +2122,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2122: checking for vprintf" >&5 +echo "configure:2126: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+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${ac_exeext}; then +if { (eval echo configure:2157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2173,12 +2177,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2177: checking for _doprnt" >&5 +echo "configure:2181: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+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${ac_exeext}; then +if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2231,12 +2235,12 @@ for ac_func in gettimeofday putenv select socket strtol strtoul do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2235: checking for $ac_func" >&5 +echo "configure:2239: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2287,7 +2291,7 @@ done echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6 -echo "configure:2291: checking types of arguments for select()" >&5 +echo "configure:2295: checking types of arguments for select()" >&5 if eval "test \"`echo '$''{'ac_cv_func_select_arg234'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2301,7 +2305,7 @@ for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do cat > conftest.$ac_ext < @@ -2320,7 +2324,7 @@ ; return 0; } EOF -if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no ; break 3 else @@ -2366,7 +2370,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2370: checking for X" >&5 +echo "configure:2374: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2428,12 +2432,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2502,14 +2506,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2615,17 +2619,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2619: checking whether -R must be followed by a space" >&5 +echo "configure:2623: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2641,14 +2645,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2680,7 +2684,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2684: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2688: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2688,7 +2692,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2724,7 +2728,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2728: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2732: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2732,7 +2736,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2775,12 +2779,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2779: checking for gethostbyname" >&5 +echo "configure:2783: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+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${ac_exeext}; then +if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2827,7 +2831,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2831: checking for gethostbyname in -lnsl" >&5 +echo "configure:2835: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2835,7 +2839,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2879,12 +2883,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2883: checking for connect" >&5 +echo "configure:2887: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+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${ac_exeext}; then +if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2931,7 +2935,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2935: checking for connect in -lsocket" >&5 +echo "configure:2939: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2939,7 +2943,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2977,12 +2981,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2981: checking for remove" >&5 +echo "configure:2985: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+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${ac_exeext}; then +if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3029,7 +3033,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3033: checking for remove in -lposix" >&5 +echo "configure:3037: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3037,7 +3041,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3075,12 +3079,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3079: checking for shmat" >&5 +echo "configure:3083: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+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${ac_exeext}; then +if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -3127,7 +3131,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3131: checking for shmat in -lipc" >&5 +echo "configure:3135: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3135,7 +3139,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3182,7 +3186,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3186: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3190: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3190,7 +3194,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3265,7 +3269,7 @@ enableval="$enable_nls" if test "$enable_nls" != "no"; then echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3269: checking for gettext in -lintl" >&5 +echo "configure:3273: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3273,7 +3277,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3337,13 +3341,70 @@ fi +# Check whether --enable-esd or --disable-esd was given. +if test "${enable_esd+set}" = set; then + enableval="$enable_esd" + : +fi + + if test "$enable_esd" != "no"; then + echo $ac_n "checking for esd_open_sound in -lesd""... $ac_c" 1>&6 +echo "configure:3353: checking for esd_open_sound in -lesd" >&5 +ac_lib_var=`echo esd'_'esd_open_sound | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lesd $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lesd" + cat >> confdefs.h <<\EOF +#define ESD 1 +EOF + +else + echo "$ac_t""no" 1>&6 + echo "configure: warning: Unable to locate ESD" 1>&2 +fi + + fi + no_x_CXXFLAGS=$CXXFLAGS no_x_LIBS=$LIBS CXXFLAGS="$CXXFLAGS $X_CFLAGS" LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" echo $ac_n "checking for XInternAtoms in -lX11""... $ac_c" 1>&6 -echo "configure:3347: checking for XInternAtoms in -lX11" >&5 +echo "configure:3408: checking for XInternAtoms in -lX11" >&5 ac_lib_var=`echo X11'_'XInternAtoms | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3351,7 +3412,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3397,7 +3458,7 @@ if test "$enable_sm" != "no"; then echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3401: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3462: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3405,7 +3466,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3453,7 +3514,7 @@ if test "$enable_shape" != "no"; then echo $ac_n "checking for XShapeCombineRectangles in -lXext""... $ac_c" 1>&6 -echo "configure:3457: checking for XShapeCombineRectangles in -lXext" >&5 +echo "configure:3518: checking for XShapeCombineRectangles in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeCombineRectangles | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3461,7 +3522,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3502,6 +3563,63 @@ fi +# Check whether --enable-xmu or --disable-xmu was given. +if test "${enable_xmu+set}" = set; then + enableval="$enable_xmu" + : +fi + + if test "$enable_xmu" != "no"; then + echo $ac_n "checking for XmuCursorNameToIndex in -lXmu""... $ac_c" 1>&6 +echo "configure:3575: checking for XmuCursorNameToIndex in -lXmu" >&5 +ac_lib_var=`echo Xmu'_'XmuCursorNameToIndex | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lXmu $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lXmu" + cat >> confdefs.h <<\EOF +#define XMU 1 +EOF + +else + echo "$ac_t""no" 1>&6 + echo "configure: warning: Unable to use X misc util extension" 1>&2 +fi + + fi + # Check whether --enable-prefs or --disable-prefs was given. if test "${enable_prefs+set}" = set; then enableval="$enable_prefs" @@ -3632,7 +3750,7 @@ # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3636: checking for $ac_word" >&5 +echo "configure:3754: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3737,7 +3855,7 @@ xpm_libs="-L${with_xpm_arg}/lib" fi echo $ac_n "checking for XpmReadFileToPixmap in -lXpm""... $ac_c" 1>&6 -echo "configure:3741: checking for XpmReadFileToPixmap in -lXpm" >&5 +echo "configure:3859: checking for XpmReadFileToPixmap in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3745,7 +3863,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $xpm_libs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3807,7 +3925,7 @@ # Extract the first word of "imlib-config", so it can be a program name with args. set dummy imlib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3811: checking for $ac_word" >&5 +echo "configure:3929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_IMLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- icewm-1.0.6-pristine/configure.in Sun Jan 14 22:49:39 2001 +++ icewm-1.0.6/configure.in Mon Jan 15 20:27:28 2001 @@ -101,12 +101,21 @@ fi ]) AC_ARG_ENABLE(guievents, - [ --enable-guievents Enable GUI events for icesound (experimental)], + [ --enable-guievents Enable GUI events for icesound and icecursor], [ if test "$enable_guievents" != "no"; then AC_DEFINE(CONFIG_GUIEVENTS, 1, [Define to enable GUI events support. ]) TARGETS=$TARGETS' guievents' fi ]) +AC_ARG_ENABLE(esd, + [ --disable-esd Don't compile ESounD support(NEW)]) + if test "$enable_esd" != "no"; then + AC_CHECK_LIB(esd, esd_open_sound, + [ LIBS="$LIBS -lesd" + AC_DEFINE(ESD, 1, [Define to compile ESD support]) ], + [ AC_MSG_WARN([Unable to locate ESD]) ]) + fi + dnl All further test will use X libraries/headers no_x_CXXFLAGS=$CXXFLAGS no_x_LIBS=$LIBS @@ -131,6 +140,15 @@ [ LIBS="$LIBS -lXext" AC_DEFINE(SHAPE, 1, [Define to enable X shape extension]) ], [ AC_MSG_WARN([Unable to use X shape extension]) ]) + fi + +AC_ARG_ENABLE(xmu, + [ --disable-xmu Don't use X misc util extension(NEW)]) + if test "$enable_xmu" != "no"; then + AC_CHECK_LIB(Xmu, XmuCursorNameToIndex, + [ LIBS="$LIBS -lXmu" + AC_DEFINE(XMU, 1, [Define to enable X misc util extension]) ], + [ AC_MSG_WARN([Unable to use X misc util extension]) ]) fi AC_ARG_ENABLE(prefs, --- icewm-1.0.6-pristine/src/Makefile Sun Jan 14 22:49:39 2001 +++ icewm-1.0.6/src/Makefile Mon Jan 15 20:27:28 2001 @@ -44,7 +44,9 @@ ICEWMBGOBJS = icewmbg.o -ICESOUNDOBJS = icesound.o misc.o +ICESOUNDOBJS = icesound.o misc.o + +ICECURSOROBJS = icecursor.o misc.o ICECLOCKOBJS = $(COREOBJS) \ iceclock.o aclock.o @@ -109,7 +111,11 @@ icesound$(EXEEXT): $(ICESOUNDOBJS) -@rm -f $@ - $(LD) -o $@ $(LFLAGS) $(ICESOUNDOBJS) $(LIBS) -lesd + $(LD) -o $@ $(LFLAGS) $(ICESOUNDOBJS) $(LIBS) + +icecursor$(EXEEXT): $(ICECURSOROBJS) + -@rm -f $@ + $(LD) -o $@ $(LFLAGS) $(ICECURSOROBJS) $(LIBS) iceclock$(EXEEXT): $(ICECLOCKOBJS) -@rm -f $@ --- icewm-1.0.6-pristine/src/config.h.in Sun Jan 14 22:49:47 2001 +++ icewm-1.0.6/src/config.h.in Mon Jan 15 20:27:34 2001 @@ -107,6 +107,9 @@ /* Define to enable GUI events support. */ #undef CONFIG_GUIEVENTS +/* Define to compile ESD support */ +#undef ESD + /* Define to enable XInternAtoms */ #undef HAVE_XINTERNATOMS @@ -115,6 +118,9 @@ /* Define to enable X shape extension */ #undef SHAPE + +/* Define to enable X misc util extension */ +#undef XMU /* Define to disable preferences support. */ #undef NO_CONFIGURE --- icewm-1.0.6-pristine/src/icecursor.cc Mon Jan 15 20:01:12 2001 +++ icewm-1.0.6/src/icecursor.cc Mon Jan 15 20:27:28 2001 @@ -0,0 +1,470 @@ +/* + * IceWM - IceCursor + * + * Copyright (C) 2000 Christian W. Zuckschwerdt + * + * animate the X cursor each time a specific GUI event occures + * (see guievent.h) + * for now cursors and masks need to be in LIBDIR/cursors + * + * 2000-10-01: Christian W. Zuckschwerdt + */ + +/* Config: */ +/* event: cursor fgcol bgcol delay + cursor fgcol bgcol delay + ... + event: ... + */ + +#include + +/* Short-cut if GUIEVENTS isn't requested */ +#ifndef CONFIG_GUIEVENTS +int +main(int argc, char *argv[]) { + printf("%s not supported. Configure with '--enable-guievents'.\n", argv[0]); +} +#else /* CONFIG_GUIEVENTS */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define GUI_EVENT_NAMES +#include "guievent.h" +#include "base.h" +#define NUM_OF_GUIEVENTS (sizeof(gui_events)/sizeof(gui_events[0])) +#define NUM_OF_FRAMES 8 + +/* needed in FixupState */ +#define Dynamic 1 + +#ifdef XMU +/* int XmuCursorNameToIndex (char *name); */ +#include +#endif + +static char *program_name = NULL; + +char *displayName = 0; +Display *display = 0; +Window root = 0; + +Atom _GUI_EVENT;; + +char default_cursor_name[] = "left_ptr"; /* see also: cursorfont.h */ +Cursor cursors [NUM_OF_GUIEVENTS][NUM_OF_FRAMES]; + +Display *dpy; +int screen; +Window root1; +char *fore_color = NULL; +char *back_color = NULL; +int reverse = 0; +int save_colors = 0; +int unsave_past = 0; +Pixmap save_pixmap = (Pixmap)None; + +void read_cursors(); +int set_cursor(Cursor cursor); +int file_pointer(char *cursor_file, char *cursor_mask); +int normal_pointer(const char *cursor_name); +void FixupState(); +Cursor CreateCursorFromFiles(const char *cursor_file, const char *mask_file); +Cursor CreateCursorFromName (const char *name); +XColor NameToXColor(const char *name, unsigned long pixel); +Pixmap ReadBitmapFile(const char *filename, unsigned int *width, unsigned int *height, int *x_hot, int *y_hot); + + +int main(int argc, char *argv[]) +{ + + program_name = strrchr(argv[0], '/'); + if (program_name) program_name++; else program_name = argv[0]; + + if (!(display = XOpenDisplay(displayName))) + { + fprintf(stderr, "can't open display: %s", displayName); + exit(1); + } + + root = RootWindow(display, DefaultScreen(display)); + + screen = DefaultScreen(display); + dpy = display; + read_cursors(); + + _GUI_EVENT = XInternAtom(display, XA_GUI_EVENT_NAME, False); + + XSelectInput(display, root, PropertyChangeMask); + + while (1) + { + XEvent xev; + time_t last, now; + + XNextEvent(display, &xev); + + switch (xev.type) { + case PropertyNotify: + if (xev.xproperty.atom == _GUI_EVENT) + { + + /* act at most every other second */ + /*last = now; + now = time(NULL); + if (last+1 < now)*/ + + if (xev.xproperty.state == PropertyNewValue) + { + Atom type; + int format; + unsigned long nitems, lbytes; + unsigned char *propdata; + int d = -1; + + if (XGetWindowProperty(display, root, + _GUI_EVENT, 0, 3, + False, _GUI_EVENT, + &type, &format, + &nitems, &lbytes, + &propdata) == Success) + if (propdata) + { + d = *(char *)propdata; + XFree(propdata); + } + for (unsigned int i = 0; i < sizeof(gui_events)/sizeof(gui_events[0]); i++) + { + if (gui_events[i].type == d) + { + puts(gui_events[i].name); + /* + if (geLaunchApp == i) + { + / * Restore normal pointer * / + fore_color = NULL; + normal_pointer("watch"); + } + else + { + / * Restore normal pointer * / + fore_color = NULL; + normal_pointer(default_cursor_name); + } + */ + + if (1) // cursors[i][0]) + { + /* Animate cursor */ + for (int n = 0; n < NUM_OF_FRAMES; n++) + { + // !!! TODO: which colors? + fore_color = "gold"; + set_cursor(cursors[i][n]); + usleep(100000); + } + /* Restore normal pointer */ + fore_color = NULL; + normal_pointer(default_cursor_name); + } + break; + } + } + } + } + break; + } + } +} + +void read_cursors() +{ + const char *homeDir = getenv("HOME"); + char *path, *libpath; + path = strJoin(homeDir, "/.icewm/cursors/", NULL); + libpath = strJoin(LIBDIR, "/cursors/", NULL); + + char cursor[1024], mask[1024]; + char *cursor_path, *mask_path; + int i, n; + + for (i=0; i < (int)NUM_OF_GUIEVENTS; i++) + { + for (n=0; n < NUM_OF_FRAMES; n++) + { + sprintf(cursor, "%s_cursor_%d.xbm", gui_events[i].name, n+1); + sprintf(mask, "%s_mask_%d.xbm", gui_events[i].name, n+1); + cursor_path = strJoin(path, cursor, NULL); + mask_path = strJoin(path, mask, NULL); + if ((access(cursor_path, R_OK) == 0) && + (access(mask_path, R_OK) == 0)) + { +printf("found %s\n", cursor_path); + // !!! TODO: set colors? + fore_color = "gold"; + cursors[i][n] = CreateCursorFromFiles(cursor_path, mask_path); + } + } + } +} + +int file_pointer(char *cursor_file, char *cursor_mask) +{ + /* Variables */ + Cursor cursor; + + /* Init display */ + dpy = XOpenDisplay(NULL); + if (!dpy) + { + fprintf(stderr, "%s: unable to open display '%s'\n", + program_name, XDisplayName (NULL)); + exit (2); + } + screen = DefaultScreen(dpy); + root1 = RootWindow(dpy, screen); + + /* Set busy-cursor */ + cursor = CreateCursorFromFiles(cursor_file, cursor_mask); + XDefineCursor(dpy, root1, cursor); + XFreeCursor(dpy, cursor); + + FixupState(); + XCloseDisplay(dpy); + return (0); +} + +int set_cursor(Cursor cursor) +{ + /* Init display */ + dpy = XOpenDisplay(NULL); + if (!dpy) + { + fprintf(stderr, "%s: unable to open display '%s'\n", + program_name, XDisplayName (NULL)); + exit (2); + } + screen = DefaultScreen(dpy); + root1 = RootWindow(dpy, screen); + + /* Set -cursor */ + XDefineCursor(dpy, root1, cursor); + + FixupState(); + XCloseDisplay(dpy); + return (0); +} + +int normal_pointer(const char *cursor_name) +{ + /* Variables */ + Cursor cursor; + + /* Init display */ + dpy = XOpenDisplay(NULL); + if (!dpy) + { + fprintf(stderr, "%s: unable to open display '%s'\n", + program_name, XDisplayName (NULL)); + exit (2); + } + screen = DefaultScreen(dpy); + root1 = RootWindow(dpy, screen); + + /* Restore normal pointer */ + cursor = CreateCursorFromName (cursor_name); + if (cursor) + { + XDefineCursor (dpy, root1, cursor); + XFreeCursor (dpy, cursor); + } + + FixupState(); + XCloseDisplay(dpy); + return (0); +} + + +/* Free past incarnation if needed, and retain state if needed. */ +void FixupState() +{ + Atom prop, type; + int format; + unsigned long length, after; + unsigned char *data; + /* + if (!(DefaultVisual(dpy, screen)->class & Dynamic)) + unsave_past = 0;*/ + if (!unsave_past && !save_colors) + return; + prop = XInternAtom(dpy, "_XSETROOT_ID", False); + if (unsave_past) + { + (void)XGetWindowProperty(dpy, root1, prop, 0L, 1L, True, + AnyPropertyType, + &type, &format, &length, &after, &data); + if ((type == XA_PIXMAP) && (format == 32) && + (length == 1) && (after == 0)) + XKillClient(dpy, *((Pixmap *)data)); + else if (type != None) + fprintf(stderr, "%s: warning: _XSETROOT_ID property is garbage\n", + program_name); + } + if (save_colors) + { + if (!save_pixmap) + save_pixmap = XCreatePixmap(dpy, root1, 1, 1, 1); + XChangeProperty(dpy, root1, prop, XA_PIXMAP, 32, PropModeReplace, + (unsigned char *) &save_pixmap, 1); + XSetCloseDownMode(dpy, RetainPermanent); + } +} + + +/* + * CreateCursorFromFiles: make a cursor of the right colors from two bitmap + * files. + */ +#define BITMAP_HOT_DEFAULT 8 + +Cursor CreateCursorFromFiles(const char *cursor_file, const char *mask_file) +{ + Pixmap cursor_bitmap, mask_bitmap; + unsigned int width, height, ww, hh; + int x_hot, y_hot; + Cursor cursor; + XColor fg, bg, temp; + + fg = NameToXColor(fore_color, BlackPixel(dpy, screen)); + bg = NameToXColor(back_color, WhitePixel(dpy, screen)); + if (reverse) + { + temp = fg; fg = bg; bg = temp; + } + + cursor_bitmap = ReadBitmapFile(cursor_file, &width, &height, &x_hot, &y_hot); + mask_bitmap = ReadBitmapFile(mask_file, &ww, &hh, (int *)NULL, (int *)NULL); + + if (width != ww || height != hh) + { + fprintf(stderr, +"%s: dimensions of cursor bitmap and cursor mask bitmap are different\n", + program_name); + exit(1); + /*NOTREACHED*/ + } + + if ((x_hot == -1) && (y_hot == -1)) + { + x_hot = BITMAP_HOT_DEFAULT; + y_hot = BITMAP_HOT_DEFAULT; + } + if ((x_hot < 0) || (x_hot >= (int)width) || + (y_hot < 0) || (y_hot >= (int)height)) + { + fprintf(stderr, "%s: hotspot is outside cursor bounds\n", program_name); + exit(1); + /*NOTREACHED*/ + } + + cursor = XCreatePixmapCursor(dpy, cursor_bitmap, mask_bitmap, &fg, &bg, + (unsigned int)x_hot, (unsigned int)y_hot); + XFreePixmap(dpy, cursor_bitmap); + XFreePixmap(dpy, mask_bitmap); + + return(cursor); +} + +/* + * CreateCursorFromName: Return cursor with given name + * global variables: + * dpy, screen, fore_color, back_color, reverse + */ +Cursor CreateCursorFromName (const char *name) +{ + XColor fg, bg, temp; + int i; + Font fid; + + fg = NameToXColor(fore_color, BlackPixel(dpy, screen)); + bg = NameToXColor(back_color, WhitePixel(dpy, screen)); + if (reverse) + { + temp = fg; fg = bg; bg = temp; + } +#ifdef XMU + i = XmuCursorNameToIndex (name); + if (i == -1) +#endif + return (Cursor) NULL; + fid = XLoadFont (dpy, "cursor"); + if (!fid) + return (Cursor) NULL; + return XCreateGlyphCursor (dpy, fid, fid, + i, i+1, &fg, &bg); +} + + +/* + * NameToXColor: Convert the name of a color to its Xcolor value. + */ +XColor NameToXColor(const char *name, unsigned long pixel) +{ + XColor c; + + if (!name || !*name) + { + c.pixel = pixel; + XQueryColor(dpy, DefaultColormap(dpy, screen), &c); + } + else if (!XParseColor(dpy, DefaultColormap(dpy, screen), name, &c)) + { + fprintf(stderr, "%s: unknown color or bad color format: %s\n", + program_name, name); + exit(1); + /*NOTREACHED*/ + } + return(c); +} + + +Pixmap ReadBitmapFile(const char *filename, unsigned int *width, unsigned int *height, int *x_hot, int *y_hot) +{ + Pixmap bitmap; + int status; + + status = XReadBitmapFile(dpy, root, filename, width, + height, &bitmap, x_hot, y_hot); + if (status == BitmapSuccess) + return(bitmap); + else if (status == BitmapOpenFailed) + fprintf(stderr, "%s: can't open file: %s\n", program_name, filename); + else if (status == BitmapFileInvalid) + fprintf(stderr, "%s: bad bitmap format file: %s\n", + program_name, filename); + else + fprintf(stderr, "%s: insufficient memory for bitmap: %s", + program_name, filename); + exit(1); + /*NOTREACHED*/ +} + +#endif /* CONFIG_GUIEVENTS */ --- icewm-1.0.6-pristine/src/icesound.cc Sun Jan 14 22:49:40 2001 +++ icewm-1.0.6/src/icesound.cc Mon Jan 15 20:27:28 2001 @@ -1,22 +1,48 @@ /* - * IceWM + * IceWM - IceSound * - * Copyright (C) 1997-2001 Marko Macek - * EsounD Hack by CW Zuckschwerdt + * Based on IceWM code Copyright (C) 1997-2001 Marko Macek + * 2000-02-13: Christian W. Zuckschwerdt + * 2000-08-08: Playback throttling. E.g. switch though + * multiple workspaces and get a single sound + * 2000-10-02: Support for (pre-loaded) server samples (ESounD only) + * Removed forking of esd calls + * 2000-12-11: merged patch by Marius Gedminas + * 2000-12-16: merged patch by maxim@macomnet.ru + * - portable way to rip the children + * 2001-01-15: merged with IceWM release 1.0.6 + * + * for now get latest patches as well as sound and cursor themes at + * http://triq.net/icewm/ + * + * Throttling is max. one sample every 500ms. Comments? + * + * Output options and notes: + * /dev/dsp : default. Sound playback will queue. If your /dev/dsp + * is capable of mixing sound streams you can use forking. + * ESounD : recommended. Sampels are cached in the ESD server. + * Is anyone interested in ALSA, ...etc? Nag me about your fav. */ #include "config.h" -#include "intl.h" -#define ESD +#include + +/* Short-cut if either GUIEVENTS or ICESOUND are not requested */ +#ifndef CONFIG_GUIEVENTS +int +main(int argc, char *argv[]) { + printf("%s not supported. Configure with '--enable-guievents'.\n", argv[0]); +} +#else /* CONFIG_GUIEVENTS */ #include -#include #include #include #include #include #include +#include #include #include #include @@ -24,39 +50,246 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#define GUI_EVENT_NAMES +#define GUI_EVENT_NAMES #include "guievent.h" +#define GUIEVENTS (sizeof(gui_events)/sizeof(gui_events[0])) + +#include "base.h" /* strJoin */ + +static char *program_name = NULL; + +/* Prefered sound path can be given on commandline. */ +/* Fallback to $HOME/.icewm/sounds then LIBDIR/sounds */ +static char *preferedPath = NULL; + +#ifdef ESD +/* #include */ /* just let ESD do it */ +#include + +char *esd_server = NULL; /* we should read it as an option */ +int esd = -1; /* socket */ +int sample[GUIEVENTS]; /* cache sample id index */ + +/* cache a sample in the server returns sample id, < 0 = error */ +int +cache_sound(char *path, int sound) +{ + int ok; + ok = esd_file_cache( esd, program_name, path ); + if (ok < 0) + { + printf( "%s: Error <%d> uploading. Name = %s:%s\n", + program_name, ok, program_name, path ); + return ok; + } + sample[sound] = ok; + printf( "%s: Sample <%d> uploaded. Name = %s:%s\n", + program_name, ok, program_name, path ); + return ok; +} + +/* uncache all samples from the server */ +int +uncache() +{ + int cnt = 0; + for (int i = 0; i < (int)GUIEVENTS; i++) + if (sample[i] > 0) { + esd_sample_free(esd, sample[i]); + cnt++; + } + return cnt; +} -static char *program_name = NULL; -static char *soundPath = NULL; +/* + * cache the sounds into the EsounD sever + * returns: number of loaded samples + */ +int +cache() +{ + const char *homeDir = getenv("HOME"); + char *path, *libpath; + path = strJoin(homeDir, "/.icewm/sounds/", NULL); + libpath = strJoin(LIBDIR, "/sounds/", NULL); + int cnt = 0; + + char sound_file[1024]; + char *sound_path; + + for (int i = 0; i < (int)GUIEVENTS; i++) + { + sprintf(sound_file, "%s.wav", gui_events[i].name); + if (preferedPath != NULL) { + sound_path = strJoin(preferedPath, sound_file, NULL); + if (access(sound_path, R_OK) == 0) + { + cache_sound(sound_path, i); + cnt++; + continue; + } + } + sound_path = strJoin(path, sound_file, NULL); + if (access(sound_path, R_OK) == 0) + { + cache_sound(sound_path, i); + cnt++; + } + else + { + sound_path = strJoin(libpath, sound_file, NULL); + if (access(sound_path, R_OK) == 0) + { + cache_sound(sound_path, i); + cnt++; + } + } + } + return cnt; +} -char *displayName = 0; -Display *display = 0; -Window root = 0; -int counter = 0; - -Atom _GUI_EVENT;; - -int main(int argc, char *argv[]) { - program_name = argv [0]; - if(argc == 2){ - soundPath = argv[1]; +/* play a cached sound sample using ESounD */ +void +esd_sound_play(int sound) +{ +#ifdef DEBUG + printf ("esd sample play: #%d\n", sound); +#endif + if (sample[ sound ] > 0 ) + esd_sample_play(esd, sample[ sound ]); +} + +#endif /* ESD */ + +/* play a sound sample to /dev/dsp */ +void +dsp_sound_play(int sound) +{ + for (unsigned int i = 0; i < sizeof(gui_events)/sizeof(gui_events[0]); i++) + { + if (gui_events[i].type == sound) { + char s[1024]; + if(preferedPath != NULL){ + sprintf(s, "%s/sounds/%s.wav", preferedPath, gui_events[i].name); + } else { + // !!! TODO: search in ($HOME/.icewm/) + sprintf(s, "%s/sounds/%s.wav", LIBDIR, gui_events[i].name); + } + + + if (access(s, R_OK) == 0) { + int ifd = open(s, O_RDONLY); + if (ifd == -1) + return; + int ofd = open("/dev/dsp", O_WRONLY); + if (ofd == -1) + return; +#ifdef DEBUG + printf ("copying sound %s to /dev/dsp\n", s); +#endif + int n; + while ((n = read(ifd, s, sizeof(s))) > 0) + write(ofd, s, n); + } + break; + } + } +} + +/* fork and play a sound sample */ +void +fork_sound_play(int sound) +{ + int pid = -1; + + if (sound != -1 && (pid = fork()) == 0) { +#ifdef DEBUG + printf ("fork for sound: #%d\n", sound); +#endif + exit(0); } +} + + +char *displayName = 0; +Display *display = 0; +Window root = 0; +struct timeval last; +Atom _GUI_EVENT; + +/* SIGNAL HANDLER */ + +volatile int terminate = 0; + +void +clean_exit(int sig) { + signal(sig, SIG_DFL); + fprintf( stderr, "%s: received signal %d: terminating...\n", + program_name, sig ); + terminate = 1; + return; +} + +/* + * Catch a restart signal and reload + */ +void +sig_hup(int sig) +{ +#ifdef DEBUG + printf("%s: signal %d", program_name, sig); +#endif +#ifdef ESD + uncache(); + cache(); +#endif +} + +void +sig_chld(int sig){ + pid_t pid; + int stat; + while ((pid = waitpid(-1, &stat, WNOHANG)) > 0) + +#ifdef DEBUG + printf("child %d terminated\n", pid); +#else + ; +#endif + + return; +} + +/* MAIN */ + +int +main(int argc, char *argv[]) { + + program_name = strrchr(argv[0], '/'); + if (program_name) program_name++; else program_name = argv[0]; + + /* if we see any of these, terminate */ + signal( SIGINT, clean_exit ); + signal( SIGKILL, clean_exit ); + signal( SIGPIPE, clean_exit ); + + if(argc == 2) preferedPath = argv[1]; + +#ifdef ESD + for (int i = 0; i < (int)GUIEVENTS; i++) + sample[i] = -1; + + esd = esd_open_sound( esd_server ); + if ( esd <= 0 ) exit(1); + cache(); +#endif if (!(display = XOpenDisplay(displayName))) { fprintf(stderr, - _("Can't open display: %s. " - "X must be running and $DISPLAY set."), - displayName ? displayName : _("")); - fputc('\n', stderr); + "Can't open display: %s. X must be running and $DISPLAY set.\n", + displayName ? displayName : ""); exit(1); } @@ -66,13 +299,20 @@ XSelectInput(display, root, PropertyChangeMask); - signal(SIGCHLD, SIG_IGN); + signal(SIGCHLD, sig_chld); + signal(SIGHUP, sig_hup); - for (;;) { + gettimeofday(&last, NULL); + while (!terminate) { XEvent xev; + struct timeval now; - XNextEvent(display, &xev); - + XNextEvent(display, &xev); /* blocking -- damn.*/ + /* perhaps we'll use this next time? + while (!XCheckMaskEvent(display, PropertyChangeMask, &xev)) { + usleep(10000); + } + */ switch (xev.type) { case PropertyNotify: if (xev.xproperty.atom == _GUI_EVENT) { @@ -84,7 +324,7 @@ int d = -1; if (XGetWindowProperty(display, root, - _GUI_EVENT, 0, 3, True, _GUI_EVENT, + _GUI_EVENT, 0, 3, False, _GUI_EVENT, &type, &format, &nitems, &lbytes, &propdata) == Success) if (propdata) { @@ -92,48 +332,48 @@ XFree(propdata); } - int pid = -1; - if (pid > 0) - kill(pid, SIGKILL); - - if (d != -1 && (pid = fork()) == 0) { - for (unsigned int i = 0; i < sizeof(gui_events)/sizeof(gui_events[0]); i++) { + if (geRestart == d) { +#ifdef DEBUG + printf("%s: recieved restart event.\n", + program_name); +#endif +#ifdef ESD + uncache(); + cache(); +#endif + } + + gettimeofday(&now, NULL); + + if ((now.tv_sec - last.tv_sec >= 2) || + ((now.tv_sec-last.tv_sec)*1000000 + + now.tv_usec - last.tv_usec > 500000)) { + last.tv_sec = now.tv_sec; + last.tv_usec = now.tv_usec; +#ifdef DEBUG + for (unsigned int i = 0; + i < sizeof(gui_events)/sizeof(gui_events[0]); + i++) { if (gui_events[i].type == d) { - char s[1024]; - if(soundPath != NULL){ - sprintf(s, "%s/sounds/%s.wav", soundPath, gui_events[i].name); - } else { - sprintf(s, "%s/sounds/%s.wav", LIBDIR, gui_events[i].name); - } - - if (access(s, R_OK) == 0) { -#ifdef ESD - char prg[1024]; - sprintf(prg,"%s-%i",program_name,counter); - counter++; - if(counter >= 32767) counter = 0; - esd_play_file(program_name, s, 1); -#else - int ifd = open(s, O_RDONLY); - if (ifd == -1) - exit(0); - int ofd = open("/dev/dsp", O_WRONLY); - if (ofd == -1) - exit(0); - - int n; - while ((n = read(ifd, s, sizeof(s))) > 0) - write(ofd, s, n); -#endif - } - break; - } + puts(gui_events[i].name); + } } - exit(0); +#endif /* DEBUG */ +#ifdef ESD + esd_sound_play( d ); +#else + dsp_sound_play( d ); + // or fork_sound_play( d ); +#endif } } } break; } } +#ifdef ESD + uncache(); +#endif /* ESD */ } + +#endif /* CONFIG_GUIEVENTS */