diff --git a/ChangeLog b/ChangeLog index a60ddc65..9b74c8af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,11 @@ Changes since version 0.61.1: defaults.c - fixed colormap_window crash bug (appears when launching some apps from dock, or removing apps from gnome panel etc) +- added DONT_SCALE_ICONS #define +- added --no-autolaunch patch (John Bafford ) +- made Apply button work on window inspector for windows with no WM_CLASS +- changed sound server code to be more efficient +- fixed crash with broken apps that set mask size != pixmap size in icons Changes since version 0.61.0: ............................. diff --git a/Makefile.in b/Makefile.in index c9482220..5449c78d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -326,7 +327,7 @@ uninstall: uninstall-recursive all-am: Makefile all-redirect: all-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: installdirs-recursive installdirs-am: diff --git a/NEWS b/NEWS index f87dfa5d..900debff 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,16 @@ NEWS for veteran Window Maker users ----------------------------------- ---- 0.61.2 +--- 0.62.0 + + +Optimizations!! +--------------- + +Code for converting wrlib images into X Pixmaps was optimized in many ways, +both in the original C code and in assembly for Pentium(tm) processors (with +and without MMX(tm)). Depending on the bit depth/color mode and CPU model, +performance increases can go up to 150% NoBorder Window Attribute @@ -42,6 +51,12 @@ The font for the geometry size will be controlled by the default WINGs font (SystemFont in WMGLOBAL) now. +Others +------ + +- added DONT_SCALE_ICONS compile time option + + --- 0.61.1 New libPropList diff --git a/WINGs/Makefile.in b/WINGs/Makefile.in index 1c874fd5..61a475cf 100644 --- a/WINGs/Makefile.in +++ b/WINGs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -522,7 +523,7 @@ uninstall: uninstall-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) all-redirect: all-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ diff --git a/WINGs/Resources/Makefile.in b/WINGs/Resources/Makefile.in index d3a32728..83f05cad 100644 --- a/WINGs/Resources/Makefile.in +++ b/WINGs/Resources/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -179,7 +180,7 @@ uninstall: uninstall-am all-am: Makefile $(DATA) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(resdatadir) diff --git a/acconfig.h b/acconfig.h index 15f413a4..17948118 100644 --- a/acconfig.h +++ b/acconfig.h @@ -64,6 +64,11 @@ * set by configure */ #undef SHAPE + +/* define if you want support for the XINERAMA extension + * set by configure */ +#undef XINERAMA + /* define if you want support for X window's X_LOCALE * set by configure */ #undef X_LOCALE diff --git a/aclocal.m4 b/aclocal.m4 index f7dcb770..0c6004bc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4a dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -282,6 +282,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) +dnl We require 2.13 because we rely on SHELL being computed by configure. +AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -410,7 +412,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl dnl # Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" +# +# the following will cause an existing older ltconfig to fail, so +# we ignore this at the expense of the cache file... Checking this +# will just take longer ... bummer! +#libtool_flags="--cache-file=$cache_file" +# test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" diff --git a/configure b/configure index bd5848df..69bb0827 100755 --- a/configure +++ b/configure @@ -43,6 +43,8 @@ ac_help="$ac_help --enable-modelock XKB keyboard language status support" ac_help="$ac_help --disable-shape disable shaped window extension support" +ac_help="$ac_help + --disable-xinerama disable XInerama extension support" ac_help="$ac_help --disable-shm disable usage of MIT-SHM extension" ac_help="$ac_help @@ -613,7 +615,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # 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:617: checking for a BSD compatible install" >&5 +echo "configure:619: 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 @@ -666,7 +668,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:670: checking whether build environment is sane" >&5 +echo "configure:672: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -723,7 +725,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:727: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:729: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -750,6 +752,7 @@ else fi + PACKAGE=WindowMaker VERSION=0.62.0 @@ -769,7 +772,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:773: checking for working aclocal" >&5 +echo "configure:776: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -782,7 +785,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:786: checking for working autoconf" >&5 +echo "configure:789: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -795,7 +798,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:799: checking for working automake" >&5 +echo "configure:802: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -808,7 +811,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:812: checking for working autoheader" >&5 +echo "configure:815: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -821,7 +824,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:825: checking for working makeinfo" >&5 +echo "configure:828: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -911,7 +914,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:915: checking host system type" >&5 +echo "configure:918: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -932,7 +935,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:936: checking build system type" >&5 +echo "configure:939: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -952,7 +955,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:956: checking for $ac_word" >&5 +echo "configure:959: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +985,7 @@ fi # 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:986: checking for $ac_word" >&5 +echo "configure:989: 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 @@ -1012,7 +1015,7 @@ if test -z "$CC"; then # 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:1016: checking for $ac_word" >&5 +echo "configure:1019: 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 @@ -1063,7 +1066,7 @@ fi # 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:1067: checking for $ac_word" >&5 +echo "configure:1070: 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 @@ -1095,7 +1098,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1099: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1102: 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. @@ -1106,12 +1109,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1110 "configure" +#line 1113 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1118: \"$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 @@ -1137,12 +1140,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:1141: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1144: 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:1146: checking whether we are using GNU C" >&5 +echo "configure:1149: 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 @@ -1151,7 +1154,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1155: \"$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:1158: \"$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 @@ -1170,7 +1173,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1174: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1177: 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 @@ -1213,7 +1216,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1217: checking for ld used by GCC" >&5 +echo "configure:1220: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1237,10 +1240,10 @@ echo "configure:1217: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1241: checking for GNU ld" >&5 +echo "configure:1244: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1244: checking for non-GNU ld" >&5 +echo "configure:1247: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1276,7 +1279,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1280: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1283: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1292,7 +1295,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1296: checking for BSD-compatible nm" >&5 +echo "configure:1299: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1329,7 +1332,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1333: checking whether ln -s works" >&5 +echo "configure:1336: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1351,7 +1354,12 @@ fi # Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" +# +# the following will cause an existing older ltconfig to fail, so +# we ignore this at the expense of the cache file... Checking this +# will just take longer ... bummer! +#libtool_flags="--cache-file=$cache_file" +# test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" @@ -1373,8 +1381,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1377 "configure"' > conftest.$ac_ext - if { (eval echo configure:1378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1385 "configure"' > conftest.$ac_ext + if { (eval echo configure:1386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1395,19 +1403,19 @@ case "$host" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1399: checking whether the C compiler needs -belf" >&5 +echo "configure:1407: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+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:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1535,7 +1543,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1539: checking host system type" >&5 +echo "configure:1547: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1558,7 +1566,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1562: checking for POSIXized ISC" >&5 +echo "configure:1570: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1581,7 +1589,7 @@ fi # 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:1585: checking for $ac_word" >&5 +echo "configure:1593: 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 @@ -1611,7 +1619,7 @@ if test -z "$CC"; then # 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:1615: checking for $ac_word" >&5 +echo "configure:1623: 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 @@ -1662,7 +1670,7 @@ fi # 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:1666: checking for $ac_word" >&5 +echo "configure:1674: 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 @@ -1694,7 +1702,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1698: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1706: 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. @@ -1705,12 +1713,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1709 "configure" +#line 1717 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1722: \"$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 @@ -1736,12 +1744,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:1740: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1748: 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:1745: checking whether we are using GNU C" >&5 +echo "configure:1753: 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 @@ -1750,7 +1758,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1754: \"$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:1762: \"$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 @@ -1769,7 +1777,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1773: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1781: 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 @@ -1802,7 +1810,7 @@ fi #AC_PROG_RANLIB echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1806: checking whether ln -s works" >&5 +echo "configure:1814: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1823,7 +1831,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1827: checking how to run the C preprocessor" >&5 +echo "configure:1835: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1838,13 +1846,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1856: \"$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 : @@ -1855,13 +1863,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1873: \"$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 : @@ -1872,13 +1880,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1890: \"$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 : @@ -1904,13 +1912,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1908: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1916: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1928,7 +1936,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1987,12 +1995,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1991: checking for vprintf" >&5 +echo "configure:1999: 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:2027: \"$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 @@ -2039,12 +2047,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2043: checking for _doprnt" >&5 +echo "configure:2051: 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:2079: \"$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 @@ -2094,19 +2102,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2098: checking for working alloca.h" >&5 +echo "configure:2106: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2127,12 +2135,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2131: checking for alloca" >&5 +echo "configure:2139: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+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:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2192,12 +2200,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2196: checking whether alloca needs Cray hooks" >&5 +echo "configure:2204: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2226: checking for $ac_func" >&5 +echo "configure:2234: 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:2262: \"$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 @@ -2277,7 +2285,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2281: checking stack direction for C alloca" >&5 +echo "configure:2289: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2285,7 +2293,7 @@ else ac_cv_c_stack_direction=0 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:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2328,12 +2336,12 @@ fi for ac_func in gethostname select poll strerror strncasecmp setpgid atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2332: checking for $ac_func" >&5 +echo "configure:2340: 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:2368: \"$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 @@ -2386,12 +2394,12 @@ done DLLIBS="" echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:2390: checking for dlopen" >&5 +echo "configure:2398: 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${ac_exeext}; then +if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -2432,7 +2440,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2436: checking for dlopen in -ldl" >&5 +echo "configure:2444: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2440,7 +2448,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2463: \"$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 @@ -2480,17 +2488,17 @@ if test "x$HAVEDL" = xyes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2484: checking for $ac_hdr" >&5 +echo "configure:2492: 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:2494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2502: \"$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* @@ -2524,7 +2532,7 @@ if test "x$CPP_PATH" = x; then # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2528: checking for $ac_word" >&5 +echo "configure:2536: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP_PATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2580,12 +2588,12 @@ EOF echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2584: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2592: 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 @@ -2601,7 +2609,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2622,12 +2630,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2626: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2634: 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 @@ -2636,7 +2644,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2661,17 +2669,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h\ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2665: checking for $ac_hdr" >&5 +echo "configure:2673: 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:2675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2683: \"$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* @@ -2701,12 +2709,12 @@ done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2705: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:2713: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2718,7 +2726,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2739,18 +2747,18 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2743: checking for working const" >&5 +echo "configure:2751: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+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:2805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2816,12 +2824,12 @@ fi #AC_TYPE_SIZE_T #AC_TYPE_PID_T echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2820: checking return type of signal handlers" >&5 +echo "configure:2828: 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 @@ -2838,7 +2846,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2876,19 +2884,19 @@ EOF echo $ac_n "checking whether gcc supports MMX(tm) inline asm""... $ac_c" 1>&6 -echo "configure:2880: checking whether gcc supports MMX(tm) inline asm" >&5 +echo "configure:2888: checking whether gcc supports MMX(tm) inline asm" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline_mmx'+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:2900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_mmx=yes else @@ -2921,12 +2929,12 @@ fi INTLIBS="" echo $ac_n "checking for gettext""... $ac_c" 1>&6 -echo "configure:2925: checking for gettext" >&5 +echo "configure:2933: checking for gettext" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettext'+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:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -2967,7 +2975,7 @@ if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2971: checking for gettext in -lintl" >&5 +echo "configure:2979: 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 @@ -2975,7 +2983,7 @@ else 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:2998: \"$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 @@ -3013,7 +3021,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3017: checking for $ac_word" >&5 +echo "configure:3025: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3109,7 +3117,7 @@ done case $host_os in freebsd*) echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:3113: checking for setlocale in -lxpg4" >&5 +echo "configure:3121: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3117,7 +3125,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3140: \"$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 @@ -3244,12 +3252,12 @@ fi NETLIBS="" echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3248: checking for connect" >&5 +echo "configure:3256: 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:3284: \"$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 @@ -3290,7 +3298,7 @@ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3294: checking for connect in -lsocket" >&5 +echo "configure:3302: 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 @@ -3298,7 +3306,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3321: \"$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 @@ -3333,12 +3341,12 @@ fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3337: checking for gethostbyname" >&5 +echo "configure:3345: 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:3373: \"$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 @@ -3379,7 +3387,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3383: checking for gethostbyname in -lnsl" >&5 +echo "configure:3391: 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 @@ -3387,7 +3395,7 @@ else 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:3410: \"$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 @@ -3422,12 +3430,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3426: checking for inet_aton" >&5 +echo "configure:3434: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+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:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -3472,7 +3480,7 @@ else echo "$ac_t""no" 1>&6 for lib in resolv socket inet bsd; do echo $ac_n "checking for inet_aton in -l$lib""... $ac_c" 1>&6 -echo "configure:3476: checking for inet_aton in -l$lib" >&5 +echo "configure:3484: checking for inet_aton in -l$lib" >&5 ac_lib_var=`echo $lib'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3480,7 +3488,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$lib $NETLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3503: \"$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 @@ -3528,7 +3536,7 @@ fi # 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:3532: checking for X" >&5 +echo "configure:3540: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3590,12 +3598,12 @@ if test "$ac_x_includes" = NO; then # 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:3599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3607: \"$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* @@ -3664,14 +3672,14 @@ if test "$ac_x_libraries" = NO; then 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:3683: \"$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. @@ -3777,17 +3785,17 @@ else 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:3781: checking whether -R must be followed by a space" >&5 +echo "configure:3789: 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:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3803,14 +3811,14 @@ rm -f conftest* 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:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3842,7 +3850,7 @@ rm -f conftest* # 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:3846: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3854: 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 @@ -3850,7 +3858,7 @@ else 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:3873: \"$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 @@ -3883,7 +3891,7 @@ fi 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:3887: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3895: 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 @@ -3891,7 +3899,7 @@ else 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:3914: \"$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 @@ -3931,12 +3939,12 @@ fi # 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:3935: checking for gethostbyname" >&5 +echo "configure:3943: 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:3971: \"$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 @@ -3980,7 +3988,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3984: checking for gethostbyname in -lnsl" >&5 +echo "configure:3992: 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 @@ -3988,7 +3996,7 @@ else 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:4011: \"$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 @@ -4029,12 +4037,12 @@ fi # -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:4033: checking for connect" >&5 +echo "configure:4041: 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:4069: \"$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 @@ -4078,7 +4086,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4082: checking for connect in -lsocket" >&5 +echo "configure:4090: 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 @@ -4086,7 +4094,7 @@ else 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:4109: \"$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 @@ -4121,12 +4129,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4125: checking for remove" >&5 +echo "configure:4133: 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:4161: \"$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 @@ -4170,7 +4178,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4174: checking for remove in -lposix" >&5 +echo "configure:4182: 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 @@ -4178,7 +4186,7 @@ else 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:4201: \"$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 @@ -4213,12 +4221,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4217: checking for shmat" >&5 +echo "configure:4225: 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:4253: \"$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 @@ -4262,7 +4270,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4266: checking for shmat in -lipc" >&5 +echo "configure:4274: 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 @@ -4270,7 +4278,7 @@ else 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:4293: \"$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 @@ -4314,7 +4322,7 @@ fi # 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:4318: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4326: 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 @@ -4322,7 +4330,7 @@ else 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:4345: \"$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 @@ -4391,7 +4399,7 @@ fi if test "$use_locale" = yes; then echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 -echo "configure:4395: checking for _Xsetlocale in -lX11" >&5 +echo "configure:4403: checking for _Xsetlocale in -lX11" >&5 ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4399,7 +4407,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4422: \"$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 @@ -4462,7 +4470,7 @@ added_xext=no if test "$shape" = yes; then echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:4466: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:4474: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4470,7 +4478,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4493: \"$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 @@ -4510,6 +4518,68 @@ fi fi + +xinerama=yes +# Check whether --enable-xinerama or --disable-xinerama was given. +if test "${enable_xinerama+set}" = set; then + enableval="$enable_xinerama" + xinerama=$enableval +else + xinerama=yes +fi + + +if test "$xinerama" = yes; then + echo $ac_n "checking for X in -lXext""... $ac_c" 1>&6 +echo "configure:4535: checking for X in -lXext" >&5 +ac_lib_var=`echo Xext'_'X | 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="-lXext $XLFLAGS $XLIBS $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 + XLIBS="-lXext $XLIBS" + added_xext=yes + cat >> confdefs.h <<\EOF +#define XINERAMA 1 +EOF + +else + echo "$ac_t""no" 1>&6 +xinerama=no +fi + +fi + + + shm=yes # Check whether --enable-shm or --disable-shm was given. if test "${enable_shm+set}" = set; then @@ -4522,7 +4592,7 @@ fi if test "$shm" = yes; then echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:4526: checking for XShmAttach in -lXext" >&5 +echo "configure:4596: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4530,7 +4600,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4615: \"$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 @@ -4565,12 +4635,12 @@ fi if test "$ok" = yes; then echo $ac_n "checking for shmget""... $ac_c" 1>&6 -echo "configure:4569: checking for shmget" >&5 +echo "configure:4639: checking for shmget" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmget'+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:4667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmget=yes" else @@ -4642,7 +4712,7 @@ LIBPL="" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for PLGetString in -lPropList""... $ac_c" 1>&6 -echo "configure:4646: checking for PLGetString in -lPropList" >&5 +echo "configure:4716: checking for PLGetString in -lPropList" >&5 ac_lib_var=`echo PropList'_'PLGetString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4650,7 +4720,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lPropList $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4735: \"$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 @@ -4690,17 +4760,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "proplist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for proplist.h""... $ac_c" 1>&6 -echo "configure:4694: checking for proplist.h" >&5 +echo "configure:4764: checking for proplist.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:4704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4774: \"$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* @@ -4755,12 +4825,12 @@ lPL_major_version=`echo 0.9.5 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` lPL_minor_version=`echo 0.9.5 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` lPL_micro_version=`echo 0.9.5 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` echo $ac_n "checking whether libPropList is newer than 0.9.5""... $ac_c" 1>&6 -echo "configure:4759: checking whether libPropList is newer than 0.9.5" >&5 +echo "configure:4829: checking whether libPropList is newer than 0.9.5" >&5 if eval "test \"`echo '$''{'ac_cv_lib_proplist_version_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4773,7 +4843,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_proplist_version_ok=yes" else @@ -4831,7 +4901,7 @@ if test "$xpm" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:4835: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:4905: 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 @@ -4839,7 +4909,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4924: \"$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 @@ -4880,17 +4950,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:4884: checking for X11/xpm.h" >&5 +echo "configure:4954: 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:4894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4964: \"$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* @@ -4952,7 +5022,7 @@ if test "$png" = yes ; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:4956: checking for png_get_valid in -lpng" >&5 +echo "configure:5026: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4960,7 +5030,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5045: \"$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 @@ -5001,17 +5071,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:5005: checking for png.h" >&5 +echo "configure:5075: checking for png.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:5015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5085: \"$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* @@ -5062,7 +5132,7 @@ if test "$jpeg" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:5066: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:5136: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5070,7 +5140,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5155: \"$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 @@ -5114,17 +5184,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:5118: checking for jpeglib.h" >&5 +echo "configure:5188: checking for jpeglib.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:5128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5198: \"$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* @@ -5175,7 +5245,7 @@ if test "$gif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:5179: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:5249: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5183,7 +5253,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lungif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5268: \"$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 @@ -5225,7 +5295,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 -echo "configure:5229: checking for DGifOpenFileName in -lgif" >&5 +echo "configure:5299: checking for DGifOpenFileName in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5233,7 +5303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5318: \"$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 @@ -5278,17 +5348,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 -echo "configure:5282: checking for gif_lib.h" >&5 +echo "configure:5352: checking for gif_lib.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:5292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5362: \"$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* @@ -5349,7 +5419,7 @@ if test "$tif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:5353: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:5423: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5357,7 +5427,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5442: \"$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 @@ -5400,7 +5470,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:5404: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:5474: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5408,7 +5478,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5493: \"$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 @@ -5452,7 +5522,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -echo "configure:5456: checking for TIFFGetVersion in -ltiff34" >&5 +echo "configure:5526: checking for TIFFGetVersion in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5460,7 +5530,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff34 $ljpeg -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5545: \"$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 @@ -5506,17 +5576,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:5510: checking for tiffio.h" >&5 +echo "configure:5580: checking for tiffio.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:5520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5590: \"$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* diff --git a/configure.in b/configure.in index 34f34a86..de89958a 100644 --- a/configure.in +++ b/configure.in @@ -441,6 +441,22 @@ if test "$shape" = yes; then fi + +dnl XINERAMA support +dnl ================ +xinerama=yes +AC_ARG_ENABLE(xinerama, +[ --disable-xinerama disable XInerama extension support], + xinerama=$enableval, xinerama=yes) + +if test "$xinerama" = yes; then + AC_CHECK_LIB(Xext, X, [XLIBS="-lXext $XLIBS" + added_xext=yes + AC_DEFINE(XINERAMA)], xinerama=no, $XLFLAGS $XLIBS) +fi + + + dnl MIT-SHM support dnl =============== shm=yes diff --git a/po/fr.po b/po/fr.po index 734349a9..c627821b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.53.0\n" -"POT-Creation-Date: 1999-04-22 07:08+0200\n" +"POT-Creation-Date: 1999-12-12 09:10+0100\n" "PO-Revision-Date: 1999-04-27 07:08+2000\n" "Last-Translator: Bastien Nocera \n" "Language-Team: French \n" @@ -15,25 +15,25 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/appicon.c:541 ../src/dialog.c:223 ../src/dialog.c:279 -#: ../src/dock.c:3114 ../src/dockedapp.c:210 ../src/rootmenu.c:1743 -#: ../src/winspector.c:284 ../src/winspector.c:300 +#: ../src/appicon.c:574 ../src/dialog.c:230 ../src/dock.c:3292 +#: ../src/dockedapp.c:211 ../src/main.c:249 ../src/rootmenu.c:1765 +#: ../src/winspector.c:381 ../src/winspector.c:397 msgid "Error" msgstr "Erreur." -#: ../src/appicon.c:542 +#: ../src/appicon.c:575 msgid "Could not open specified icon file" msgstr "Icone spécifié introuvable." -#: ../src/appicon.c:543 ../src/dialog.c:122 ../src/dialog.c:223 -#: ../src/dialog.c:279 ../src/dialog.c:467 ../src/dialog.c:1476 -#: ../src/dock.c:473 ../src/dock.c:3115 ../src/dockedapp.c:211 -#: ../src/dockedapp.c:357 ../src/rootmenu.c:1747 ../src/winspector.c:285 -#: ../src/winspector.c:301 +#: ../src/appicon.c:576 ../src/dialog.c:122 ../src/dialog.c:230 +#: ../src/dialog.c:574 ../src/dialog.c:1593 ../src/dock.c:517 +#: ../src/dock.c:525 ../src/dock.c:549 ../src/dock.c:3293 +#: ../src/dockedapp.c:212 ../src/dockedapp.c:367 ../src/main.c:249 +#: ../src/rootmenu.c:1769 ../src/winspector.c:382 ../src/winspector.c:398 msgid "OK" msgstr "OK" -#: ../src/appicon.c:570 ../src/dock.c:276 +#: ../src/appicon.c:603 ../src/dock.c:279 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" @@ -43,249 +43,262 @@ msgstr "" "Tous les changements non sauvegardés seront perdus.\n" "Confirmez avec OK." -#: ../src/appicon.c:576 ../src/dock.c:281 ../src/winmenu.c:124 +#: ../src/appicon.c:609 ../src/dock.c:284 ../src/winmenu.c:125 msgid "Kill Application" msgstr "Tuer l'application" -#: ../src/appicon.c:577 ../src/dock.c:282 ../src/winmenu.c:126 +#: ../src/appicon.c:610 ../src/dock.c:285 ../src/winmenu.c:127 msgid "Yes" msgstr "Oui" -#: ../src/appicon.c:577 ../src/dock.c:282 ../src/winmenu.c:126 +#: ../src/appicon.c:610 ../src/dock.c:285 ../src/winmenu.c:127 msgid "No" msgstr "Non" -#: ../src/appicon.c:595 ../src/dock.c:1109 +#: ../src/appicon.c:628 ../src/dock.c:1165 msgid "Unhide Here" msgstr "Montrer ici" -#: ../src/appicon.c:596 ../src/appicon.c:621 ../src/dock.c:1111 -#: ../src/dock.c:1113 ../src/dock.c:3240 ../src/dock.c:3242 -#: ../src/winmenu.c:446 +#: ../src/appicon.c:629 ../src/appicon.c:654 ../src/dock.c:1167 +#: ../src/dock.c:1169 ../src/dock.c:3459 ../src/dock.c:3461 +#: ../src/winmenu.c:469 msgid "Hide" msgstr "Cacher" -#: ../src/appicon.c:597 +#: ../src/appicon.c:630 msgid "Set Icon..." msgstr "Associer un icone..." -#: ../src/appicon.c:598 ../src/dock.c:1117 ../src/rootmenu.c:227 -#: ../src/rootmenu.c:241 ../src/winmenu.c:493 +#: ../src/appicon.c:631 ../src/dock.c:1173 ../src/rootmenu.c:226 +#: ../src/rootmenu.c:240 ../src/winmenu.c:516 msgid "Kill" msgstr "Tuer" -#: ../src/appicon.c:619 ../src/dock.c:3238 +#: ../src/appicon.c:652 ../src/dock.c:3457 msgid "Unhide" msgstr "Montrer" -#: ../src/defaults.c:808 ../src/startup.c:772 ../src/startup.c:790 -#: ../src/startup.c:796 +#: ../src/defaults.c:845 ../src/startup.c:768 ../src/startup.c:786 +#: ../src/startup.c:792 #, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "Domaine «%s» introuvable dans la base par défaut." -#: ../src/defaults.c:854 ../src/defaults.c:979 ../src/defaults.c:1018 -#: ../src/defaults.c:1048 +#: ../src/defaults.c:891 ../src/defaults.c:1016 ../src/defaults.c:1055 +#: ../src/defaults.c:1085 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" msgstr "Domaine %s (%s) de la base par défaut corrompu!" -#: ../src/defaults.c:859 ../src/defaults.c:1000 ../src/defaults.c:1031 -#: ../src/defaults.c:1057 +#: ../src/defaults.c:896 ../src/defaults.c:1037 ../src/defaults.c:1068 +#: ../src/defaults.c:1094 #, c-format msgid "could not load domain %s from user defaults database" msgstr "Domaine %s illisible depuis la base utilisateur par défaut." -#: ../src/defaults.c:870 ../src/defaults.c:964 +#: ../src/defaults.c:907 ../src/defaults.c:1001 #, c-format msgid "Domain %s (%s) of global defaults database is corrupted!" msgstr "Domaine %s (%s) de la base globale par défaut est corrompu!" -#: ../src/defaults.c:889 ../src/defaults.c:969 +#: ../src/defaults.c:926 +#, fuzzy, c-format +msgid "could not load domain %s from global defaults database (%s)" +msgstr "Domaine %s illisible depuis la base globale par défaut." + +#: ../src/defaults.c:1006 #, c-format msgid "could not load domain %s from global defaults database" msgstr "Domaine %s illisible depuis la base globale par défaut." -#: ../src/defaults.c:1277 +#: ../src/defaults.c:1332 #, c-format msgid "wrong option value for key \"%s\". Should be one of %s" msgstr "Mauvaise valeur d'option pour la clé «%s». Devrait être parmi %s" -#: ../src/defaults.c:1324 +#: ../src/defaults.c:1379 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" msgstr "Conversion de «%s» en donnée booléenne pour la clé \"%s\" impossible." -#: ../src/defaults.c:1329 ../src/defaults.c:1363 ../src/defaults.c:1395 -#: ../src/defaults.c:1408 ../src/defaults.c:1423 ../src/defaults.c:1437 -#: ../src/defaults.c:1509 ../src/defaults.c:1521 ../src/defaults.c:1927 -#: ../src/defaults.c:1944 ../src/defaults.c:1957 ../src/defaults.c:1990 -#: ../src/defaults.c:2006 ../src/defaults.c:2037 ../src/defaults.c:2124 +#: ../src/defaults.c:1384 ../src/defaults.c:1418 ../src/defaults.c:1450 +#: ../src/defaults.c:1463 ../src/defaults.c:1478 ../src/defaults.c:1492 +#: ../src/defaults.c:1564 ../src/defaults.c:1576 ../src/defaults.c:1982 +#: ../src/defaults.c:1999 ../src/defaults.c:2012 ../src/defaults.c:2102 +#: ../src/defaults.c:2118 ../src/defaults.c:2149 ../src/defaults.c:2239 #, c-format msgid "using default \"%s\" instead" msgstr "Utilise la valeur par défaut «%s» en remplacement." -#: ../src/defaults.c:1360 +#: ../src/defaults.c:1415 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" msgstr "Conversion de «%s» en donnée entière pour la clé «%s» impossible." -#: ../src/defaults.c:1390 ../src/defaults.c:1504 ../src/defaults.c:1922 -#: ../src/defaults.c:1939 ../src/defaults.c:1985 ../src/defaults.c:2032 -#: ../src/wdefaults.c:546 ../src/wdefaults.c:582 +#: ../src/defaults.c:1445 ../src/defaults.c:1559 ../src/defaults.c:1977 +#: ../src/defaults.c:1994 ../src/defaults.c:2097 ../src/defaults.c:2144 +#: ../src/wdefaults.c:560 ../src/wdefaults.c:596 #, c-format msgid "Wrong option format for key \"%s\". Should be %s." msgstr "Mauvais format d'option pour la clé «%s». Devrait être %s." -#: ../src/defaults.c:1403 +#: ../src/defaults.c:1458 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "Nombre incorrects d'éléments pour la clé «%s»." -#: ../src/defaults.c:1418 +#: ../src/defaults.c:1473 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "Mauvaise valeur pour la clé «%s». Devrait être des Coordonnées." -#: ../src/defaults.c:1433 +#: ../src/defaults.c:1488 #, c-format msgid "can't convert array to integers for \"%s\"." msgstr "Conversion vers des données entières pour la clé «%s» impossible." -#: ../src/defaults.c:1631 ../src/defaults.c:1663 ../src/defaults.c:1679 -#: ../src/defaults.c:1725 ../src/defaults.c:1765 ../src/defaults.c:1803 -#: ../src/defaults.c:1819 +#: ../src/defaults.c:1686 ../src/defaults.c:1718 ../src/defaults.c:1734 +#: ../src/defaults.c:1780 ../src/defaults.c:1820 ../src/defaults.c:1858 +#: ../src/defaults.c:1874 #, c-format msgid "\"%s\" is not a valid color name" msgstr "«%s» est un nom de couleur invalide." -#: ../src/defaults.c:1644 +#: ../src/defaults.c:1699 msgid "bad number of arguments in gradient specification" msgstr "Mauvais nombre d'arguments dans la spécification du dégradé." -#: ../src/defaults.c:1698 +#: ../src/defaults.c:1753 msgid "too few arguments in multicolor gradient specification" msgstr "Trop peu d'arguments dans la spécification du dégradé multicolore." -#: ../src/defaults.c:1792 +#: ../src/defaults.c:1847 msgid "bad number of arguments in textured gradient specification" msgstr "Mauvais nombre d'arguments dans la spécification du dégradé texturé." -#: ../src/defaults.c:1835 +#: ../src/defaults.c:1890 #, c-format msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" -msgstr "Mauvaise valeur d'opacité pour la texture tgradient «%s». Devrait être [0..255]" +msgstr "" +"Mauvaise valeur d'opacité pour la texture tgradient «%s». Devrait être " +"[0..255]" -#: ../src/defaults.c:1895 +#: ../src/defaults.c:1950 #, c-format msgid "could not initialize library %s" msgstr "Ne peut pas initialiser la librairie %s" -#: ../src/defaults.c:1898 +#: ../src/defaults.c:1953 #, c-format msgid "could not find function %s::%s" msgstr "Function %s::%s introuvable" -#: ../src/defaults.c:1905 +#: ../src/defaults.c:1960 #, c-format msgid "invalid texture type %s" msgstr "Type de texture %s invalide" -#: ../src/defaults.c:1952 +#: ../src/defaults.c:2007 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "Erreur dans la spécification de la texture pour la clé «%s»" -#: ../src/defaults.c:2002 +#: ../src/defaults.c:2114 msgid "Wrong type for workspace background. Should be a texture type." msgstr "Mauvais type de fond d'écran. Devrait être une texture." -#: ../src/defaults.c:2050 +#: ../src/defaults.c:2162 #, c-format msgid "Wrong type for background of workspace %i. Should be a texture." -msgstr "Mauvais type de fond d'écran pour le bureau %i. Devrait être une texture." +msgstr "" +"Mauvais type de fond d'écran pour le bureau %i. Devrait être une texture." -#: ../src/defaults.c:2091 +#: ../src/defaults.c:2206 msgid "could not load any usable font!!!" msgstr "Aucune police utilisable chargeable." -#: ../src/defaults.c:2119 +#: ../src/defaults.c:2234 #, c-format msgid "could not get color for key \"%s\"" msgstr "Obtention de la couleur pour la clé «%s» impossible." -#: ../src/defaults.c:2179 ../src/rootmenu.c:493 +#: ../src/defaults.c:2294 ../src/rootmenu.c:492 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s: modificateur de touche «%s» invalide." -#: ../src/defaults.c:2191 +#: ../src/defaults.c:2306 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s: spécification de raccourci-clavier «%s» invalide." -#: ../src/defaults.c:2198 +#: ../src/defaults.c:2313 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s: touche invalide dans le raccourci «%s»." -#: ../src/defaults.c:2224 +#: ../src/defaults.c:2339 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: modificateur de touche «%s» invalide." -#: ../src/defaults.c:2258 +#: ../src/defaults.c:2373 #, c-format msgid "could not load image in option %s: %s" msgstr "Ne peut pas charger l'image de l'option %s: %s" -#: ../src/defaults.c:2340 +#: ../src/defaults.c:2455 msgid "could not render texture for icon background" msgstr "Affichage de la texture de fond d'icone impossible." -#: ../src/dialog.c:122 ../src/dialog.c:474 ../src/dock.c:473 -#: ../src/dockedapp.c:363 ../src/rootmenu.c:189 ../src/rootmenu.c:227 -#: ../src/rootmenu.c:241 +#: ../src/dialog.c:122 ../src/dialog.c:581 ../src/dock.c:549 +#: ../src/dockedapp.c:373 ../src/rootmenu.c:188 ../src/rootmenu.c:226 +#: ../src/rootmenu.c:240 msgid "Cancel" msgstr "Annuler" -#: ../src/dialog.c:218 +#: ../src/dialog.c:225 msgid "Could not open directory " msgstr "Ouverture du répertoire impossible." -#: ../src/dialog.c:274 +#: ../src/dialog.c:280 msgid "Could not load image file " msgstr "Lecture de l'image impossible." -#: ../src/dialog.c:411 +#: ../src/dialog.c:509 msgid "Directories" msgstr "Répertoires" -#: ../src/dialog.c:420 +#: ../src/dialog.c:518 msgid "Icons" msgstr "Icones" -#: ../src/dialog.c:457 +#: ../src/dialog.c:551 +msgid "Preview" +msgstr "Aperçu" + +#: ../src/dialog.c:564 msgid "File Name:" msgstr "Fichier:" -#: ../src/dialog.c:480 +#: ../src/dialog.c:587 msgid "Choose File" msgstr "Choissisez un fichier" -#: ../src/dialog.c:497 ../src/dialog.c:499 +#: ../src/dialog.c:604 ../src/dialog.c:606 msgid "Icon Chooser" msgstr "Sélectionneur d'icone" -#: ../src/dialog.c:1400 ../src/startup.c:325 +#: ../src/dialog.c:1517 ../src/startup.c:325 msgid "cannot open connection for crashing dialog panel. Aborting." -msgstr "Ouverture d'une connexion pour le panneau de crash impossible. Abandon." +msgstr "" +"Ouverture d'une connexion pour le panneau de crash impossible. Abandon." -#: ../src/dialog.c:1426 +#: ../src/dialog.c:1543 msgid "Fatal error" msgstr "Erreur fatale" -#: ../src/dialog.c:1437 +#: ../src/dialog.c:1554 #, c-format msgid "" "Window Maker received signal %i\n" @@ -294,12 +307,12 @@ msgstr "" "Window Maker a reçu le signal %i\n" "(%s)." -#: ../src/dialog.c:1440 +#: ../src/dialog.c:1557 #, c-format msgid "Window Maker received signal %i." msgstr "Window Maker a reçu le signal %i." -#: ../src/dialog.c:1449 +#: ../src/dialog.c:1566 msgid "" " This fatal error occured probably due to a bug. Please fill the included " "BUGFORM and report it to bugs@windowmaker.org." @@ -307,352 +320,412 @@ msgstr "" " Cette erreur est probablement apparue suite à un bug. Remplissez le " "formulaire BUGFORM et envoyez-le à bugs@windowmaker.org." -#: ../src/dialog.c:1457 +#: ../src/dialog.c:1574 msgid "What do you want to do now?" msgstr "Que voulez faire maintenant ?" -#: ../src/dialog.c:1463 +#: ../src/dialog.c:1580 msgid "Select action" msgstr "Choisissez une action" -#: ../src/dialog.c:1464 +#: ../src/dialog.c:1581 msgid "Abort and leave a core file" msgstr "Abandonner et créer un core dump" -#: ../src/dialog.c:1465 +#: ../src/dialog.c:1582 msgid "Restart Window Maker" msgstr "Redémarrer Window Maker" -#: ../src/dialog.c:1466 +#: ../src/dialog.c:1583 msgid "Start alternate window manager" msgstr "Démarrer un autre gestionnaire de fenêtres" -#: ../src/dock.c:210 +#: ../src/dock.c:213 #, c-format msgid "Type the name for workspace %i:" msgstr "Entrez un nom pour le Bureau %i:" -#: ../src/dock.c:211 ../src/dock.c:1088 +#: ../src/dock.c:214 ../src/dock.c:1129 ../src/dock.c:1132 ../src/dock.c:3375 msgid "Rename Workspace" msgstr "Renommer le Bureau" -#: ../src/dock.c:471 +#: ../src/dock.c:511 ../src/dock.c:519 +msgid "Warning" +msgstr "Attention" + +#: ../src/dock.c:512 +msgid "" +"Some icons cannot be made omnipresent. Please make sure that no other icon " +"is docked in the same positions on the other workspaces and the Clip is not " +"full in some workspace." +msgstr "" +"Certains icones ne peuvent pas être omniprésents. Assurez-vous que d'autres " +"icones ne sont pas présents à la même place sur d'autres bureaux ou que le " +"Clip n'est plein sur un autre bureau." + +#: ../src/dock.c:520 +msgid "" +"Icon cannot be made omnipresent. Please make sure that no other icon is " +"docked in the same position on the other workspaces and the Clip is not full " +"in some workspace." +msgstr "" +"Certains icones ne peuvent pas être omniprésents. Assurez-vous que d'autres " +"icones ne sont pas présents à la même place sur d'autres bureaux ou que le " +"Clip n'est plein sur un autre bureau." + +#: ../src/dock.c:547 msgid "Workspace Clip" msgstr "Clip pour le Bureau" -#: ../src/dock.c:472 +#: ../src/dock.c:548 msgid "All selected icons will be removed!" msgstr "Tous les icones séléctionnés vont être supprimés!" -#: ../src/dock.c:519 +#: ../src/dock.c:600 ../src/dock.c:1144 ../src/dock.c:1146 ../src/dock.c:3411 msgid "Keep Icon" msgstr "Garder l'icone" -#: ../src/dock.c:520 ../src/dock.c:2022 ../src/dock.c:2151 +#: ../src/dock.c:601 ../src/dock.c:2121 ../src/dock.c:2255 msgid "Type the command used to launch the application" msgstr "Entrez la commande utilisée pour lancer l'application" -#: ../src/dock.c:901 +#: ../src/dock.c:953 #, c-format msgid "could not launch application %s\n" msgstr "Lancement de l'application %s impossible.\n" -#: ../src/dock.c:956 +#: ../src/dock.c:1008 msgid "could not create workspace submenu for Clip menu" msgstr "Création du sous-menu Bureau pour le menu du Clip impossible." -#: ../src/dock.c:1019 +#: ../src/dock.c:1066 msgid "could not create options submenu for Clip menu" msgstr "Création du sous-menu Options pour le menu du Clip impossible." -#: ../src/dock.c:1023 ../src/dock.c:1077 ../src/winmenu.c:388 -msgid "Keep on top" +#: ../src/dock.c:1070 +#, fuzzy +msgid "Keep on Top" msgstr "Garder au-dessus" -#: ../src/dock.c:1029 +#: ../src/dock.c:1076 msgid "Collapsed" msgstr "Refermé" -#: ../src/dock.c:1035 +#: ../src/dock.c:1082 msgid "AutoCollapse" msgstr "Auto­Fermeture" -#: ../src/dock.c:1041 +#: ../src/dock.c:1088 msgid "AutoRaiseLower" msgstr "Auto-Positionnement" -#: ../src/dock.c:1047 +#: ../src/dock.c:1094 msgid "AutoAttract Icons" msgstr "Attirer les Icones" -#: ../src/dock.c:1053 -msgid "Keep Attracted Icons" -msgstr "Garder les Icones" +#: ../src/dock.c:1118 ../src/winmenu.c:411 +msgid "Keep on top" +msgstr "Garder au-dessus" -#: ../src/dock.c:1083 +#: ../src/dock.c:1124 msgid "Clip Options" msgstr "Options de Clip" -#: ../src/dock.c:1090 -msgid "(Un)Select Icon" -msgstr "(Dé)Séléctionner l'Icone" +#: ../src/dock.c:1134 +#, fuzzy +msgid "Selected" +msgstr "Séléctionner" -#: ../src/dock.c:1092 -msgid "(Un)Select All Icons" +#: ../src/dock.c:1139 ../src/dock.c:1142 ../src/dock.c:3402 +#, fuzzy +msgid "Select All Icons" msgstr "(Dé)Séléctionner tous les Icones" -#: ../src/dock.c:1095 -msgid "Keep Icon(s)" -msgstr "Garder le(s) Icone(s)" - -#: ../src/dock.c:1097 -msgid "Move Icon(s) To" +#: ../src/dock.c:1148 ../src/dock.c:1150 ../src/dock.c:3419 +#, fuzzy +msgid "Move Icon To" msgstr "Déplacer le(s) Icone(s) vers" -#: ../src/dock.c:1102 -msgid "Remove Icon(s)" +#: ../src/dock.c:1155 ../src/dock.c:1158 ../src/dock.c:3430 +#, fuzzy +msgid "Remove Icon" msgstr "Supprimer le(s) Icone(s)" -#: ../src/dock.c:1104 +#: ../src/dock.c:1160 msgid "Attract Icons" msgstr "Attirer le(s) Icone(s)" -#: ../src/dock.c:1107 +#: ../src/dock.c:1163 msgid "Launch" msgstr "Lancer" -#: ../src/dock.c:1115 +#: ../src/dock.c:1171 msgid "Settings..." msgstr "Paramètres..." -#: ../src/dock.c:1500 ../src/dock.c:1514 ../src/dock.c:1528 ../src/dock.c:1538 +#: ../src/dock.c:1530 ../src/dock.c:1628 #, c-format msgid "bad value in docked icon state info %s" msgstr "Mauvaise valeur dans l'information %s sur l'état de l'icone." -#: ../src/dock.c:1546 +#: ../src/dock.c:1636 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "Mauvaise valeur pour l'icone de position %i,%i." -#: ../src/dock.c:1789 +#: ../src/dock.c:1888 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "Il y a trop d'icones dans le dock. Le surplus sera ignoré." #. icon->forced_dock = 1; -#: ../src/dock.c:2021 ../src/dock.c:2150 +#: ../src/dock.c:2120 ../src/dock.c:2254 msgid "Dock Icon" msgstr "Docker l'icone" -#: ../src/dock.c:3107 ../src/dock.c:3111 +#: ../src/dock.c:3285 ../src/dock.c:3289 #, c-format msgid "Could not execute command \"%s\"" msgstr "Exécution de la commande «%s» impossible." -#: ../src/dockedapp.c:130 +#: ../src/dock.c:3381 +#, fuzzy +msgid "Toggle Omnipresent" +msgstr "Omniprésente" + +#: ../src/dock.c:3386 ../src/winmenu.c:421 ../src/winspector.c:1363 +msgid "Omnipresent" +msgstr "Omniprésente" + +#: ../src/dock.c:3400 +#, fuzzy +msgid "Unselect All Icons" +msgstr "(Dé)Séléctionner tous les Icones" + +#: ../src/dock.c:3409 +#, fuzzy +msgid "Keep Icons" +msgstr "Garder l'icone" + +#: ../src/dock.c:3417 +#, fuzzy +msgid "Move Icons To" +msgstr "Déplacer le(s) Icone(s) vers" + +#: ../src/dock.c:3428 +#, fuzzy +msgid "Remove Icons" +msgstr "Supprimer le(s) Icone(s)" + +#: ../src/dockedapp.c:131 #, c-format msgid "could not find icon %s, used in a docked application" msgstr "Icone %s, utilisé dans l'application dockée, introuvable." - -#: ../src/dockedapp.c:209 +#: ../src/dockedapp.c:210 #, c-format msgid "Could not open specified icon file: %s" msgstr "Ouverture de l'icone %s impossible." -#: ../src/dockedapp.c:211 +#: ../src/dockedapp.c:212 msgid "Ignore" msgstr "Ignorer" -#: ../src/dockedapp.c:298 +#: ../src/dockedapp.c:302 msgid "Start when WindowMaker is started" msgstr "Démarrage automatique" -#: ../src/dockedapp.c:305 +#: ../src/dockedapp.c:309 +msgid "Lock (prevent accidental removal)" +msgstr "Bloquer (évite la suppression accidentelle)" + +#: ../src/dockedapp.c:315 msgid "Application path and arguments" msgstr "Chemin de l'application et arguments" -#: ../src/dockedapp.c:316 +#: ../src/dockedapp.c:326 msgid "Command for files dropped with DND" msgstr "Commande pour les fichiers lâchés par DND" -#: ../src/dockedapp.c:328 +#: ../src/dockedapp.c:338 #, c-format msgid "%d will be replaced with the file name" msgstr "%d sera remplacé par le nom du fichier" -#: ../src/dockedapp.c:332 +#: ../src/dockedapp.c:342 msgid "DND support was not compiled in" msgstr "Le support du DND n'a pas été compilé" -#: ../src/dockedapp.c:338 +#: ../src/dockedapp.c:348 msgid "Icon Image" msgstr "Fichier Icone" -#: ../src/dockedapp.c:350 ../src/winspector.c:1245 +#: ../src/dockedapp.c:360 ../src/winspector.c:1501 msgid "Browse..." msgstr "Parcourir..." -#: ../src/dockedapp.c:395 +#: ../src/dockedapp.c:405 msgid "Docked Application Settings" msgstr "Paramètres de l'application dockée" -#: ../src/framewin.c:489 ../src/framewin.c:565 ../src/menu.c:461 +#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:458 #: ../src/texture.c:549 #, c-format msgid "could not render texture: %s" msgstr "Affichage de la texture %s impossible" -#: ../src/framewin.c:505 ../src/framewin.c:520 ../src/framewin.c:531 -#: ../src/framewin.c:538 ../src/framewin.c:545 ../src/icon.c:350 -#: ../src/menu.c:490 +#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699 +#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724 +#: ../src/icon.c:350 ../src/menu.c:487 #, c-format msgid "error rendering image:%s" msgstr "Erreur lors de l'affichage de l'image «%s»." -#: ../src/framewin.c:588 +#: ../src/framewin.c:777 #, c-format msgid "error rendering image: %s" msgstr "Erreur lors de l'affichage de l'image «%s»." -#: ../src/icon.c:229 ../src/wdefaults.c:416 +#: ../src/icon.c:229 ../src/wdefaults.c:430 #, c-format msgid "error loading image file \"%s\"" msgstr "Erreur dans le chargement de l'image «%s»." -#: ../src/icon.c:477 ../src/icon.c:486 +#: ../src/icon.c:487 ../src/icon.c:496 #, c-format msgid "could not create directory %s" msgstr "Création du répertoire %s impossible." -#: ../src/icon.c:753 +#: ../src/icon.c:763 #, c-format msgid "could not find default icon \"%s\"" msgstr "Icone par défaut «%s» introuvable." -#: ../src/icon.c:759 +#: ../src/icon.c:769 #, c-format msgid "could not load default icon \"%s\":%s" msgstr "Chargement de l'icone par défaut «%s» impossible:%s" -#: ../src/main.c:198 +#: ../src/main.c:199 msgid "failed to restart Window Maker." msgstr "Redémarrage de Window Maker raté." -#: ../src/main.c:201 +#: ../src/main.c:202 #, c-format msgid "could not exec %s" msgstr "Exécution de %s impossible." -#: ../src/main.c:250 +#: ../src/main.c:247 +#, fuzzy +msgid "Could not execute command: " +msgstr "Exécution de la commande «%s» impossible." + +#: ../src/main.c:404 #, c-format msgid "%s aborted.\n" msgstr "%s abandonné.\n" -#: ../src/main.c:261 +#: ../src/main.c:415 #, c-format msgid "Usage: %s [options]\n" msgstr "Usage: %s [-options]\n" -#: ../src/main.c:262 +#: ../src/main.c:416 msgid "The Window Maker window manager for the X window system" msgstr "Le gestionnaire de fenêtres Window Maker pour X" -#: ../src/main.c:264 +#: ../src/main.c:418 msgid " -display host:dpy\tdisplay to use" msgstr " -display host:dpy\tdisplay à utiliser" -#: ../src/main.c:266 +#: ../src/main.c:420 msgid " --no-cpp \t\tdisable preprocessing of configuration files" msgstr " --no-cpp \t\tannule le pré-traitement des fichiers de configuration" -#: ../src/main.c:268 +#: ../src/main.c:422 msgid " --no-dock\t\tdo not open the application Dock" msgstr " --no-dock\t\tne lance pas le Dock" -#: ../src/main.c:269 +#: ../src/main.c:423 msgid " --no-clip\t\tdo not open the workspace Clip" msgstr " --no-clip\t\tne lance pas le Clip" -#. -#. puts(_(" --locale locale locale to use")); -#. -#: ../src/main.c:273 +#: ../src/main.c:425 +msgid " --locale locale\t\tlocale to use" +msgstr " --locale locale\t\tlangue à utiliser" + +#: ../src/main.c:427 msgid " --visual-id visualid\tvisual id of visual to use" msgstr " --visual-id visualid\tvisual id du visuel à utiliser" -#: ../src/main.c:274 +#: ../src/main.c:428 msgid " --static\t\tdo not update or save configurations" msgstr " --static\t\tne pas mettre-à-jour ni sauver la configuration" -#: ../src/main.c:276 +#: ../src/main.c:430 msgid " --synchronous\t\tturn on synchronous display mode" msgstr " --synchronous\t\tutilise un affichage synchrone" -#: ../src/main.c:278 +#: ../src/main.c:432 msgid " --version\t\tprint version and exit" msgstr " --version\t\taffiche le numéro de version et quitte" -#: ../src/main.c:279 +#: ../src/main.c:433 msgid " --help\t\t\tshow this message" msgstr " --help\t\taffiche ce message" -#: ../src/main.c:291 +#: ../src/main.c:445 #, c-format msgid "" "could not find user GNUstep directory (%s).\n" "Make sure you have installed Window Maker correctly and run wmaker.inst" msgstr "" "Répertoire GNUstep de l'utilisateur introuvable.\n" -"Assurez-vous d'avoir installer WindowMaker correctement et d'avoir lancer wmaker.inst" +"Assurez-vous d'avoir installer WindowMaker correctement et d'avoir lancer " +"wmaker.inst" -#: ../src/main.c:309 ../src/main.c:314 +#: ../src/main.c:466 ../src/main.c:471 #, c-format msgid "%s:could not execute initialization script" msgstr "%s:exécution ratée du script d'initialisation." -#: ../src/main.c:331 ../src/main.c:336 +#: ../src/main.c:491 ../src/main.c:496 #, c-format msgid "%s:could not execute exit script" msgstr "%s:exécution ratée du script de sortie." -#: ../src/main.c:405 ../src/main.c:412 ../src/main.c:420 ../src/main.c:436 +#: ../src/main.c:610 ../src/main.c:617 ../src/main.c:625 ../src/main.c:641 #, c-format msgid "too few arguments for %s" msgstr "Trop peu d'arguments pour %s." -#: ../src/main.c:424 +#: ../src/main.c:629 #, c-format msgid "bad value for visualid: \"%s\"" msgstr "Mauvaise valeur de visualid: «%s»" -#: ../src/main.c:444 +#: ../src/main.c:649 #, c-format msgid "%s: invalid argument '%s'\n" msgstr "%s: argument «%s» invalide\n" -#: ../src/main.c:445 +#: ../src/main.c:650 #, c-format msgid "Try '%s --help' for more information\n" msgstr "Essayez '%s --help' pour plus d'informations\n" -#: ../src/main.c:488 +#: ../src/main.c:693 msgid "X server does not support locale" msgstr "le Serveur X ne supporte pas les locale" -#: ../src/main.c:491 +#: ../src/main.c:696 msgid "cannot set locale modifiers" msgstr "Modificateurs de locale inappliquables." -#: ../src/main.c:508 +#: ../src/main.c:713 #, c-format msgid "could not open display \"%s\"" msgstr "Ouverture du display «%s» impossible." -#: ../src/menu.c:297 -msgid "wrealloc() failed while trying to add menu item" -msgstr "Echec de wrealloc() pendant l'ajout d'un élément de menu." - #: ../src/misc.c:71 #, c-format msgid "could not define value for %s for cpp" @@ -663,80 +736,81 @@ msgstr "D msgid "could not get password entry for UID %i" msgstr "Mot de passe de l'UID %i introuvable." -#: ../src/misc.c:125 +#: ../src/misc.c:126 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "Votre machine est mal configurée. HOSTNAME a pour valeur %s." -#: ../src/misc.c:131 +#: ../src/misc.c:132 #, c-format msgid "your machine is misconfigured. HOST is set to %s" msgstr "Votre machine est mal configurée. HOST a pour valeur %s." -#: ../src/misc.c:772 +#: ../src/misc.c:758 msgid "selection timed-out" msgstr "La sélection n'est plus valable." -#: ../src/misc.c:788 +#: ../src/misc.c:774 msgid "Program Arguments" msgstr "Arguments du programme" -#: ../src/misc.c:789 +#: ../src/misc.c:775 msgid "Enter command arguments:" msgstr "Entrez les arguments de la commande:" -#: ../src/misc.c:887 +#: ../src/misc.c:868 msgid "unable to get dropped data from DND drop" msgstr "Obtention des données du DND impossible." -#: ../src/misc.c:895 +#: ../src/misc.c:876 msgid "error getting dropped data from DND drop" msgstr "Erreur pendant l'acquisition des données du DND." -#: ../src/misc.c:901 +#: ../src/misc.c:882 msgid "out of memory while getting data from DND drop" msgstr "Plus de mémoire pendant l'acquisition des données du DND." -#: ../src/misc.c:946 ../src/misc.c:1081 +#: ../src/misc.c:927 ../src/misc.c:1067 #, c-format msgid "out of memory during expansion of \"%s\"" msgstr "Plus de mémoire pendant l'expansion de «%s»." -#: ../src/misc.c:1000 +#: ../src/misc.c:981 msgid "out of memory during expansion of \"%w\"" msgstr "Plus de mémoire pendant l'expansion de «%w»." -#: ../src/misc.c:1018 +#: ../src/misc.c:999 msgid "out of memory during expansion of \"%W\"" msgstr "Plus de mémoire pendant l'expansion de «%W»." - -#: ../src/misc.c:1034 +#: ../src/misc.c:1015 msgid "out of memory during expansion of \"%a\"" msgstr "Plus de mémoire pendant l'expansion de «%a»." -#: ../src/misc.c:1060 +#: ../src/misc.c:1046 #, c-format msgid "out of memory during expansion of \"%d\"" msgstr "Plus de mémoire pendant l'expansion de «%d»." -#: ../src/misc.c:1074 +#: ../src/misc.c:1060 msgid "selection not available" msgstr "Sélection indisponible." -#: ../src/misc.c:1146 ../src/misc.c:1152 +#: ../src/misc.c:1132 ../src/misc.c:1138 #, c-format msgid "bad window name value in %s state info" msgstr "Nom de fenêtre incorrecte dans les informations sur %s." -#: ../src/misc.c:1407 +#: ../src/misc.c:1393 msgid "could not send message to background image helper" msgstr "Envoi de messages vers le gestionnaire de fond d'écran impossible." #: ../src/pixmap.c:235 #, c-format msgid "could not load mask bitmap file \"%s\". Won't use mask" -msgstr "Chargement du fichier de masque «%s» impossible. Aucun masque ne sera utilisé." +msgstr "" +"Chargement du fichier de masque «%s» impossible. Aucun masque ne sera " +"utilisé." #: ../src/proplist.c:180 msgid "unterminated string" @@ -788,7 +862,9 @@ msgstr "" #: ../src/proplist.c:434 msgid "Comments are not allowed inside WindowMaker owned domain files." -msgstr "Les commentaires ne sont pas autorisés dans les fichiers de domaine appartenant à WindowMaker." +msgstr "" +"Les commentaires ne sont pas autorisés dans les fichiers de domaine " +"appartenant à WindowMaker." #: ../src/proplist.c:453 #, c-format @@ -799,53 +875,29 @@ msgstr "Ouverture du fichier de domaine %s impossible." msgid "extra data after end of file" msgstr "Surplus de donnée à la fin du fichier." -#: ../src/resources.c:71 -#, c-format -msgid "The following character sets are missing in %s:" -msgstr "Les jeux de caractères suivants manquent dans %s:" - -#: ../src/resources.c:76 -#, c-format -msgid "The string \"%s\" will be used in place" -msgstr "La chaîne \"%s\" sera utilisée à la place" - -#: ../src/resources.c:78 -msgid "of any characters from those sets." -msgstr "de tous les caractères de ces jeux." - -#: ../src/resources.c:81 -#, c-format -msgid "could not create font set %s. Trying fixed" -msgstr "Création du jeu de caractères %s impossible. Essaye fixed." - -#: ../src/resources.c:98 -#, c-format -msgid "could not load font %s. Trying fixed" -msgstr "Chargement de la police %s impossible. Essaye fixed." - -#: ../src/resources.c:136 +#: ../src/resources.c:44 #, c-format msgid "could not parse color \"%s\"" msgstr "Analyse de la couleur «%s» impossible." -#: ../src/resources.c:140 +#: ../src/resources.c:48 #, c-format msgid "could not allocate color \"%s\"" msgstr "Allocation de la couleur «%s» impossible." -#: ../src/rootmenu.c:187 ../src/rootmenu.c:189 +#: ../src/rootmenu.c:186 ../src/rootmenu.c:188 msgid "Exit" msgstr "Quitter" -#: ../src/rootmenu.c:188 +#: ../src/rootmenu.c:187 msgid "Exit window manager?" msgstr "Sortir de WindowMaker?" -#: ../src/rootmenu.c:224 +#: ../src/rootmenu.c:223 msgid "Close X session" msgstr "Fermer la session X" -#: ../src/rootmenu.c:225 +#: ../src/rootmenu.c:224 msgid "" "Close Window System session?\n" "Kill might close applications with unsaved data." @@ -857,15 +909,15 @@ msgstr "" #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); #. -#: ../src/rootmenu.c:227 ../src/winmenu.c:486 +#: ../src/rootmenu.c:226 ../src/winmenu.c:509 msgid "Close" msgstr "Fermer" -#: ../src/rootmenu.c:238 +#: ../src/rootmenu.c:237 msgid "Kill X session" msgstr "Tuer la session X" -#: ../src/rootmenu.c:239 +#: ../src/rootmenu.c:238 msgid "" "Kill Window System session?\n" "(all applications will be closed)" @@ -873,145 +925,146 @@ msgstr "" "Tuer la session X?\n" "(toutes les applications seront fermées)" -#: ../src/rootmenu.c:506 +#: ../src/rootmenu.c:505 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s: spécification de raccourci-clavier «%s» invalide pour l'entrée %s." -#: ../src/rootmenu.c:514 +#: ../src/rootmenu.c:513 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s: touche invalide dans le raccourci «%s» pour l'entrée %s." -#: ../src/rootmenu.c:567 +#: ../src/rootmenu.c:566 #, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: problème de '\"' dans le fichier de menu." -#: ../src/rootmenu.c:617 +#: ../src/rootmenu.c:616 #, c-format msgid "%s: missing command" msgstr "%s: commande manquante." -#: ../src/rootmenu.c:650 +#: ../src/rootmenu.c:648 #, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "spécification de OPEN_MENU invalide: %s" -#: ../src/rootmenu.c:698 +#: ../src/rootmenu.c:696 #, c-format msgid "%s:could not stat menu" msgstr "%s:échec de stat() pour le menu." -#: ../src/rootmenu.c:706 +#: ../src/rootmenu.c:704 #, c-format msgid "%s:could not stat menu:%s" msgstr "%s: échec de stat() pour le menu: %s" -#: ../src/rootmenu.c:724 +#: ../src/rootmenu.c:722 #, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "trop de paramétres pour OPEN_MENU: %s" -#: ../src/rootmenu.c:760 +#: ../src/rootmenu.c:758 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." msgstr "" -"Il y a plus d'une déclaration WORKSPACE_MENU dans le menu. Une seule " -"est autorisée." +"Il y a plus d'une déclaration WORKSPACE_MENU dans le menu. Une seule est " +"autorisée." -#: ../src/rootmenu.c:789 ../src/rootmenu.c:807 +#: ../src/rootmenu.c:787 ../src/rootmenu.c:805 ../src/rootmenu.c:815 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s:paramètre manquant pour la commande de menu «%s»." -#: ../src/rootmenu.c:870 +#: ../src/rootmenu.c:879 #, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s:commande «%s» inconnue dans le fichier du menu." -#: ../src/rootmenu.c:878 +#: ../src/rootmenu.c:887 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s:ne peut pas ajouter le raccourci pour l'entrée «%s»." -#: ../src/rootmenu.c:1015 +#: ../src/rootmenu.c:1024 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s:ligne trop longue lors de la configuration du menu: %s" -#: ../src/rootmenu.c:1037 ../src/rootmenu.c:1129 ../src/rootmenu.c:1230 +#: ../src/rootmenu.c:1046 ../src/rootmenu.c:1138 ../src/rootmenu.c:1239 #, c-format msgid "%s:missing command in menu config: %s" msgstr "%s:commande manquante lors de la configuration du menu: %s" -#: ../src/rootmenu.c:1067 +#: ../src/rootmenu.c:1076 #, c-format msgid "%s:syntax error in menu file:END declaration missing" -msgstr "%s:erreur de syntaxe dans le fichier de menu: déclaration END manquante." +msgstr "" +"%s:erreur de syntaxe dans le fichier de menu: déclaration END manquante." -#: ../src/rootmenu.c:1096 ../src/rootmenu.c:1195 +#: ../src/rootmenu.c:1105 ../src/rootmenu.c:1204 msgid "could not make arguments for menu file preprocessor" msgstr "Création des arguments pour le pré-processeur impossible." -#: ../src/rootmenu.c:1102 ../src/rootmenu.c:1202 +#: ../src/rootmenu.c:1111 ../src/rootmenu.c:1211 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s:Ouverture/Traitement du fichier de menu impossible." -#: ../src/rootmenu.c:1114 ../src/rootmenu.c:1215 +#: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224 #, c-format msgid "%s:could not open menu file" msgstr "%s:Ouverture du fichier de menu impossible." -#: ../src/rootmenu.c:1141 +#: ../src/rootmenu.c:1150 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s:fichier de menu invalide. Déclaration MENU manquante." -#: ../src/rootmenu.c:1150 +#: ../src/rootmenu.c:1159 msgid "error reading preprocessed menu data" msgstr "Erreur lors de la lecture du menu pré-traité." -#: ../src/rootmenu.c:1242 +#: ../src/rootmenu.c:1251 #, c-format msgid "%s:no title given for the root menu" msgstr "%s:aucun titre donné pour le menu principal." -#: ../src/rootmenu.c:1325 ../src/rootmenu.c:1392 ../src/rootmenu.c:1436 +#: ../src/rootmenu.c:1341 ../src/rootmenu.c:1416 ../src/rootmenu.c:1459 #, c-format msgid "out of memory while constructing directory menu %s" msgstr "Plus de mémoire pendant de la création du sous-menu %s." -#: ../src/rootmenu.c:1335 +#: ../src/rootmenu.c:1351 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s:échec de stat() sur le fichier «%s» dans le répertoire du menu." -#: ../src/rootmenu.c:1490 +#: ../src/rootmenu.c:1513 msgid "Commands" msgstr "Commandes" -#: ../src/rootmenu.c:1493 +#: ../src/rootmenu.c:1516 msgid "Restart" msgstr "Redémarrer" -#: ../src/rootmenu.c:1494 +#: ../src/rootmenu.c:1517 msgid "Exit..." msgstr "Sortir..." -#: ../src/rootmenu.c:1539 +#: ../src/rootmenu.c:1562 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" msgstr "Fichier de menu «%s» référencé dans WMRootMenu introuvable." -#: ../src/rootmenu.c:1546 +#: ../src/rootmenu.c:1569 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" msgstr "Fichier de menu «%s» référencé dans WMRootMenu inaccessible." -#: ../src/rootmenu.c:1557 +#: ../src/rootmenu.c:1580 #, c-format msgid "" "using default menu file \"%s\" as the menu referenced in WMRootMenu could " @@ -1020,53 +1073,54 @@ msgstr "" "Utilise le menu par défaut «%s» étant donné que le menu référencé dans " "WMRootMenu n'a pas pû être trouvé." -#: ../src/rootmenu.c:1580 ../src/rootmenu.c:1656 +#: ../src/rootmenu.c:1603 ../src/rootmenu.c:1679 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s:erreur de formatage lors de la configuration du menu «%s»." -#: ../src/rootmenu.c:1744 +#: ../src/rootmenu.c:1766 +#, fuzzy msgid "" -"The applications menu could not be loaded.Look at the console output for a " -"detaileddescription of the errors" +"The applications menu could not be loaded. Look at the console output for a " +"detailed description of the errors." msgstr "" "Le menu n'a pas pû être chargé. Regardez la sortie de la console pour une " "description détaillée des erreurs" -#: ../src/screen.c:436 +#: ../src/screen.c:459 #, c-format msgid "could not load logo image for panels: %s" msgstr "Chargement des logos pour les fenêtres de messages impossible: %s" -#: ../src/screen.c:440 +#: ../src/screen.c:463 #, c-format msgid "error making logo image for panel:%s" msgstr "Erreur lors de la création de logo pour la fenêtre de message:%s" -#: ../src/screen.c:726 +#: ../src/screen.c:769 #, c-format msgid "could not initialize graphics library context: %s" msgstr "Initialisation de la librairie graphique impossible: %s" -#: ../src/screen.c:757 +#: ../src/screen.c:800 msgid "could not do initialization of WINGs widget set" msgstr "Initialisation de la librairie WINGs impossible." -#: ../src/screen.c:1091 +#: ../src/screen.c:1133 #, c-format msgid "could not save session state in %s" msgstr "Sauvegarde de la session dans %s impossible." -#: ../src/session.c:182 ../src/wdefaults.c:564 ../src/winspector.c:348 +#: ../src/session.c:181 ../src/wdefaults.c:578 ../src/winspector.c:445 #, c-format msgid "can't convert \"%s\" to boolean" msgstr "Conversion de «%s» en booléen impossible." -#: ../src/session.c:981 +#: ../src/session.c:983 msgid "out of memory while saving session state" msgstr "Plus de mémoire pendant le sauvegarde de session." -#: ../src/session.c:1072 +#: ../src/session.c:1074 msgid "end of memory while saving session state" msgstr "Plus de mémoire pendant le sauvegarde de session." @@ -1076,7 +1130,7 @@ msgstr "Plus de m #. * If the sm was the last client of session, then we'll die #. * anyway, otherwise we can continue doing our stuff. #. -#: ../src/session.c:1206 +#: ../src/session.c:1208 msgid "connection to the session manager was lost" msgstr "La connexion vers le gestionnaire de session a été perdue." @@ -1122,8 +1176,7 @@ msgstr "Signal %i re #: ../src/startup.c:303 msgid "" "crashed while trying to do some post-crash cleanup. Aborting immediatelly." -msgstr "" -"Crashé pendant un nettoyage post-crash. Suspension immédiate." +msgstr "Crashé pendant un nettoyage post-crash. Suspension immédiate." #. we try to restart Window Maker #: ../src/startup.c:337 @@ -1146,21 +1199,27 @@ msgstr "" " Cette erreur est probablement apparue suite à un bug. Remplissez le " "formulaire BUGFORM et envoyez-le à bugs@windowmaker.org." -#: ../src/startup.c:782 +#: ../src/startup.c:778 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" -msgstr "La taille des icones est configurée à %i, mais c'est trop petit. Utilise 16, à la place.\n" +msgstr "" +"La taille des icones est configurée à %i, mais c'est trop petit. Utilise 16, " +"à la place.\n" -#: ../src/startup.c:821 +#: ../src/startup.c:806 +msgid "XKB is not supported. KbdModeLock is automatically disabled." +msgstr "XKB n'est pas supporté. KbdModeLock est désactivé." + +#: ../src/startup.c:825 msgid "it seems that there is already a window manager running" msgstr "Il semblerait qu'un gestionnaire de fenêtres soit déjà actif." -#: ../src/startup.c:827 +#: ../src/startup.c:831 #, c-format msgid "could not manage screen %i" msgstr "Gestion de l'écran %i impossible." -#: ../src/startup.c:887 +#: ../src/startup.c:891 msgid "could not manage any screen" msgstr "Aucun écran ne peut être géré." @@ -1192,20 +1251,21 @@ msgstr "Fonction msgid "function textures not supported on this system, sorry." msgstr "Les plug-ins de textures ne sont pas supportés par ce système, désolé." -#: ../src/wdefaults.c:410 +#: ../src/wdefaults.c:424 #, c-format msgid "could not find icon file \"%s\"" msgstr "Icone «%s» introuvable." -#: ../src/window.c:2539 ../src/window.c:2673 +#: ../src/window.c:2638 ../src/window.c:2772 msgid "" "the NumLock, ScrollLock or similar key seems to be turned on.\n" "Turn it off or some mouse actions and keyboard shortcuts will not work." msgstr "" "NumLock, ScrollLock ou une touche similaire semble activée.\n" -"Désactivez-la ou certaines actions du clavier et de la souris ne fonctionneront pas." +"Désactivez-la ou certaines actions du clavier et de la souris ne " +"fonctionneront pas." -#: ../src/winmenu.c:125 +#: ../src/winmenu.c:126 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" @@ -1215,268 +1275,461 @@ msgstr "" "Les changements non sauvegardés seront perdus.\n" "Confirmez l'action." -#: ../src/winmenu.c:252 ../src/winmenu.c:260 +#: ../src/winmenu.c:275 ../src/winmenu.c:283 msgid "Set Shortcut" msgstr "Attribuer un Raccourci" -#: ../src/winmenu.c:338 ../src/winmenu.c:384 +#: ../src/winmenu.c:361 ../src/winmenu.c:407 msgid "could not create submenu for window menu" msgstr "Création du sous-menu pour le menu de fenêtres impossible." -#: ../src/winmenu.c:393 +#: ../src/winmenu.c:416 msgid "Keep at bottom" msgstr "Garder en-dessous" -#: ../src/winmenu.c:398 ../src/winspector.c:1147 -msgid "Omnipresent" -msgstr "Omniprésente" - #. #. * Warning: If you make some change that affects the order of the #. * entries, you must update the command #defines in the top of #. * this file. #. -#: ../src/winmenu.c:421 ../src/winmenu.c:556 +#: ../src/winmenu.c:444 ../src/winmenu.c:579 msgid "Maximize" msgstr "Maximiser" -#: ../src/winmenu.c:429 ../src/winmenu.c:542 +#: ../src/winmenu.c:452 ../src/winmenu.c:565 msgid "Miniaturize" msgstr "Miniaturiser" -#: ../src/winmenu.c:438 ../src/winmenu.c:573 +#: ../src/winmenu.c:461 ../src/winmenu.c:596 msgid "Shade" msgstr "Plier" -#: ../src/winmenu.c:454 +#: ../src/winmenu.c:477 msgid "Resize/Move" msgstr "Déplacer/Dimensionner" -#: ../src/winmenu.c:462 +#: ../src/winmenu.c:485 msgid "Select" msgstr "Séléctionner" -#: ../src/winmenu.c:470 +#: ../src/winmenu.c:493 msgid "Move To" msgstr "Déplacer vers" -#: ../src/winmenu.c:475 +#: ../src/winmenu.c:498 msgid "Attributes..." msgstr "Attributs..." -#: ../src/winmenu.c:477 +#: ../src/winmenu.c:500 msgid "Options" msgstr "Options" -#: ../src/winmenu.c:537 +#: ../src/winmenu.c:560 msgid "Deminiaturize" msgstr "Déminiaturiser" -#: ../src/winmenu.c:551 +#: ../src/winmenu.c:574 msgid "Unmaximize" msgstr "Démaximiser" -#: ../src/winmenu.c:568 +#: ../src/winmenu.c:591 msgid "Unshade" msgstr "Déplier" -#: ../src/winspector.c:282 +#: ../src/winspector.c:379 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "Icone «%s» introuvable pour cette fenêtre." -#: ../src/winspector.c:298 +#: ../src/winspector.c:395 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "Icone spécifié «%s» introuvable:%s" -#: ../src/winspector.c:1022 +#: ../src/winspector.c:1206 msgid "Save" msgstr "Sauver" -#: ../src/winspector.c:1030 +#: ../src/winspector.c:1214 msgid "Apply" msgstr "Appliquer" -#: ../src/winspector.c:1036 +#: ../src/winspector.c:1220 msgid "Reload" msgstr "Recharger" -#: ../src/winspector.c:1045 ../src/winspector.c:1055 +#: ../src/winspector.c:1229 ../src/winspector.c:1239 msgid "Window Specification" msgstr "Spécification de la fenêtre" -#: ../src/winspector.c:1046 +#: ../src/winspector.c:1230 msgid "Window Attributes" msgstr "Attributs de la fenêtre" -#: ../src/winspector.c:1047 +#: ../src/winspector.c:1231 msgid "Advanced Options" msgstr "Options Avancées" -#: ../src/winspector.c:1048 +#: ../src/winspector.c:1232 msgid "Icon and Initial Workspace" msgstr "Icone et Bureau Initial" -#: ../src/winspector.c:1049 +#: ../src/winspector.c:1233 msgid "Application Specific" msgstr "Spécifique à l'application" -#: ../src/winspector.c:1063 +#: ../src/winspector.c:1247 msgid "Defaults for all windows" msgstr "Défauts pour toutes les fenêtres" -#: ../src/winspector.c:1106 -msgid "" -"The configuration will apply to all\n" -"windows that have their WM_CLASS property set to the above selected\n" -"name, when saved." -msgstr "" -"La configuration s'appliquera à toutes\n" -"les fenêtres dont la propriété WM_CLASS coïncide avec le nom séléctionné\n" -"ci-dessus, lors de la sauvegarde." +#: ../src/winspector.c:1304 +#, fuzzy +msgid "Select Window" +msgstr "Choisissez une action" -#: ../src/winspector.c:1113 +#: ../src/winspector.c:1317 msgid "Attributes" msgstr "Attributs" -#: ../src/winspector.c:1123 +#: ../src/winspector.c:1328 msgid "Disable Titlebar" msgstr "Pas de barre de titre" -#: ../src/winspector.c:1127 -msgid "Disable Resizebar" -msgstr "Pas de barre de redimensionnement" +#: ../src/winspector.c:1330 +msgid "" +"Remove the titlebar of this window.\n" +"To access the window commands menu of a window\n" +"without it's titlebar, press Control+Esc (or the\n" +"equivalent shortcut, if you changed the default\n" +"settings)." +msgstr "" +"Enlève la barre de titre de cette fenêtre.\n" +"Pour accéder au menu des commandes pour une\n" +"fenêtre sans barre de titre, appuyez sur Ctrl+Esc\n" +"(ou le raccourci équivalent, si vous avez changé\n" +"les paramètres par défaut)." -#: ../src/winspector.c:1131 +#: ../src/winspector.c:1337 +msgid "Disable Resizebar" +msgstr "Pas de barre de redimension" + +#: ../src/winspector.c:1339 +msgid "Remove the resizebar of this window." +msgstr "Enlève la barre de redimensionnement à cette fenêtre." + +#: ../src/winspector.c:1342 msgid "Disable Close Button" msgstr "Pas de bouton de fermeture" -#: ../src/winspector.c:1135 -msgid "Disable Miniaturize Button" -msgstr "Pas bouton de miniaturisation" +#: ../src/winspector.c:1344 +msgid "Remove the `close window' button of this window." +msgstr "Enlève le bouton de fermeture de cette fenêtre." -#: ../src/winspector.c:1139 +#: ../src/winspector.c:1347 +msgid "Disable Miniaturize Button" +msgstr "Pas de bouton de miniaturisation" + +#: ../src/winspector.c:1349 +msgid "Remove the `miniaturize window' button of the window." +msgstr "Enlève le bouton de miniaturisation de cette fenêtre." + +#: ../src/winspector.c:1352 msgid "Keep on Top / Floating" msgstr "Garder au-dessus / Flottante" -#: ../src/winspector.c:1143 +#: ../src/winspector.c:1354 +msgid "" +"Keep the window over other windows, not allowing\n" +"them to covert it." +msgstr "" +"Garde la fenêtre au-dessus des autres, leur interdisant\n" +"de la recouvrir." + +#: ../src/winspector.c:1358 msgid "Keep at Bottom / Sunken" msgstr "Garder en-dessous / Coulée" -#: ../src/winspector.c:1151 +#: ../src/winspector.c:1360 +msgid "Keep the window under all other windows." +msgstr "Garde la fenêtre en-dessous de toutes les autres." + +#: ../src/winspector.c:1365 +msgid "Make window occupy all workspaces." +msgstr "Fait que cette fenêtre occupe tous les bureaux." + +#: ../src/winspector.c:1368 msgid "Start Miniaturized" msgstr "Lancer Miniaturisée" -#: ../src/winspector.c:1155 +#: ../src/winspector.c:1370 +msgid "" +"Make the window be automatically miniaturized when it's\n" +"first shown." +msgstr "" +"Fait que cette fenêtre est automatiquement miniaturisée\n" +"quand elle apparaît pour la première fois." + +#: ../src/winspector.c:1374 msgid "Start Maximized" msgstr "Lancer Maximisée" -#: ../src/winspector.c:1159 +#: ../src/winspector.c:1376 +msgid "" +"Make the window be automatically maximized when it's\n" +"first shown." +msgstr "" +"Fait que cette fenêtre est automatiquement maximisée\n" +"quand elle apparaît pour la première fois." + +#: ../src/winspector.c:1380 msgid "Skip Window List" msgstr "Passe la liste des fenêtres" -#: ../src/winspector.c:1173 +#: ../src/winspector.c:1382 +msgid "Do not list the window in the window list menu." +msgstr "Ne pas lister la fenêtre dans le menu des fenêtres." + +#: ../src/winspector.c:1397 msgid "Advanced" msgstr "Avancés" -#: ../src/winspector.c:1183 +#: ../src/winspector.c:1414 msgid "Ignore HideOthers" msgstr "Ignore «Cacher les Autres»" -#: ../src/winspector.c:1187 +#: ../src/winspector.c:1416 +msgid "" +"Do not hide the window when issuing the\n" +"`HideOthers' command." +msgstr "" +"Ne pas cacher la fenêtre lorsque la commande\n" +"«Cacher les Autres» est activée." + +#: ../src/winspector.c:1420 msgid "Don't Bind Keyboard Shortcuts" msgstr "Utiliser le clavier" -#: ../src/winspector.c:1191 +#: ../src/winspector.c:1422 +msgid "" +"Do not bind keyboard shortcuts from Window Maker\n" +"when this window is focused. This will allow the\n" +"window to receive all key combinations regardless\n" +"of your shortcut configuration." +msgstr "" +"Ne pas associer de raccourcis clavier à Window\n" +"Maker quand cette fenêtre a le focus. Cela autorise\n" +"la fenêtre à recevoir toutes les combinaisons de \n" +"touches quelle que soit votre configuration de raccourcis." + +#: ../src/winspector.c:1428 msgid "Don't Bind Mouse Clicks" msgstr "Utiliser la souris" -#: ../src/winspector.c:1195 +#: ../src/winspector.c:1430 +msgid "" +"Do not bind mouse actions, such as `Alt'+drag\n" +"in the window (when alt is the modifier you haveconfigured)." +msgstr "" +"Ne pas associer d'actions à la souris, telle que \n" +"`Alt'+mouvement dans la fenêtre (si `Alt' est le \n" +"modificateur configuré)." + +#: ../src/winspector.c:1435 msgid "Keep Inside Screen" msgstr "Garder dans l'écran" -#: ../src/winspector.c:1199 +#: ../src/winspector.c:1437 +msgid "" +"Do not allow the window to move itself completely\n" +"outside the screen. For bug compatibility.\n" +msgstr "" +"Ne pas autoriser la fenêtre à sortir complètement de l'écran.\n" +"Pour compatibilité avec certaines applications.\n" + +#: ../src/winspector.c:1441 msgid "Don't Let It Take Focus" msgstr "Ne prend pas le focus" -#: ../src/winspector.c:1203 +#: ../src/winspector.c:1443 +msgid "" +"Do not let the window take keyboard focus when you\n" +"click on it." +msgstr "" +"Faire que la fenêtre ne prenne pas le focus du clavier\n" +"quand vous cliquez dessus." + +#: ../src/winspector.c:1447 msgid "Don't Save Session" msgstr "Pas de Sauvegarde de Session" -#: ../src/winspector.c:1207 +#: ../src/winspector.c:1449 +msgid "" +"Do not save the associated application in the\n" +"session's state, so that it won't be restarted\n" +"together with other applications when Window Maker\n" +"starts." +msgstr "" +"Ne pas sauver l'application associée dans la session,\n" +"de telle sorte qu'elle ne soit pas redémarrée avec \n" +"les autres applications quand Window Maker démarrera." + +#: ../src/winspector.c:1455 msgid "Emulate Application Icon" msgstr "Emuler le AppIcon" -#: ../src/winspector.c:1211 +#: ../src/winspector.c:1457 +msgid "" +"Make this window act as an application that provides\n" +"enough information to Window Maker for a dockable\n" +"application icon to be created." +msgstr "" +"Faire que cette fenêtre réagisse comme une application\n" +"qui donne suffisament d'information à Window Maker pour\n" +"la création d'un AppIcon." + +#: ../src/winspector.c:1462 msgid "Full Screen Maximization" msgstr "Maximisation Plein Ecran" -#: ../src/winspector.c:1226 +#: ../src/winspector.c:1464 msgid "" -"Enable the \"Don't bind...\" options to allow the application to receive all " -"mouse or keyboard events." +"Make the window use the whole screen space when it's\n" +"maximized. The titlebar and resizebar will be moved\n" +"to outside the screen." msgstr "" -"Activer les options \"Utiliser...\" pour que l'application reçoive " -"tous les évenements clavier ou souris." +"Faire que cette fenêtre utilise l'écran en entier quand elle\n" +"est maximisée. Les barres de titre et de redimensionnement\n" +"seront déplacées en dehors de l'écran." -#: ../src/winspector.c:1233 +#: ../src/winspector.c:1470 +#, fuzzy +msgid "Disable Language Button" +msgstr "Pas de bouton de fermeture" + +#: ../src/winspector.c:1472 +msgid "Remove the `toggle language' button of the window." +msgstr "Enlever le bouton de changement de langue de la fenêtre." + +#: ../src/winspector.c:1489 msgid "Miniwindow Image" msgstr "Image de la Mini-Fenêtre" -#: ../src/winspector.c:1252 +#: ../src/winspector.c:1508 msgid "Update" msgstr "Mettre à jour" -#: ../src/winspector.c:1267 +#: ../src/winspector.c:1523 msgid "Icon File Name:" msgstr "Nom de l'icone:" -#: ../src/winspector.c:1279 +#: ../src/winspector.c:1535 msgid "Ignore client supplied icon" msgstr "Ignorer l'icone fourni" -#: ../src/winspector.c:1286 +#: ../src/winspector.c:1542 msgid "Initial Workspace" msgstr "Bureau initial" -#: ../src/winspector.c:1291 +#: ../src/winspector.c:1544 +msgid "The workspace to place the window when it'sfirst shown." +msgstr "Le bureau où placer la fenêtre quand elle apparaît." + +#: ../src/winspector.c:1550 msgid "Nowhere in particular" msgstr "Nulle part en particulier" -#: ../src/winspector.c:1309 +#: ../src/winspector.c:1568 msgid "Application Wide" msgstr "Pour toute l'Application" -#: ../src/winspector.c:1319 +#: ../src/winspector.c:1579 msgid "Start Hidden" msgstr "Démarrer Cachée" -#: ../src/winspector.c:1323 +#: ../src/winspector.c:1581 +msgid "Automatically hide application when it's started." +msgstr "Cacher l'application dés qu'elle est lancée." + +#: ../src/winspector.c:1584 msgid "No Application Icon" msgstr "Pas de AppIcon" -#: ../src/workspace.c:106 ../src/workspace.c:107 ../src/workspace.c:655 +#: ../src/winspector.c:1586 +msgid "" +"Disable the application icon for the application.\n" +"Note that you won't be able to dock it anymore,\n" +"and any icons that are already docked will stop\n" +"working correctly." +msgstr "" +"Désactiver le AppIcon de l'application.\n" +"Notez que vous ne pourrez plus la mettre dans le\n" +"Dock et que les icones déjà dans le Dock ne \n" +"fonctionneront plus correctement." + +#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:707 #, c-format msgid "Workspace %i" msgstr "Bureau %i" -#: ../src/workspace.c:712 +#: ../src/workspace.c:764 msgid "Workspaces" msgstr "Bureaux" -#: ../src/workspace.c:714 +#: ../src/workspace.c:766 msgid "could not create Workspace menu" msgstr "Création du menu de Bureau impossible." -#: ../src/workspace.c:721 +#: ../src/workspace.c:773 msgid "New" msgstr "Nouveau" -#: ../src/workspace.c:722 +#: ../src/workspace.c:774 msgid "Destroy Last" msgstr "Détruire le Dernier" #: ../src/xutil.c:228 msgid "invalid data in selection" msgstr "Données invalides dans la séléction." + +#~ msgid "Keep Attracted Icons" +#~ msgstr "Garder les Icones" + +#~ msgid "wrealloc() failed while trying to add menu item" +#~ msgstr "Echec de wrealloc() pendant l'ajout d'un élément de menu." + +#~ msgid "" +#~ "The configuration will apply to all\n" +#~ "windows that have their WM_CLASS property set to the above selected\n" +#~ "name, when saved." +#~ msgstr "" +#~ "La configuration s'appliquera à toutes\n" +#~ "les fenêtres dont la propriété WM_CLASS coïncide avec le nom séléctionné\n" +#~ "ci-dessus, lors de la sauvegarde." + +#~ msgid "(Un)Select Icon" +#~ msgstr "(Dé)Séléctionner l'Icone" + +#~ msgid "Keep Icon(s)" +#~ msgstr "Garder le(s) Icone(s)" + +#~ msgid "The following character sets are missing in %s:" +#~ msgstr "Les jeux de caractères suivants manquent dans %s:" + +#~ msgid "The string \"%s\" will be used in place" +#~ msgstr "La chaîne \"%s\" sera utilisée à la place" + +#~ msgid "of any characters from those sets." +#~ msgstr "de tous les caractères de ces jeux." + +#~ msgid "could not create font set %s. Trying fixed" +#~ msgstr "Création du jeu de caractères %s impossible. Essaye fixed." + +#~ msgid "could not load font %s. Trying fixed" +#~ msgstr "Chargement de la police %s impossible. Essaye fixed." + +#~ msgid "" +#~ "Enable the \"Don't bind...\" options to allow the application to receive all " +#~ "mouse or keyboard events." +#~ msgstr "" +#~ "Activer les options \"Utiliser...\" pour que l'application reçoive tous les " +#~ "évenements clavier ou souris." diff --git a/src/Makefile.in b/src/Makefile.in index 06ab2d4d..7ffd0147 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -206,8 +207,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -328,7 +329,7 @@ uninstall: uninstall-am all-am: Makefile $(PROGRAMS) config.h all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/src/WindowMaker.h b/src/WindowMaker.h index f1367732..c36ab6ac 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -423,6 +423,7 @@ typedef struct WPreferences { unsigned int noclip:1; /* don't display the clip */ unsigned int nocpp:1; /* don't use cpp */ unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */ + unsigned int noautolaunch:1; /* don't autolaunch apps */ } flags; /* internal flags */ } WPreferences; diff --git a/src/actions.c b/src/actions.c index daebc87c..a8024ede 100644 --- a/src/actions.c +++ b/src/actions.c @@ -469,14 +469,13 @@ wMaximizeWindow(WWindow *wwin, int directions) new_height = (usableArea.y2-usableArea.y1)-FRAME_BORDER_WIDTH*2; new_y = usableArea.y1; - if (WFLAGP(wwin, full_maximize)) - new_y -= wwin->frame->top_width; - + if (WFLAGP(wwin, full_maximize)) { + new_y -= wwin->frame->top_width - 1; + new_height += wwin->frame->bottom_width - 3; + } } else { - new_y = wwin->frame_y; new_height = wwin->frame->core->height; - } if (!WFLAGP(wwin, full_maximize)) { diff --git a/src/config.h.in b/src/config.h.in index f180be6e..d115a3e4 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -109,6 +109,10 @@ * set by configure */ #undef SHAPE +/* define if you want support for the XINERAMA extension + * set by configure */ +#undef XINERAMA + /* define if you want support for X window's X_LOCALE * set by configure */ #undef X_LOCALE diff --git a/src/defaults.c b/src/defaults.c index 6efae752..46c6c093 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -325,13 +325,13 @@ static WOptionEnumeration seDisplayPositions[] = { * created after these defaults are read */ WDefaultEntry staticOptionList[] = { - - {"DisableDithering", "NO", NULL, - &wPreferences.no_dithering, getBool, NULL - }, + {"ColormapSize", "4", NULL, &wPreferences.cmap_size, getInt, NULL }, + {"DisableDithering", "NO", NULL, + &wPreferences.no_dithering, getBool, NULL + }, /* static by laziness */ {"IconSize", "64", NULL, &wPreferences.icon_size, getInt, NULL diff --git a/src/event.c b/src/event.c index 07c93bcc..bb2f2ddf 100644 --- a/src/event.c +++ b/src/event.c @@ -1092,7 +1092,7 @@ static void handleLeaveNotify(XEvent *event) { WObjDescriptor *desc = NULL; - + if (XFindContext(dpy, event->xcrossing.window, wWinContext, (XPointer *)&desc)!=XCNOENT) { if(desc->handle_leavenotify) diff --git a/src/icon.c b/src/icon.c index 6d8929ad..19d08797 100644 --- a/src/icon.c +++ b/src/icon.c @@ -399,7 +399,7 @@ wIconValidateIconSize(WScreen *scr, RImage *icon) if (!icon) return NULL; - +#ifndef DONT_SCALE_ICONS if (wPreferences.icon_size != 64) { w = wPreferences.icon_size * icon->width / 64; h = wPreferences.icon_size * icon->height / 64; @@ -408,6 +408,7 @@ wIconValidateIconSize(WScreen *scr, RImage *icon) RDestroyImage(icon); icon = tmp; } +#endif #if 0 if (icon->width > wPreferences.icon_size || icon->height > wPreferences.icon_size) { diff --git a/src/main.c b/src/main.c index 82de2c89..2042cda6 100644 --- a/src/main.c +++ b/src/main.c @@ -421,6 +421,7 @@ print_help() #endif puts(_(" --no-dock do not open the application Dock")); puts(_(" --no-clip do not open the workspace Clip")); + puts(_(" --no-autolaunch do not autolaunch applications")); puts(_(" --locale locale locale to use")); @@ -548,18 +549,14 @@ main(int argc, char **argv) #ifdef DEBUG Bool doSync = False; #endif + setlocale(LC_ALL, ""); wsetabort(wAbort); /* for telling WPrefs what's the name of the wmaker binary being ran */ - { -/* char *tmp; - tmp = getFullPath(argv[0]);*/ - str = wstrappend("WMAKER_BIN_NAME=", argv[0]); -/* free(tmp);*/ - putenv(str); - } + str = wstrappend("WMAKER_BIN_NAME=", argv[0]); + putenv(str); ArgCount = argc; Arguments = argv; @@ -586,7 +583,10 @@ main(int argc, char **argv) wPreferences.flags.nocpp=1; } else #endif - if (strcmp(argv[i], "-nodock")==0 + if (strcmp(argv[i], "-no-autolaunch")==0 + || strcmp(argv[i], "--no-autolaunch")==0) { + wPreferences.flags.noautolaunch = 1; + } else if (strcmp(argv[i], "-nodock")==0 || strcmp(argv[i], "--no-dock")==0) { wPreferences.flags.nodock=1; } else if (strcmp(argv[i], "-noclip")==0 @@ -658,28 +658,16 @@ main(int argc, char **argv) check_defaults(); } -#if 0 - tmp = getenv("LANG"); - if (tmp) { - if (setlocale(LC_ALL,"") == NULL) { - wwarning("cannot set locale %s", tmp); - wwarning("falling back to C locale"); - setlocale(LC_ALL,"C"); - Locale = NULL; - } else { - if (strcmp(tmp, "C")==0 || strcmp(tmp, "POSIX")==0) - Locale = NULL; - else - Locale = tmp; - } - } else { - Locale = NULL; + + if (!Locale) { + Locale = getenv("LC_ALL"); } -#endif if (!Locale) { Locale = getenv("LANG"); } - setlocale(LC_ALL, Locale); + + setlocale(LC_ALL, ""); + if (!Locale || strcmp(Locale, "C")==0 || strcmp(Locale, "POSIX")==0) Locale = NULL; #ifdef I18N @@ -692,6 +680,7 @@ main(int argc, char **argv) if (!XSupportsLocale()) { wwarning(_("X server does not support locale")); } + if (XSetLocaleModifiers("") == NULL) { wwarning(_("cannot set locale modifiers")); } @@ -706,7 +695,6 @@ main(int argc, char **argv) *ptr = 0; } - /* open display */ dpy = XOpenDisplay(DisplayName); if (dpy == NULL) { diff --git a/src/startup.c b/src/startup.c index 4803bb20..efb91b30 100644 --- a/src/startup.c +++ b/src/startup.c @@ -626,6 +626,26 @@ wScreenForWindow(Window window) } +static char *atomNames[] = { + "WM_STATE", + "WM_CHANGE_STATE", + "WM_PROTOCOLS", + "WM_TAKE_FOCUS", + "WM_DELETE_WINDOW", + "WM_SAVE_YOURSELF", + "WM_CLIENT_LEADER", + "WM_COLORMAP_WINDOWS", + "WM_COLORMAP_NOTIFY", + GNUSTEP_WM_ATTR_NAME, + "_WINDOWMAKER_MENU", + "_WINDOWMAKER_STATE", + "_WINDOWMAKER_WM_PROTOCOLS", + GNUSTEP_WM_MINIATURIZE_WINDOW, + "_WINDOWMAKER_WM_FUNCTION", + "_WINDOWMAKER_NOTICEBOARD", + "_WINDOWMAKER_COMMAND" +}; + /* *---------------------------------------------------------- @@ -643,6 +663,7 @@ StartUp(Bool defaultScreenOnly) WWorkspaceState *ws_state; struct sigaction sig_action; int j, max; + Atom atom[sizeof(atomNames)/sizeof(char*)]; /* * Ignore CapsLock in modifiers @@ -664,34 +685,34 @@ StartUp(Bool defaultScreenOnly) /* _XA_VERSION = XInternAtom(dpy, "VERSION", False);*/ - _XA_WM_STATE = XInternAtom(dpy, "WM_STATE", False); - _XA_WM_CHANGE_STATE = XInternAtom(dpy, "WM_CHANGE_STATE", False); - _XA_WM_PROTOCOLS = XInternAtom(dpy, "WM_PROTOCOLS", False); - _XA_WM_TAKE_FOCUS = XInternAtom(dpy, "WM_TAKE_FOCUS", False); - _XA_WM_DELETE_WINDOW = XInternAtom(dpy, "WM_DELETE_WINDOW", False); - _XA_WM_SAVE_YOURSELF = XInternAtom(dpy, "WM_SAVE_YOURSELF", False); - _XA_WM_CLIENT_LEADER = XInternAtom(dpy, "WM_CLIENT_LEADER", False); - _XA_WM_COLORMAP_WINDOWS = XInternAtom(dpy, "WM_COLORMAP_WINDOWS", False); - _XA_WM_COLORMAP_NOTIFY = XInternAtom(dpy, "WM_COLORMAP_NOTIFY", False); - - _XA_GNUSTEP_WM_ATTR = XInternAtom(dpy, GNUSTEP_WM_ATTR_NAME, False); - - _XA_WINDOWMAKER_MENU = XInternAtom(dpy, "_WINDOWMAKER_MENU", False); - _XA_WINDOWMAKER_STATE = XInternAtom(dpy, "_WINDOWMAKER_STATE", False); - - _XA_WINDOWMAKER_WM_PROTOCOLS = - XInternAtom(dpy, "_WINDOWMAKER_WM_PROTOCOLS", False); - - _XA_GNUSTEP_WM_MINIATURIZE_WINDOW = - XInternAtom(dpy, GNUSTEP_WM_MINIATURIZE_WINDOW, False); + XInternAtoms(dpy, atomNames, sizeof(atomNames)/sizeof(char*), + False, atom); - _XA_WINDOWMAKER_WM_FUNCTION = XInternAtom(dpy, "_WINDOWMAKER_WM_FUNCTION", - False); + _XA_WM_STATE = atom[0]; + _XA_WM_CHANGE_STATE = atom[1]; + _XA_WM_PROTOCOLS = atom[2]; + _XA_WM_TAKE_FOCUS = atom[3]; + _XA_WM_DELETE_WINDOW = atom[4]; + _XA_WM_SAVE_YOURSELF = atom[5]; + _XA_WM_CLIENT_LEADER = atom[6]; + _XA_WM_COLORMAP_WINDOWS = atom[7]; + _XA_WM_COLORMAP_NOTIFY = atom[8]; - _XA_WINDOWMAKER_NOTICEBOARD = XInternAtom(dpy, "_WINDOWMAKER_NOTICEBOARD", - False); + _XA_GNUSTEP_WM_ATTR = atom[9]; + + _XA_WINDOWMAKER_MENU = atom[10]; + _XA_WINDOWMAKER_STATE = atom[11]; + + _XA_WINDOWMAKER_WM_PROTOCOLS = atom[12]; + + _XA_GNUSTEP_WM_MINIATURIZE_WINDOW = atom[13]; - _XA_WINDOWMAKER_COMMAND = XInternAtom(dpy, "_WINDOWMAKER_COMMAND", False); + _XA_WINDOWMAKER_WM_FUNCTION = atom[14]; + + _XA_WINDOWMAKER_NOTICEBOARD = atom[15]; + + _XA_WINDOWMAKER_COMMAND = atom[16]; + #ifdef OFFIX_DND _XA_DND_SELECTION = XInternAtom(dpy, "DndSelection", False); @@ -857,7 +878,8 @@ StartUp(Bool defaultScreenOnly) if (ws_state == NULL) wSessionRestoreState(wScreen[j]); - +if(!wPreferences.flags.noautolaunch) +{ /* auto-launch apps */ if (!wPreferences.flags.nodock && wScreen[j]->dock) { wScreen[j]->last_dock = wScreen[j]->dock; @@ -873,6 +895,7 @@ StartUp(Bool defaultScreenOnly) } } } +} /* go to workspace where we were before restart */ if (ws_state) { diff --git a/src/wconfig.h.in b/src/wconfig.h.in index 39db65af..271165c5 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -178,15 +178,19 @@ #undef IGNORE_PPOSITION +/* + * Do not scale application icon and miniwindow icon images. + */ +#undef DONT_SCALE_ICONS + + + + + + #define SILLYNESS -/* - * Define if you're experiencing crashes when launching programs. - * This will disable some important but not essential code. - * Use it until we figure what's wrong. - */ -#undef NO_CRASHES diff --git a/src/winspector.c b/src/winspector.c index f9de05d3..f0916716 100644 --- a/src/winspector.c +++ b/src/winspector.c @@ -1102,7 +1102,8 @@ selectSpecification(WMWidget *bPtr, void *data) char *str; WWindow *wwin = panel->inspected; - if (bPtr == panel->defaultRb) { + + if (bPtr == panel->defaultRb && (wwin->wm_instance || wwin->wm_class)) { WMSetButtonEnabled(panel->applyBtn, False); } else { WMSetButtonEnabled(panel->applyBtn, True); @@ -1303,9 +1304,6 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos, WMSetButtonAction(panel->clsRb, selectSpecification, panel); } - if (selectedBtn) - WMSetButtonSelected(selectedBtn, True); - panel->selWinB = WMCreateCommandButton(panel->specFrm); WMMoveWidget(panel->selWinB, 20, 145-24 - 10); diff --git a/util/Makefile.in b/util/Makefile.in index 72ee96bc..83fe81c2 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -44,9 +44,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -222,8 +223,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -388,7 +389,7 @@ uninstall: uninstall-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)