+to 21.2.28 "Hermes"
+-- Add configure support for NetWinders, Sean MacLennan
+-- Make the "Load .emacs" menu item work again, Kirill Katsnelson
+-- Make --without-x work again.
+-- Detect Xaw3d and friends using #include <Xaw3d/FOO.h>
+-- Experimental Drag-N-Drop now defaults to "no" until there is again
+ active development.
+-- SGI dumping fixes should make XEmacs work again on Irix 6.
+-- More warning flags on by default when building with gcc.
+-- process coding changes, Kirill Katsnelson
+-- help now knows how to print macro arglists, Yoshiki Hayashi
+-- Windows printing support, Kirill Katsnelson
+-- Obscure crash fixes, Martin Buchholz
+-- Memory leak fixes, Martin Buchholz
+-- We now always use our own realpath(), never the system-provided one.
+-- More gutter/tab widget changes, Andy Piper
+-- Crash fix when using dead processes, Gunnar Evermann (fix PR#1061)
+-- Pdump stability fixes, Olivier Galibert
+-- New coding system alias implementation, Ben Wing and Martin Buchholz
+-- New internal data conversion infrastructure, Ben Wing and Martin Buchholz
+-- IPv6 support, URA Hiroshi
+-- Runtime Athena mismatch warnings added, Daniel Pittman
+-- Removal of old MSDOS support, Kirill Katsnelson
+-- Correctly define Latin-3 and Latin-4 character syntax as "w".
+-- Auto-define all X-defined keysyms as self-inserting, not just Latin-1.
+-- Workaround egcs-20000131 c++ compiler bug
+-- Byte-optimize (length "foo") to 3.
+-- (define-key ctl-x-4-map "p" global-map) no longer causes stack overflow crash.
+-- Partially implement dontusethis-set-symbol-value-handler.
+-- Fix bug: (getf nil t t) ==> Lisp nesting exceeds `max-lisp-eval-depth'
+-- lib-src partially C++ized, Zack Weinberg.
+
to 21.2.27 "Hera"
-- Dynamic layout for widgets from Andy Piper
-- config.sub, config.guess major upgrade, Marcus Thiessel
* configure.in: Add new option `--with-utf-2000'; define `UTF2000'
if it is specified.
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-01-27 URA Hiroshi <ura@hiru.aoba.yokohama.jp>
+ * configure.in: added getaddrinfo and getnameinfo to AC_FUNC.
+
+2000-01-26 Martin Buchholz <martin@xemacs.org>
+
+ * configure.in: Backout the /etc/ld.so.conf patch of 2000-01-18.
+
+2000-01-24 Martin Buchholz <martin@xemacs.org>
+
+ * configure.in: Always use our own realpath(), not the system one.
+
+2000-01-25 Martin Buchholz <martin@xemacs.org>
+
+ * configure.in: Default Drag-N-Drop to "no"
+
+1999-12-28 Max Matveev <max@melbourne.sgi.com>
+
+ * configure.in: add new machine type for IRIX 6.[2-5] to
+ switch from using unexelf.o to unexelfsgi.o for just those
+ versions of IRIX.
+ In the ideal world it would be handled by the s/irix6-0.h but
+ since machine config is included AFTER OS config, I had to add a
+ new machine type.
+
+2000-01-22 Andy Piper <andy@xemacs.org>
+
+ * configure.in: add winspool to windows libraries.
+
+2000-01-22 Martin Buchholz <martin@xemacs.org>
+
+ * configure.in: Add more warnings to default gcc flags.
+
+2000-01-20 Daniel Pittman <daniel@danann.net>
+
+ * configure.in: Find Athena headers hidden in even more obscure
+ places. That is, search Xaw3D/ as well as X11/Xaw3D/.
+
+2000-01-19 Martin Buchholz <martin@xemacs.org>
+
+ * configure.in: Add support for NetWinders.
+ Patch by Sean MacLennan <seanm@netwinder.org>
+
+2000-01-18 Martin Buchholz <martin@xemacs.org>
+
+ * configure.in: Use /etc/ld.so.conf at link-time, if available.
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
use_union_type="no"
with_dnet=""
pdump="no"
+with_dragndrop="no"
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:837: checking whether ln -s works" >&5
+echo "configure:838: checking whether ln -s works" >&5
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
extra_objs="$extra_objs debug.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"debug.o\""
fi
+ extra_objs="$extra_objs tests.o" && if test "$extra_verbose" = "yes"; then
+ echo " xemacs will be linked with \"tests.o\""
+ fi
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining DEBUG_XEMACS
EOF
echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1082: checking "host system type"" >&5
+echo "configure:1086: checking "host system type"" >&5
internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
alpha*-*-* ) machine=alpha ;;
vax-*-* ) machine=vax ;;
mips-dec-* ) machine=pmax ;;
+ mips-sgi-irix6* ) machine=iris6d ;;
mips-sgi-* ) machine=iris4d ;;
mips*-linux ) machine=mips ;;
romp-ibm-* ) machine=ibmrt ;;
mips-sony-* ) machine=news-risc ;;
clipper-* ) machine=clipper ;;
arm-* ) machine=arm ;;
+ armv34lb-* ) machine=arm ;;
ns32k-* ) machine=ns32000 ;;
esac
# 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:1576: checking for $ac_word" >&5
+echo "configure:1582: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
# 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:1603: checking for $ac_word" >&5
+echo "configure:1609: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
# 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:1651: checking for $ac_word" >&5
+echo "configure:1657: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1680: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1686: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
cat > conftest.$ac_ext << EOF
-#line 1693 "configure"
+#line 1699 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1704: \"$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
{ 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:1726: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1732: 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:1731: checking whether we are using GNU C" >&5
+echo "configure:1737: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1738: \"$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:1744: \"$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
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1756: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1762: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
# 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:1789: checking for $ac_word" >&5
+echo "configure:1795: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
# 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:1816: checking for $ac_word" >&5
+echo "configure:1822: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
# 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:1864: checking for $ac_word" >&5
+echo "configure:1870: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1893: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
cat > conftest.$ac_ext << EOF
-#line 1906 "configure"
+#line 1912 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1917: \"$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
{ 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:1939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1945: 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:1944: checking whether we are using GNU C" >&5
+echo "configure:1950: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1951: \"$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:1957: \"$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
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1969: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1975: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
# 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:2002: checking for $ac_word" >&5
+echo "configure:2008: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
# 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:2029: checking for $ac_word" >&5
+echo "configure:2035: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
# 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:2077: checking for $ac_word" >&5
+echo "configure:2083: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2106: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2112: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
cat > conftest.$ac_ext << EOF
-#line 2119 "configure"
+#line 2125 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2130: \"$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
{ 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:2152: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2158: 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:2157: checking whether we are using GNU C" >&5
+echo "configure:2163: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2164: \"$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:2170: \"$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
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2182: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2188: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2219: checking how to run the C preprocessor" >&5
+echo "configure:2225: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2232 "configure"
+#line 2238 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2244: \"$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*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2249 "configure"
+#line 2255 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2261: \"$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*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2266 "configure"
+#line 2272 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2278: \"$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
:
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2297: checking for AIX" >&5
+echo "configure:2303: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 2299 "configure"
+#line 2305 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2326: checking for GNU libc" >&5
+echo "configure:2332: checking for GNU libc" >&5
cat > conftest.$ac_ext <<EOF
-#line 2328 "configure"
+#line 2334 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_glibc=yes
else
cat > conftest.$ac_ext <<EOF
-#line 2362 "configure"
+#line 2368 "configure"
#include "confdefs.h"
int main () {
#if defined __SUNPRO_C
#endif
}
EOF
-if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
if test "$cflags_specified" = "no"; then
if test "$GCC" = "yes"; then
- CFLAGS="-g -O3 -Wall -Wno-switch"
+ CFLAGS="-g -O3 -Wall -Wno-switch -Wpointer-arith -Winline -Wmissing-prototypes -Wshadow"
elif test "$__SUNPRO_C" = "yes"; then
case "$opsys" in
sol2 ) CFLAGS="-v -xO4" ;;
fi
echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2660: checking for dynodump" >&5
+echo "configure:2666: checking for dynodump" >&5
if test "$unexec" != "unexsol2.o"; then
echo "$ac_t""no" 1>&6
else
done
echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2698: checking for terminateAndUnload in -lC" >&5
+echo "configure:2704: checking for terminateAndUnload in -lC" >&5
ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
xe_check_libs=" -lC "
cat > conftest.$ac_ext <<EOF
-#line 2703 "configure"
+#line 2709 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
terminateAndUnload()
; return 0; }
EOF
-if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2720: \"$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
for dir in "/usr/ccs/lib"; do
- test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L${dir}\" to \$ld_switch_site"; fi
+ test -d "$dir" && ld_switch_system="$ld_switch_system -L${dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L${dir}\" to \$ld_switch_system"; fi
done
case "$site_runtime_libraries" in *:* ) site_runtime_libraries="`echo '' $site_runtime_libraries | sed -e 's/^ //' -e 's/:/ /g'`";; esac
fi
-if test "$dynamic" = "no"; then add_runtime_path=no
+
+
+
+if test -n "$add_runtime_path"; then :;
+elif test "$dynamic" = "no"; then add_runtime_path=no
elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
else case "$opsys" in
sol2 | irix* | *bsd* | decosf* ) add_runtime_path=yes ;;
if test "$add_runtime_path" = "yes"; then
echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2818: checking "for runtime libraries flag"" >&5
+echo "configure:2828: checking "for runtime libraries flag"" >&5
case "$opsys" in
sol2 ) dash_r="-R" ;;
decosf* | linux* | irix*) dash_r="-rpath " ;;
done
fi
cat > conftest.$ac_ext <<EOF
-#line 2840 "configure"
+#line 2850 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
dash_r="$try_dash_r"
else
fi
after_morecore_hook_exists=yes
echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:2949: checking for malloc_get_state" >&5
+echo "configure:2959: checking for malloc_get_state" >&5
cat > conftest.$ac_ext <<EOF
-#line 2952 "configure"
+#line 2962 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_get_state(); below. */
; return 0; }
EOF
-if { (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_get_state=yes"
else
fi
echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:2995: checking for malloc_set_state" >&5
+echo "configure:3005: checking for malloc_set_state" >&5
cat > conftest.$ac_ext <<EOF
-#line 2998 "configure"
+#line 3008 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_set_state(); below. */
; return 0; }
EOF
-if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_set_state=yes"
else
fi
echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3041: checking whether __after_morecore_hook exists" >&5
+echo "configure:3051: checking whether __after_morecore_hook exists" >&5
cat > conftest.$ac_ext <<EOF
-#line 3043 "configure"
+#line 3053 "configure"
#include "confdefs.h"
extern void (* __after_morecore_hook)();
int main() {
__after_morecore_hook = 0
; return 0; }
EOF
-if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
# 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:3109: checking for $ac_word" >&5
+echo "configure:3119: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
# 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:3164: checking for a BSD compatible install" >&5
+echo "configure:3174: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3218: checking for $ac_word" >&5
+echo "configure:3228: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3250: checking for $ac_hdr" >&5
+echo "configure:3260: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3253 "configure"
+#line 3263 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3268: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3291: checking for $ac_hdr" >&5
+echo "configure:3301: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3294 "configure"
+#line 3304 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3309: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3332: checking for $ac_hdr" >&5
+echo "configure:3342: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3335 "configure"
+#line 3345 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3350: \"$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*
done
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3370: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3380: checking for sys/wait.h that is POSIX.1 compatible" >&5
cat > conftest.$ac_ext <<EOF
-#line 3373 "configure"
+#line 3383 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:3389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3413: checking for ANSI C header files" >&5
+echo "configure:3423: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3416 "configure"
+#line 3426 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3434: \"$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*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3441 "configure"
+#line 3451 "configure"
#include "confdefs.h"
#include <string.h>
EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3459 "configure"
+#line 3469 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
cat > conftest.$ac_ext <<EOF
-#line 3477 "configure"
+#line 3487 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:3488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3514: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3524: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 3517 "configure"
+#line 3527 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
fi
echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3550: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3560: checking for sys_siglist declaration in signal.h or unistd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3553 "configure"
+#line 3563 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
char *msg = *(sys_siglist + 1);
; return 0; }
EOF
-if { (eval echo configure:3565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_decl_sys_siglist=yes
else
echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3590: checking for struct utimbuf" >&5
+echo "configure:3600: checking for struct utimbuf" >&5
cat > conftest.$ac_ext <<EOF
-#line 3592 "configure"
+#line 3602 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
static struct utimbuf x; x.actime = x.modtime;
; return 0; }
EOF
-if { (eval echo configure:3611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
rm -f conftest*
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3631: checking return type of signal handlers" >&5
+echo "configure:3641: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 3634 "configure"
+#line 3644 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
int i;
; return 0; }
EOF
-if { (eval echo configure:3651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3673: checking for size_t" >&5
+echo "configure:3683: checking for size_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3676 "configure"
+#line 3686 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3707: checking for pid_t" >&5
+echo "configure:3717: checking for pid_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3710 "configure"
+#line 3720 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3741: checking for uid_t in sys/types.h" >&5
+echo "configure:3751: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3744 "configure"
+#line 3754 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3780: checking for mode_t" >&5
+echo "configure:3790: checking for mode_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3783 "configure"
+#line 3793 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3814: checking for off_t" >&5
+echo "configure:3824: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3817 "configure"
+#line 3827 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:3848: checking for ssize_t" >&5
+echo "configure:3858: checking for ssize_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3851 "configure"
+#line 3861 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3883: checking for struct timeval" >&5
+echo "configure:3893: checking for struct timeval" >&5
cat > conftest.$ac_ext <<EOF
-#line 3885 "configure"
+#line 3895 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
static struct timeval x; x.tv_sec = x.tv_usec;
; return 0; }
EOF
-if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_TIMEVAL=yes
rm -f conftest*
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3923: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3933: checking whether struct tm is in sys/time.h or time.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3926 "configure"
+#line 3936 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:3934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3958: checking for tm_zone in struct tm" >&5
+echo "configure:3968: checking for tm_zone in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 3961 "configure"
+#line 3971 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:3969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3992: checking for tzname" >&5
+echo "configure:4002: checking for tzname" >&5
cat > conftest.$ac_ext <<EOF
-#line 3995 "configure"
+#line 4005 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4031: checking for working const" >&5
+echo "configure:4041: checking for working const" >&5
cat > conftest.$ac_ext <<EOF
-#line 4034 "configure"
+#line 4044 "configure"
#include "confdefs.h"
int main() {
/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
/* SunOS 4.1.1 cc rejects this. */
char const *const *ccp;
char **p;
; return 0; }
EOF
-if { (eval echo configure:4083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4108: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4118: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
cat > conftestmake <<\EOF
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4133: checking whether byte ordering is bigendian" >&5
+echo "configure:4143: checking whether byte ordering is bigendian" >&5
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 4138 "configure"
+#line 4148 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:4149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 4153 "configure"
+#line 4163 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:4164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
rm -f conftest*
if test $ac_cv_c_bigendian = unknown; then
cat > conftest.$ac_ext <<EOF
-#line 4181 "configure"
+#line 4191 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_bigendian=no
else
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4221: checking size of short" >&5
+echo "configure:4231: checking size of short" >&5
cat > conftest.$ac_ext <<EOF
-#line 4224 "configure"
+#line 4234 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_short=`cat conftestval`
else
exit 1
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4263: checking size of int" >&5
+echo "configure:4273: checking size of int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4266 "configure"
+#line 4276 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:4277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_int=`cat conftestval`
else
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4299: checking size of long" >&5
+echo "configure:4309: checking size of long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4302 "configure"
+#line 4312 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:4313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long=`cat conftestval`
else
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4335: checking size of long long" >&5
+echo "configure:4345: checking size of long long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4338 "configure"
+#line 4348 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long_long=`cat conftestval`
else
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4371: checking size of void *" >&5
+echo "configure:4381: checking size of void *" >&5
cat > conftest.$ac_ext <<EOF
-#line 4374 "configure"
+#line 4384 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_void_p=`cat conftestval`
else
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4408: checking for long file names" >&5
+echo "configure:4418: checking for long file names" >&5
ac_cv_sys_long_file_names=yes
# Test for long file names in all the places we know might matter:
echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4454: checking for sin" >&5
+echo "configure:4464: checking for sin" >&5
cat > conftest.$ac_ext <<EOF
-#line 4457 "configure"
+#line 4467 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sin(); below. */
; return 0; }
EOF
-if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sin=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4498: checking for sin in -lm" >&5
+echo "configure:4508: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
xe_check_libs=" -lm "
cat > conftest.$ac_ext <<EOF
-#line 4503 "configure"
+#line 4513 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sin()
; return 0; }
EOF
-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4524: \"$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
cat > conftest.$ac_ext <<EOF
-#line 4558 "configure"
+#line 4568 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
return atanh(1.0) + asinh(1.0) + acosh(1.0);
; return 0; }
EOF
-if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_INVERSE_HYPERBOLIC
rm -f conftest*
echo "checking type of mail spool file locking" 1>&6
-echo "configure:4582: checking type of mail spool file locking" >&5
+echo "configure:4592: checking type of mail spool file locking" >&5
for ac_func in lockf flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4586: checking for $ac_func" >&5
+echo "configure:4596: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4589 "configure"
+#line 4599 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4622: \"$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
case "$opsys" in decosf*)
echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4685: checking for cma_open in -lpthreads" >&5
+echo "configure:4695: checking for cma_open in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpthreads "
cat > conftest.$ac_ext <<EOF
-#line 4690 "configure"
+#line 4700 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
cma_open()
; return 0; }
EOF
-if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4711: \"$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
esac
echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4737: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4747: checking whether the -xildoff compiler flag is required" >&5
if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
then echo "$ac_t""no" 1>&6;
if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4748: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4758: checking for \"-z ignore\" linker flag" >&5
case "`ld -h 2>&1`" in
*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
echo "checking "for specified window system"" 1>&6
-echo "configure:4758: checking "for specified window system"" >&5
+echo "configure:4768: checking "for specified window system"" >&5
if test "$with_x11" != "no"; then
test "$x_includes $x_libraries" != "NONE NONE" && \
# 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:4791: checking for X" >&5
+echo "configure:4801: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 4851 "configure"
+#line 4861 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4866: \"$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*
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4925 "configure"
+#line 4935 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:4932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4942: \"$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.
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:5041: checking whether -R must be followed by a space" >&5
+echo "configure:5051: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5044 "configure"
+#line 5054 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5067 "configure"
+#line 5077 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
else
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5110: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5120: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet "
cat > conftest.$ac_ext <<EOF
-#line 5115 "configure"
+#line 5125 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5136: \"$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
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:5150: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5160: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet_stub "
cat > conftest.$ac_ext <<EOF
-#line 5155 "configure"
+#line 5165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5176: \"$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
# 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:5195: checking for gethostbyname" >&5
+echo "configure:5205: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 5198 "configure"
+#line 5208 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5231: \"$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
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5242: checking for gethostbyname in -lnsl" >&5
+echo "configure:5252: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
xe_check_libs=" -lnsl "
cat > conftest.$ac_ext <<EOF
-#line 5247 "configure"
+#line 5257 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:5258: \"$ac_link\") 1>&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
# -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:5288: checking for connect" >&5
+echo "configure:5298: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 5291 "configure"
+#line 5301 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5324: \"$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
xe_msg_checking="for connect in -lsocket"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5337: checking "$xe_msg_checking"" >&5
+echo "configure:5347: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocket $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5342 "configure"
+#line 5352 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:5353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5363: \"$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
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5377: checking for remove" >&5
+echo "configure:5387: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 5380 "configure"
+#line 5390 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
; return 0; }
EOF
-if { (eval echo configure:5403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5413: \"$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
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5424: checking for remove in -lposix" >&5
+echo "configure:5434: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
xe_check_libs=" -lposix "
cat > conftest.$ac_ext <<EOF
-#line 5429 "configure"
+#line 5439 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
remove()
; return 0; }
EOF
-if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5450: \"$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
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5464: checking for shmat" >&5
+echo "configure:5474: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 5467 "configure"
+#line 5477 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
; return 0; }
EOF
-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5500: \"$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
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5511: checking for shmat in -lipc" >&5
+echo "configure:5521: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
xe_check_libs=" -lipc "
cat > conftest.$ac_ext <<EOF
-#line 5516 "configure"
+#line 5526 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:5527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5537: \"$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
xe_msg_checking="for IceConnectionNumber in -lICE"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5563: checking "$xe_msg_checking"" >&5
+echo "configure:5573: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
xe_check_libs=" -lICE $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5568 "configure"
+#line 5578 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:5579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5589: \"$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
echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5748: checking for X defines extracted by xmkmf" >&5
+echo "configure:5758: checking for X defines extracted by xmkmf" >&5
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:5780: checking for X11/Intrinsic.h" >&5
+echo "configure:5790: checking for X11/Intrinsic.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 5783 "configure"
+#line 5793 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5798: \"$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*
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5812: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5822: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 5817 "configure"
+#line 5827 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5838: \"$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
xe_msg_checking="for XGetFontProperty in -lX11"
test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5853: checking "$xe_msg_checking"" >&5
+echo "configure:5863: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 -b i486-linuxaout"
cat > conftest.$ac_ext <<EOF
-#line 5858 "configure"
+#line 5868 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XGetFontProperty()
; return 0; }
EOF
-if { (eval echo configure:5869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5879: \"$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
echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:5896: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5906: checking for XShapeSelectInput in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXext "
cat > conftest.$ac_ext <<EOF
-#line 5901 "configure"
+#line 5911 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XShapeSelectInput()
; return 0; }
EOF
-if { (eval echo configure:5912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5922: \"$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
echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5935: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5945: checking for XtOpenDisplay in -lXt" >&5
ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXt "
cat > conftest.$ac_ext <<EOF
-#line 5940 "configure"
+#line 5950 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XtOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:5951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5961: \"$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
echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5974: checking the version of X11 being used" >&5
+echo "configure:5984: checking the version of X11 being used" >&5
cat > conftest.$ac_ext <<EOF
-#line 5976 "configure"
+#line 5986 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
EOF
-if { (eval echo configure:5981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest foobar; x11_release=$?
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6006: checking for $ac_hdr" >&5
+echo "configure:6016: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6009 "configure"
+#line 6019 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6024: \"$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*
echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:6045: checking for XFree86" >&5
+echo "configure:6055: checking for XFree86" >&5
if test -d "/usr/X386/include" -o \
-f "/etc/XF86Config" -o \
-f "/etc/X11/XF86Config" -o \
test -z "$with_xmu" && {
echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6065: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6075: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXmu "
cat > conftest.$ac_ext <<EOF
-#line 6070 "configure"
+#line 6080 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmuReadBitmapDataFromFile()
; return 0; }
EOF
-if { (eval echo configure:6081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6091: \"$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
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6120: checking for main in -lXbsd" >&5
+echo "configure:6130: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXbsd "
cat > conftest.$ac_ext <<EOF
-#line 6125 "configure"
+#line 6135 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6142: \"$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
fi
if test "$with_msw" != "no"; then
echo "checking for MS-Windows" 1>&6
-echo "configure:6169: checking for MS-Windows" >&5
+echo "configure:6179: checking for MS-Windows" >&5
echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6172: checking for main in -lgdi32" >&5
+echo "configure:6182: checking for main in -lgdi32" >&5
ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdi32 "
cat > conftest.$ac_ext <<EOF
-#line 6177 "configure"
+#line 6187 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6194: \"$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
}
install_pp="$blddir/lib-src/installexe.sh"
- libs_system="$libs_system -lshell32 -lgdi32 -luser32 -lcomctl32" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lshell32 -lgdi32 -luser32 -lcomctl32\" to \$libs_system"; fi
+ libs_system="$libs_system -lshell32 -lgdi32 -luser32 -lcomctl32 -lwinspool" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lshell32 -lgdi32 -luser32 -lcomctl32 -lwinspool\" to \$libs_system"; fi
test "$with_dragndrop" != no && dragndrop_proto="$dragndrop_proto msw" && if test "$extra_verbose" = "yes"; then echo " Appending \"msw\" to \$dragndrop_proto"; fi
if test "$window_system" != x11; then
window_system=msw
fi
fi
cat > conftest.$ac_ext <<EOF
-#line 6250 "configure"
+#line 6260 "configure"
#include "confdefs.h"
#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
EOF
-if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MSG_SELECT
esac
echo "checking for WM_COMMAND option" 1>&6
-echo "configure:6331: checking for WM_COMMAND option" >&5;
+echo "configure:6341: checking for WM_COMMAND option" >&5;
if test "$with_wmcommand" != "no"; then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_WMCOMMAND
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:6346: checking for X11/Xauth.h" >&5
+echo "configure:6356: checking for X11/Xauth.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6349 "configure"
+#line 6359 "configure"
#include "confdefs.h"
#include <X11/Xauth.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6364: \"$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*
}
test -z "$with_xauth" && {
echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:6377: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:6387: checking for XauGetAuthByAddr in -lXau" >&5
ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXau "
cat > conftest.$ac_ext <<EOF
-#line 6382 "configure"
+#line 6392 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XauGetAuthByAddr()
; return 0; }
EOF
-if { (eval echo configure:6393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6403: \"$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
for dir in "" "Tt/" "desktop/" ; do
ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:6438: checking for ${dir}tt_c.h" >&5
+echo "configure:6448: checking for ${dir}tt_c.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6441 "configure"
+#line 6451 "configure"
#include "confdefs.h"
#include <${dir}tt_c.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6456: \"$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*
xe_msg_checking="for tt_message_create in -ltt"
test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6482: checking "$xe_msg_checking"" >&5
+echo "configure:6492: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltt $extra_libs"
cat > conftest.$ac_ext <<EOF
-#line 6487 "configure"
+#line 6497 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tt_message_create()
; return 0; }
EOF
-if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6508: \"$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
test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:6555: checking for Dt/Dt.h" >&5
+echo "configure:6565: checking for Dt/Dt.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6558 "configure"
+#line 6568 "configure"
#include "confdefs.h"
#include <Dt/Dt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6573: \"$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*
}
test -z "$with_cde" && {
echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:6586: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:6596: checking for DtDndDragStart in -lDtSvc" >&5
ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lDtSvc "
cat > conftest.$ac_ext <<EOF
-#line 6591 "configure"
+#line 6601 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
DtDndDragStart()
; return 0; }
EOF
-if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6612: \"$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
fi
echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:6671: checking if drag and drop API is needed" >&5
+echo "configure:6681: checking if drag and drop API is needed" >&5
if test "$with_dragndrop" != "no" ; then
if test -n "$dragndrop_proto" ; then
with_dragndrop=yes
fi
echo "checking for LDAP" 1>&6
-echo "configure:6692: checking for LDAP" >&5
+echo "configure:6702: checking for LDAP" >&5
test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:6695: checking for ldap.h" >&5
+echo "configure:6705: checking for ldap.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6698 "configure"
+#line 6708 "configure"
#include "confdefs.h"
#include <ldap.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6713: \"$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*
}
test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:6726: checking for lber.h" >&5
+echo "configure:6736: checking for lber.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6729 "configure"
+#line 6739 "configure"
#include "confdefs.h"
#include <lber.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6744: \"$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*
if test "$with_ldap" != "no"; then
echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:6758: checking for ldap_search in -lldap" >&5
+echo "configure:6768: checking for ldap_search in -lldap" >&5
ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap "
cat > conftest.$ac_ext <<EOF
-#line 6763 "configure"
+#line 6773 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_search()
; return 0; }
EOF
-if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6784: \"$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
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6799: checking "$xe_msg_checking"" >&5
+echo "configure:6809: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber"
cat > conftest.$ac_ext <<EOF
-#line 6804 "configure"
+#line 6814 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:6815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6825: \"$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
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6840: checking "$xe_msg_checking"" >&5
+echo "configure:6850: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb"
cat > conftest.$ac_ext <<EOF
-#line 6845 "configure"
+#line 6855 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:6856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6866: \"$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
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6881: checking "$xe_msg_checking"" >&5
+echo "configure:6891: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb -ldes"
cat > conftest.$ac_ext <<EOF
-#line 6886 "configure"
+#line 6896 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:6897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6907: \"$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
for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6948: checking for $ac_func" >&5
+echo "configure:6958: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 6951 "configure"
+#line 6961 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:6974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6984: \"$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
if test "$window_system" != "none"; then
echo "checking for graphics libraries" 1>&6
-echo "configure:7006: checking for graphics libraries" >&5
+echo "configure:7016: checking for graphics libraries" >&5
xpm_problem=""
if test -z "$with_xpm"; then
echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:7011: checking for Xpm - no older than 3.4f" >&5
+echo "configure:7021: checking for Xpm - no older than 3.4f" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 7014 "configure"
+#line 7024 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
int main(int c, char **v) {
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
EOF
-if { (eval echo configure:7022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; xpm_status=$?;
if test "$xpm_status" = "0"; then
libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:7064: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:7074: checking for \"FOR_MSW\" xpm" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 7067 "configure"
+#line 7077 "configure"
#include "confdefs.h"
int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
-if { (eval echo configure:7074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xpm_for_msw=no
else
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:7100: checking for compface.h" >&5
+echo "configure:7110: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7103 "configure"
+#line 7113 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7118: \"$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*
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:7131: checking for UnGenFace in -lcompface" >&5
+echo "configure:7141: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 7136 "configure"
+#line 7146 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:7147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7157: \"$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
if test "$with_png $with_tiff" != "no no"; then
echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:7199: checking for inflate in -lc" >&5
+echo "configure:7209: checking for inflate in -lc" >&5
ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lc "
cat > conftest.$ac_ext <<EOF
-#line 7204 "configure"
+#line 7214 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inflate()
; return 0; }
EOF
-if { (eval echo configure:7215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7225: \"$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
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:7234: checking for inflate in -lz" >&5
+echo "configure:7244: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lz "
cat > conftest.$ac_ext <<EOF
-#line 7239 "configure"
+#line 7249 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inflate()
; return 0; }
EOF
-if { (eval echo configure:7250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7260: \"$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
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:7269: checking for inflate in -lgz" >&5
+echo "configure:7279: checking for inflate in -lgz" >&5
ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgz "
cat > conftest.$ac_ext <<EOF
-#line 7274 "configure"
+#line 7284 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inflate()
; return 0; }
EOF
-if { (eval echo configure:7285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7295: \"$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
test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:7315: checking for jpeglib.h" >&5
+echo "configure:7325: checking for jpeglib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7318 "configure"
+#line 7328 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7333: \"$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*
}
test -z "$with_jpeg" && {
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7346: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:7356: checking for jpeg_destroy_decompress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
xe_check_libs=" -ljpeg "
cat > conftest.$ac_ext <<EOF
-#line 7351 "configure"
+#line 7361 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jpeg_destroy_decompress()
; return 0; }
EOF
-if { (eval echo configure:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7372: \"$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
png_problem=""
test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:7398: checking for pow" >&5
+echo "configure:7408: checking for pow" >&5
cat > conftest.$ac_ext <<EOF
-#line 7401 "configure"
+#line 7411 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow(); below. */
; return 0; }
EOF
-if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pow=yes"
else
}
test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:7445: checking for png.h" >&5
+echo "configure:7455: checking for png.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7448 "configure"
+#line 7458 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7463: \"$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*
}
test -z "$with_png" && {
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7476: checking for png_read_image in -lpng" >&5
+echo "configure:7486: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpng "
cat > conftest.$ac_ext <<EOF
-#line 7481 "configure"
+#line 7491 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:7492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7502: \"$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
}
if test -z "$with_png"; then
echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:7515: checking for workable png version information" >&5
+echo "configure:7525: checking for workable png version information" >&5
xe_check_libs="-lpng -lz"
cat > conftest.$ac_ext <<EOF
-#line 7518 "configure"
+#line 7528 "configure"
#include "confdefs.h"
#include <png.h>
int main(int c, char **v) {
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
EOF
-if { (eval echo configure:7526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; png_status=$?;
if test "$png_status" = "0"; then
test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:7569: checking for tiffio.h" >&5
+echo "configure:7579: checking for tiffio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7572 "configure"
+#line 7582 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7587: \"$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*
}
test -z "$with_tiff" && {
echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7600: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:7610: checking for TIFFClientOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltiff "
cat > conftest.$ac_ext <<EOF
-#line 7605 "configure"
+#line 7615 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
TIFFClientOpen()
; return 0; }
EOF
-if { (eval echo configure:7616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7626: \"$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
if test "$with_x11" = "yes"; then
echo "checking for X11 graphics libraries" 1>&6
-echo "configure:7655: checking for X11 graphics libraries" >&5
+echo "configure:7665: checking for X11 graphics libraries" >&5
echo "checking for the Athena widgets" 1>&6
-echo "configure:7658: checking for the Athena widgets" >&5
+echo "configure:7668: checking for the Athena widgets" >&5
case "$with_athena" in
"xaw" | "") athena_variant=Xaw athena_3d=no ;;
if test "$athena_3d" = "no"; then
echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:7672: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:7682: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 7677 "configure"
+#line 7687 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XawScrollbarSetThumb()
; return 0; }
EOF
-if { (eval echo configure:7688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7698: \"$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
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:7704: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:7714: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 7709 "configure"
+#line 7719 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:7720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7730: \"$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
else
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:7751: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:7761: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 7756 "configure"
+#line 7766 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:7767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7777: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:7785: checking for threeDClassRec in -lXaw" >&5
+echo "configure:7795: checking for threeDClassRec in -lXaw" >&5
ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXaw "
cat > conftest.$ac_ext <<EOF
-#line 7790 "configure"
+#line 7800 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:7801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7811: \"$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
if test "$athena_3d" = "no"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:7832: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:7842: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7835 "configure"
+#line 7845 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7850: \"$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*
echo "$ac_t""no" 1>&6
ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:7860: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:7870: checking for X11/Xaw/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7863 "configure"
+#line 7873 "configure"
#include "confdefs.h"
#include <X11/Xaw/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7878: \"$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*
else
ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:7894: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:7904: checking for X11/$athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7897 "configure"
+#line 7907 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7912: \"$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*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:7919: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:7929: checking for X11/$athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7922 "configure"
+#line 7932 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7937: \"$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*
fi
+ if test -z "$athena_h_path"; then
+ ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
+echo "configure:7965: checking for $athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7968 "configure"
+#include "confdefs.h"
+#include <$athena_variant/XawInit.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7973: \"$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*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
+echo "configure:7990: checking for $athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7993 "configure"
+#include "confdefs.h"
+#include <$athena_variant/ThreeD.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7998: \"$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*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ athena_h_path=$athena_variant
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:7955: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:8027: checking for X11/Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7958 "configure"
+#line 8030 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8035: \"$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*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:7980: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:8052: checking for X11/Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7983 "configure"
+#line 8055 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8060: \"$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*
fi
+ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
+ ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
+echo "configure:8092: checking for Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8095 "configure"
+#include "confdefs.h"
+#include <Xaw3d/XawInit.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8100: \"$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*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
+echo "configure:8117: checking for Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8120 "configure"
+#include "confdefs.h"
+#include <Xaw3d/ThreeD.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8125: \"$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*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+ echo "configure: warning: "Assuming that Xaw3d headers are suitable for $athena_variant."" 1>&2
+ athena_h_path=Xaw3d
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
if test -z "$athena_h_path"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8020: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8157: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8023 "configure"
+#line 8160 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8165: \"$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*
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:8063: checking for Xm/Xm.h" >&5
+echo "configure:8200: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8066 "configure"
+#line 8203 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8208: \"$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*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:8088: checking for XmStringFree in -lXm" >&5
+echo "configure:8225: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 8093 "configure"
+#line 8230 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:8104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8241: \"$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
if test "$have_motif" = "yes"; then
echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:8133: checking for Lesstif" >&5
+echo "configure:8270: checking for Lesstif" >&5
cat > conftest.$ac_ext <<EOF
-#line 8135 "configure"
+#line 8272 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
EOF
}
-test "$with_widgets" != "no" && { test "$extra_verbose" = "yes" && cat << \EOF
+test "$with_widgets" != "no" && { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_WIDGETS
EOF
cat >> confdefs.h <<\EOF
}
-test "$with_menubars" != "no" && extra_objs="$extra_objs menubar.o" && if test "$extra_verbose" = "yes"; then
+test "$with_menubars" != "no" && extra_objs="$extra_objs menubar.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"menubar.o\""
fi
-test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar.o" && if test "$extra_verbose" = "yes"; then
+test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"scrollbar.o\""
fi
-test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog.o" && if test "$extra_verbose" = "yes"; then
+test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"dialog.o\""
fi
-test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar.o" && if test "$extra_verbose" = "yes"; then
+test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"toolbar.o\""
fi
if test "$with_x11" = "yes"; then
- test "$with_menubars" != "no" && extra_objs="$extra_objs menubar-x.o" && if test "$extra_verbose" = "yes"; then
+ test "$with_menubars" != "no" && extra_objs="$extra_objs menubar-x.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"menubar-x.o\""
fi
- test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar-x.o" && if test "$extra_verbose" = "yes"; then
+ test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar-x.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"scrollbar-x.o\""
fi
- test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog-x.o" && if test "$extra_verbose" = "yes"; then
+ test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog-x.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"dialog-x.o\""
fi
- test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar-x.o" && if test "$extra_verbose" = "yes"; then
+ test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar-x.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"toolbar-x.o\""
fi
test "$all_widgets" != "no no no no no" && extra_objs="$extra_objs gui-x.o" && if test "$extra_verbose" = "yes"; then
if test "$with_mule" = "yes" ; then
echo "checking for Mule-related features" 1>&6
-echo "configure:8468: checking for Mule-related features" >&5
+echo "configure:8605: checking for Mule-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining MULE
EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8509: checking for $ac_hdr" >&5
+echo "configure:8646: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8512 "configure"
+#line 8649 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8654: \"$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*
echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:8548: checking for strerror in -lintl" >&5
+echo "configure:8685: checking for strerror in -lintl" >&5
ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
xe_check_libs=" -lintl "
cat > conftest.$ac_ext <<EOF
-#line 8553 "configure"
+#line 8690 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
strerror()
; return 0; }
EOF
-if { (eval echo configure:8564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8701: \"$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
fi
echo "checking for Mule input methods" 1>&6
-echo "configure:8616: checking for Mule input methods" >&5
+echo "configure:8753: checking for Mule input methods" >&5
case "$with_xim" in "" | "yes" )
echo "checking for XIM" 1>&6
-echo "configure:8619: checking for XIM" >&5
+echo "configure:8756: checking for XIM" >&5
echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:8622: checking for XOpenIM in -lX11" >&5
+echo "configure:8759: checking for XOpenIM in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 8627 "configure"
+#line 8764 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XOpenIM()
; return 0; }
EOF
-if { (eval echo configure:8638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8775: \"$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
if test "$have_motif $have_lesstif" = "yes no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:8662: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:8799: checking for XmImMbLookupString in -lXm" >&5
ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 8667 "configure"
+#line 8804 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8815: \"$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
if test "$with_xfs" = "yes" ; then
echo "checking for XFontSet" 1>&6
-echo "configure:8743: checking for XFontSet" >&5
+echo "configure:8880: checking for XFontSet" >&5
echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:8746: checking for XmbDrawString in -lX11" >&5
+echo "configure:8883: checking for XmbDrawString in -lX11" >&5
ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 8751 "configure"
+#line 8888 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XmbDrawString()
; return 0; }
EOF
-if { (eval echo configure:8762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8899: \"$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
test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:8802: checking for wnn/jllib.h" >&5
+echo "configure:8939: checking for wnn/jllib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8805 "configure"
+#line 8942 "configure"
#include "confdefs.h"
#include <wnn/jllib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8947: \"$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*
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8835: checking for $ac_func" >&5
+echo "configure:8972: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 8838 "configure"
+#line 8975 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8998: \"$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
test "$ac_cv_func_crypt" != "yes" && {
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:8890: checking for crypt in -lcrypt" >&5
+echo "configure:9027: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcrypt "
cat > conftest.$ac_ext <<EOF
-#line 8895 "configure"
+#line 9032 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
crypt()
; return 0; }
EOF
-if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9043: \"$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
if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:8941: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:9078: checking for jl_dic_list_e in -lwnn" >&5
ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn "
cat > conftest.$ac_ext <<EOF
-#line 8946 "configure"
+#line 9083 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9094: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:8975: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:9112: checking for jl_dic_list_e in -lwnn4" >&5
ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn4 "
cat > conftest.$ac_ext <<EOF
-#line 8980 "configure"
+#line 9117 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:8991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9128: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:9009: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:9146: checking for jl_dic_list_e in -lwnn6" >&5
ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6 "
cat > conftest.$ac_ext <<EOF
-#line 9014 "configure"
+#line 9151 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:9025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9162: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:9043: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:9180: checking for dic_list_e in -lwnn6_fromsrc" >&5
ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6_fromsrc "
cat > conftest.$ac_ext <<EOF
-#line 9048 "configure"
+#line 9185 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:9059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9196: \"$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
if test "$with_wnn6" != "no"; then
echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:9107: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:9244: checking for jl_fi_dic_list in -l$libwnn" >&5
ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$libwnn "
cat > conftest.$ac_ext <<EOF
-#line 9112 "configure"
+#line 9249 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jl_fi_dic_list()
; return 0; }
EOF
-if { (eval echo configure:9123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9260: \"$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
if test "$with_canna" != "no"; then
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:9158: checking for canna/jrkanji.h" >&5
+echo "configure:9295: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9161 "configure"
+#line 9298 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9303: \"$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*
c_switch_site="$c_switch_site -I/usr/local/canna/include"
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:9193: checking for canna/jrkanji.h" >&5
+echo "configure:9330: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9196 "configure"
+#line 9333 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9338: \"$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*
test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:9229: checking for canna/RK.h" >&5
+echo "configure:9366: checking for canna/RK.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9232 "configure"
+#line 9369 "configure"
#include "confdefs.h"
#include <canna/RK.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9374: \"$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*
}
test -z "$with_canna" && {
echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:9260: checking for RkBgnBun in -lRKC" >&5
+echo "configure:9397: checking for RkBgnBun in -lRKC" >&5
ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
xe_check_libs=" -lRKC "
cat > conftest.$ac_ext <<EOF
-#line 9265 "configure"
+#line 9402 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
RkBgnBun()
; return 0; }
EOF
-if { (eval echo configure:9276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9413: \"$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
}
test -z "$with_canna" && {
echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:9299: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:9436: checking for jrKanjiControl in -lcanna" >&5
ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcanna "
cat > conftest.$ac_ext <<EOF
-#line 9304 "configure"
+#line 9441 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jrKanjiControl()
; return 0; }
EOF
-if { (eval echo configure:9315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9452: \"$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
libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:9364: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:9501: checking for layout_object_getvalue in -li18n" >&5
ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
xe_check_libs=" -li18n "
cat > conftest.$ac_ext <<EOF
-#line 9369 "configure"
+#line 9506 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
layout_object_getvalue()
; return 0; }
EOF
-if { (eval echo configure:9380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9517: \"$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
fi
-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask
+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9466: checking for $ac_func" >&5
+echo "configure:9603: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 9469 "configure"
+#line 9606 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:9492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9629: \"$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
done
-
-case "$opsys" in
- linuxaout* | bsdos3* | freebsd* | decosf4-0* | aix4* ) extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then
- echo " xemacs will be linked with \"realpath.o\""
- fi ;;
- * )
- case "$canonical" in
- *-*-sysv4.2uw2* ) extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then
+extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"realpath.o\""
- fi ;;
- * ) for ac_func in realpath
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9533: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9536 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:9559: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- { test "$extra_verbose" = "yes" && cat << EOF
- Defining $ac_tr_func
-EOF
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-}
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
- test "$ac_cv_func_realpath" != "yes" && extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then
- echo " xemacs will be linked with \"realpath.o\""
- fi ;;
- esac ;;
-esac
+ fi
for ac_func in getloadavg
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9595: checking for $ac_func" >&5
+echo "configure:9664: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 9598 "configure"
+#line 9667 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:9621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9690: \"$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
echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:9657: checking for kstat_open in -lkstat" >&5
+echo "configure:9726: checking for kstat_open in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkstat "
cat > conftest.$ac_ext <<EOF
-#line 9662 "configure"
+#line 9731 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
kstat_open()
; return 0; }
EOF
-if { (eval echo configure:9673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9742: \"$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
echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:9707: checking for kvm_read in -lkvm" >&5
+echo "configure:9776: checking for kvm_read in -lkvm" >&5
ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkvm "
cat > conftest.$ac_ext <<EOF
-#line 9712 "configure"
+#line 9781 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
kvm_read()
; return 0; }
EOF
-if { (eval echo configure:9723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9792: \"$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
fi
echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:9757: checking whether netdb declares h_errno" >&5
+echo "configure:9826: checking whether netdb declares h_errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 9759 "configure"
+#line 9828 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
return h_errno;
; return 0; }
EOF
-if { (eval echo configure:9766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:9786: checking for sigsetjmp" >&5
+echo "configure:9855: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 9788 "configure"
+#line 9857 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf bar; sigsetjmp (bar, 0);
; return 0; }
EOF
-if { (eval echo configure:9795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
rm -f conftest*
echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:9815: checking whether localtime caches TZ" >&5
+echo "configure:9884: checking whether localtime caches TZ" >&5
if test "$ac_cv_func_tzset" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 9819 "configure"
+#line 9888 "configure"
#include "confdefs.h"
#include <time.h>
#if STDC_HEADERS
exit (0);
}
EOF
-if { (eval echo configure:9854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
emacs_cv_localtime_cache=no
else
if test "$HAVE_TIMEVAL" = "yes"; then
echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:9884: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:9953: checking whether gettimeofday accepts one or two arguments" >&5
cat > conftest.$ac_ext <<EOF
-#line 9886 "configure"
+#line 9955 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
; return 0; }
EOF
-if { (eval echo configure:9908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""two" 1>&6
else
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:9930: checking for inline" >&5
+echo "configure:9999: checking for inline" >&5
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 9935 "configure"
+#line 10004 "configure"
#include "confdefs.h"
int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:9942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
# 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:9992: checking for working alloca.h" >&5
+echo "configure:10061: checking for working alloca.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9995 "configure"
+#line 10064 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
-char *p = alloca(2 * sizeof(int));
+void *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:10002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10071: \"$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
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:10026: checking for alloca" >&5
+echo "configure:10095: checking for alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 10029 "configure"
+#line 10098 "configure"
#include "confdefs.h"
#ifdef __GNUC__
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:10057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10126: \"$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
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:10096: checking whether alloca needs Cray hooks" >&5
+echo "configure:10165: checking whether alloca needs Cray hooks" >&5
cat > conftest.$ac_ext <<EOF
-#line 10099 "configure"
+#line 10168 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
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:10123: checking for $ac_func" >&5
+echo "configure:10192: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 10126 "configure"
+#line 10195 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:10149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10218: \"$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
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:10179: checking stack direction for C alloca" >&5
+echo "configure:10248: checking stack direction for C alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 10182 "configure"
+#line 10251 "configure"
#include "confdefs.h"
find_stack_direction ()
{
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:10201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_stack_direction=1
else
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:10230: checking for vfork.h" >&5
+echo "configure:10299: checking for vfork.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10233 "configure"
+#line 10302 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10307: \"$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*
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:10266: checking for working vfork" >&5
+echo "configure:10335: checking for working vfork" >&5
cat > conftest.$ac_ext <<EOF
-#line 10269 "configure"
+#line 10338 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
}
}
EOF
-if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_vfork_works=yes
else
echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:10390: checking for working strcoll" >&5
+echo "configure:10459: checking for working strcoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 10393 "configure"
+#line 10462 "configure"
#include "confdefs.h"
#include <string.h>
main ()
strcoll ("123", "456") >= 0);
}
EOF
-if { (eval echo configure:10403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_strcoll_works=yes
else
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10431: checking for $ac_func" >&5
+echo "configure:10500: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 10434 "configure"
+#line 10503 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10526: \"$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
done
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:10485: checking whether getpgrp takes no argument" >&5
+echo "configure:10554: checking whether getpgrp takes no argument" >&5
cat > conftest.$ac_ext <<EOF
-#line 10488 "configure"
+#line 10557 "configure"
#include "confdefs.h"
/*
}
EOF
-if { (eval echo configure:10543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_getpgrp_void=yes
else
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:10570: checking for working mmap" >&5
+echo "configure:10639: checking for working mmap" >&5
case "$opsys" in ultrix* ) have_mmap=no ;; *)
cat > conftest.$ac_ext <<EOF
-#line 10573 "configure"
+#line 10642 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <unistd.h>
return 1;
}
EOF
-if { (eval echo configure:10606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
have_mmap=yes
else
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:10641: checking for termios.h" >&5
+echo "configure:10710: checking for termios.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10644 "configure"
+#line 10713 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10718: \"$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*
echo "$ac_t""no" 1>&6
ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:10692: checking for termio.h" >&5
+echo "configure:10761: checking for termio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10695 "configure"
+#line 10764 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10769: \"$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*
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:10732: checking for socket" >&5
+echo "configure:10801: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 10735 "configure"
+#line 10804 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
; return 0; }
EOF
-if { (eval echo configure:10758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
echo "$ac_t""yes" 1>&6
ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:10773: checking for netinet/in.h" >&5
+echo "configure:10842: checking for netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10776 "configure"
+#line 10845 "configure"
#include "confdefs.h"
#include <netinet/in.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10850: \"$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*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:10798: checking for arpa/inet.h" >&5
+echo "configure:10867: checking for arpa/inet.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10801 "configure"
+#line 10870 "configure"
#include "confdefs.h"
#include <arpa/inet.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10875: \"$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*
}
echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:10831: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:10900: checking "for sun_len member in struct sockaddr_un"" >&5
cat > conftest.$ac_ext <<EOF
-#line 10833 "configure"
+#line 10902 "configure"
#include "confdefs.h"
#include <sys/types.h>
static struct sockaddr_un x; x.sun_len = 1;
; return 0; }
EOF
-if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_SOCKADDR_SUN_LEN
fi
rm -f conftest*
echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:10862: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:10931: checking "for ip_mreq struct in netinet/in.h"" >&5
cat > conftest.$ac_ext <<EOF
-#line 10864 "configure"
+#line 10933 "configure"
#include "confdefs.h"
#include <sys/types.h>
static struct ip_mreq x;
; return 0; }
EOF
-if { (eval echo configure:10874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MULTICAST
echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:10905: checking for msgget" >&5
+echo "configure:10974: checking for msgget" >&5
cat > conftest.$ac_ext <<EOF
-#line 10908 "configure"
+#line 10977 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char msgget(); below. */
; return 0; }
EOF
-if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_msgget=yes"
else
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:10946: checking for sys/ipc.h" >&5
+echo "configure:11015: checking for sys/ipc.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10949 "configure"
+#line 11018 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11023: \"$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*
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:10971: checking for sys/msg.h" >&5
+echo "configure:11040: checking for sys/msg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10974 "configure"
+#line 11043 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11048: \"$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*
ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:11017: checking for dirent.h" >&5
+echo "configure:11086: checking for dirent.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11020 "configure"
+#line 11089 "configure"
#include "confdefs.h"
#include <dirent.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11094: \"$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*
echo "$ac_t""no" 1>&6
ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:11052: checking for sys/dir.h" >&5
+echo "configure:11121: checking for sys/dir.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11055 "configure"
+#line 11124 "configure"
#include "confdefs.h"
#include <sys/dir.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11129: \"$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*
ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:11093: checking for nlist.h" >&5
+echo "configure:11162: checking for nlist.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11096 "configure"
+#line 11165 "configure"
#include "confdefs.h"
#include <nlist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11170: \"$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*
echo "checking "for sound support"" 1>&6
-echo "configure:11131: checking "for sound support"" >&5
+echo "configure:11200: checking "for sound support"" >&5
test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
if test "$with_native_sound" != "no"; then
if test -n "$native_sound_lib"; then
ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:11138: checking for multimedia/audio_device.h" >&5
+echo "configure:11207: checking for multimedia/audio_device.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11141 "configure"
+#line 11210 "configure"
#include "confdefs.h"
#include <multimedia/audio_device.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11215: \"$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*
if test -z "$native_sound_lib"; then
echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:11194: checking for ALopenport in -laudio" >&5
+echo "configure:11263: checking for ALopenport in -laudio" >&5
ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 11199 "configure"
+#line 11268 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
ALopenport()
; return 0; }
EOF
-if { (eval echo configure:11210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11279: \"$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
if test -z "$native_sound_lib"; then
echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:11241: checking for AOpenAudio in -lAlib" >&5
+echo "configure:11310: checking for AOpenAudio in -lAlib" >&5
ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
xe_check_libs=" -lAlib "
cat > conftest.$ac_ext <<EOF
-#line 11246 "configure"
+#line 11315 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
AOpenAudio()
; return 0; }
EOF
-if { (eval echo configure:11257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11326: \"$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
for dir in "machine" "sys" "linux"; do
ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:11295: checking for ${dir}/soundcard.h" >&5
+echo "configure:11364: checking for ${dir}/soundcard.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11298 "configure"
+#line 11367 "configure"
#include "confdefs.h"
#include <${dir}/soundcard.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11372: \"$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*
if test "$with_nas_sound" != "no"; then
ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:11357: checking for audio/audiolib.h" >&5
+echo "configure:11426: checking for audio/audiolib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11360 "configure"
+#line 11429 "configure"
#include "confdefs.h"
#include <audio/audiolib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11434: \"$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*
echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:11383: checking for AuOpenServer in -laudio" >&5
+echo "configure:11452: checking for AuOpenServer in -laudio" >&5
ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 11388 "configure"
+#line 11457 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
AuOpenServer()
; return 0; }
EOF
-if { (eval echo configure:11399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11468: \"$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
fi
libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
cat > conftest.$ac_ext <<EOF
-#line 11438 "configure"
+#line 11507 "configure"
#include "confdefs.h"
#include <audio/Xtutil.h>
EOF
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11469: checking for $ac_word" >&5
+echo "configure:11538: checking for $ac_word" >&5
if test -n "$have_esd_config"; then
ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:11498: checking for esd_play_stream" >&5
+echo "configure:11567: checking for esd_play_stream" >&5
cat > conftest.$ac_ext <<EOF
-#line 11501 "configure"
+#line 11570 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char esd_play_stream(); below. */
; return 0; }
EOF
-if { (eval echo configure:11524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_esd_play_stream=yes"
else
if test "$with_tty" = "yes" ; then
echo "checking for TTY-related features" 1>&6
-echo "configure:11575: checking for TTY-related features" >&5
+echo "configure:11644: checking for TTY-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_TTY
EOF
if test -z "$with_ncurses"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:11591: checking for tgetent in -lncurses" >&5
+echo "configure:11660: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lncurses "
cat > conftest.$ac_ext <<EOF
-#line 11596 "configure"
+#line 11665 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:11607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11676: \"$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
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:11640: checking for ncurses/curses.h" >&5
+echo "configure:11709: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11643 "configure"
+#line 11712 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11717: \"$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*
ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:11670: checking for ncurses/term.h" >&5
+echo "configure:11739: checking for ncurses/term.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11673 "configure"
+#line 11742 "configure"
#include "confdefs.h"
#include <ncurses/term.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11747: \"$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*
c_switch_site="$c_switch_site -I/usr/include/ncurses"
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:11708: checking for ncurses/curses.h" >&5
+echo "configure:11777: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11711 "configure"
+#line 11780 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11785: \"$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*
for lib in curses termlib termcap; do
echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:11751: checking for tgetent in -l$lib" >&5
+echo "configure:11820: checking for tgetent in -l$lib" >&5
ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$lib "
cat > conftest.$ac_ext <<EOF
-#line 11756 "configure"
+#line 11825 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11836: \"$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
else
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:11798: checking for tgetent in -lcurses" >&5
+echo "configure:11867: checking for tgetent in -lcurses" >&5
ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcurses "
cat > conftest.$ac_ext <<EOF
-#line 11803 "configure"
+#line 11872 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:11814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11883: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:11832: checking for tgetent in -ltermcap" >&5
+echo "configure:11901: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltermcap "
cat > conftest.$ac_ext <<EOF
-#line 11837 "configure"
+#line 11906 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
tgetent()
; return 0; }
EOF
-if { (eval echo configure:11848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11917: \"$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
test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:11896: checking for gpm.h" >&5
+echo "configure:11965: checking for gpm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11899 "configure"
+#line 11968 "configure"
#include "confdefs.h"
#include <gpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11973: \"$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*
}
test -z "$with_gpm" && {
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:11927: checking for Gpm_Open in -lgpm" >&5
+echo "configure:11996: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgpm "
cat > conftest.$ac_ext <<EOF
-#line 11932 "configure"
+#line 12001 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:11943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12012: \"$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
test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no" && echo "checking for database support" 1>&6
-echo "configure:11993: checking for database support" >&5
+echo "configure:12062: checking for database support" >&5
if test "$with_database_gdbm $with_database_dbm" != "no no"; then
ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:11998: checking for ndbm.h" >&5
+echo "configure:12067: checking for ndbm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12001 "configure"
+#line 12070 "configure"
#include "confdefs.h"
#include <ndbm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12075: \"$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*
if test "$with_database_gdbm" != "no"; then
echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:12036: checking for dbm_open in -lgdbm" >&5
+echo "configure:12105: checking for dbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdbm "
cat > conftest.$ac_ext <<EOF
-#line 12041 "configure"
+#line 12110 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:12052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12121: \"$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
if test "$with_database_dbm" != "no"; then
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:12080: checking for dbm_open" >&5
+echo "configure:12149: checking for dbm_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 12083 "configure"
+#line 12152 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dbm_open(); below. */
; return 0; }
EOF
-if { (eval echo configure:12106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dbm_open=yes"
else
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:12125: checking for dbm_open in -ldbm" >&5
+echo "configure:12194: checking for dbm_open in -ldbm" >&5
ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldbm "
cat > conftest.$ac_ext <<EOF
-#line 12130 "configure"
+#line 12199 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:12141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12210: \"$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
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:12182: checking for Berkeley db.h" >&5
+echo "configure:12251: checking for Berkeley db.h" >&5
for path in "db/db.h" "db.h"; do
cat > conftest.$ac_ext <<EOF
-#line 12185 "configure"
+#line 12254 "configure"
#include "confdefs.h"
#ifdef HAVE_INTTYPES_H
#define __BIT_TYPES_DEFINED__
; return 0; }
EOF
-if { (eval echo configure:12203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_path="$path"; break
else
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:12219: checking for Berkeley DB version" >&5
+echo "configure:12288: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 12221 "configure"
+#line 12290 "configure"
#include "confdefs.h"
#include <$db_h_path>
#if DB_VERSION_MAJOR > 1
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:12240: checking for $dbfunc" >&5
+echo "configure:12309: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 12243 "configure"
+#line 12312 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
; return 0; }
EOF
-if { (eval echo configure:12266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$dbfunc=yes"
else
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:12285: checking for $dbfunc in -ldb" >&5
+echo "configure:12354: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 12290 "configure"
+#line 12359 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:12301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12370: \"$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
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:12365: checking for SOCKSinit in -lsocks" >&5
+echo "configure:12434: checking for SOCKSinit in -lsocks" >&5
ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocks "
cat > conftest.$ac_ext <<EOF
-#line 12370 "configure"
+#line 12439 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:12381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12450: \"$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
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:12436: checking for module support" >&5
+echo "configure:12505: checking for module support" >&5
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:12440: checking for dlfcn.h" >&5
+echo "configure:12509: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12443 "configure"
+#line 12512 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12517: \"$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*
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:12466: checking for dlopen in -ldl" >&5
+echo "configure:12535: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldl "
cat > conftest.$ac_ext <<EOF
-#line 12471 "configure"
+#line 12540 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:12482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12551: \"$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
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:12501: checking for dlopen in -lc" >&5
+echo "configure:12570: checking for dlopen in -lc" >&5
ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
xe_check_libs=" -lc "
cat > conftest.$ac_ext <<EOF
-#line 12506 "configure"
+#line 12575 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:12517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12586: \"$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
else
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:12556: checking for shl_load in -ldld" >&5
+echo "configure:12625: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 12561 "configure"
+#line 12630 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shl_load()
; return 0; }
EOF
-if { (eval echo configure:12572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12641: \"$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
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:12599: checking for dld_init in -ldld" >&5
+echo "configure:12668: checking for dld_init in -ldld" >&5
ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 12604 "configure"
+#line 12673 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dld_init()
; return 0; }
EOF
-if { (eval echo configure:12615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12684: \"$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
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:12660: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:12729: checking how to build dynamic libraries for ${xehost}" >&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
XEGCC=yes
else
echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:12688: checking checking whether we are using GNU C" >&5
+echo "configure:12757: checking checking whether we are using GNU C" >&5
cat > conftest.$ac_ext <<EOF
-#line 12690 "configure"
+#line 12759 "configure"
#include "confdefs.h"
#ifdef __GNUC__
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:12712: checking how to produce PIC code" >&5
+echo "configure:12781: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
# Check to make sure the dll_cflags actually works.
echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:12805: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:12874: checking if PIC flag ${dll_cflags} really works" >&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 12809 "configure"
+#line 12878 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:12816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:12847: checking if C compiler can produce shared libraries" >&5
+echo "configure:12916: checking if C compiler can produce shared libraries" >&5
if test "$XEGCC" = yes; then
xcldf="-shared"
xldf="-shared"
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
cat > conftest.$ac_ext <<EOF
-#line 12898 "configure"
+#line 12967 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:12905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
if test "$XEGCC" = 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:12930: checking for ld used by GCC" >&5
+echo "configure:12999: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:12955: checking for GNU ld" >&5
+echo "configure:13024: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
# Check to see if it really is or isn't GNU ld.
echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:12993: checking if the linker is GNU ld" >&5
+echo "configure:13062: checking if the linker is GNU ld" >&5
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
xe_gnu_ld=yes
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:13020: checking whether the linker supports shared libraries" >&5
+echo "configure:13089: checking whether the linker supports shared libraries" >&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13235: checking for $ac_func" >&5
+echo "configure:13304: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13238 "configure"
+#line 13307 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13330: \"$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
fi
cat > conftest.$ac_ext <<EOF
-#line 13300 "configure"
+#line 13369 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:13304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
use_union_type="no"
with_dnet=""
pdump="no"
+dnl dragndrop is still experimental. When it is stable, comment out the following line:
+with_dragndrop="no"
dnl ------------------
dnl Options Processing
if test "${debug:=$beta}" = "yes"; then
use_assertions=yes memory_usage_stats=yes
XE_ADD_OBJS(debug.o)
+ XE_ADD_OBJS(tests.o)
AC_DEFINE(DEBUG_XEMACS)
fi
test "$use_assertions" = "yes" && AC_DEFINE(USE_ASSERTIONS)
alpha*-*-* ) machine=alpha ;;
vax-*-* ) machine=vax ;;
mips-dec-* ) machine=pmax ;;
+ mips-sgi-irix6* ) machine=iris6d ;;
mips-sgi-* ) machine=iris4d ;;
mips*-linux ) machine=mips ;;
romp-ibm-* ) machine=ibmrt ;;
mips-sony-* ) machine=news-risc ;;
clipper-* ) machine=clipper ;;
arm-* ) machine=arm ;;
+ armv[34][lb]-* ) machine=arm ;;
ns32k-* ) machine=ns32000 ;;
esac
dnl Following values of CFLAGS are known to work well.
dnl Should we take debugging options into consideration?
if test "$GCC" = "yes"; then
- CFLAGS="-g -O3 -Wall -Wno-switch"
+ CFLAGS="-g -O3 -Wall -Wno-switch -Wpointer-arith -Winline -Wmissing-prototypes -Wshadow"
dnl I'm not convinced this is a good idea any more. -sb
dnl test "$opsys $machine" = "linux intel386" && \
dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
dnl Extra system-specific library directories - please add to list
for dir in "/usr/ccs/lib"; do
- test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_site)
+ test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_system)
done
dnl --site-runtime-libraries (multiple dirs)
export LD_RUN_PATH
fi
+dnl Linux systems have dynamic runtime library directories listed in
+dnl /etc/ld.so.conf. Since those are used at run time, it seems pretty
+dnl safe to use them at link time, and less controversial than forcing
+dnl the run-time to use the link-time libraries. This also helps avoid
+dnl mismatches between the link-time and run-time libraries.
+
+dnl #### Unfortunately, there are horrible libc4 and libc5 libraries
+dnl listed in /etc/ld.so.conf on some systems, and including them on
+dnl the link path leads to linking in utterly broken libc's.
+dnl There are many clever ways of approaching this problem,
+dnl but finding out that actually works...
+
+dnl if test -z "$LD_RUN_PATH" -a -r "/etc/ld.so.conf"; then
+dnl for dir in `cat /etc/ld.so.conf`; do
+dnl test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_system)
+dnl done
+dnl add_runtime_path=no
+dnl fi
+
dnl -------------------------------------
dnl Compute runtime library path
dnl -------------------------------------
-if test "$dynamic" = "no"; then add_runtime_path=no
+if test -n "$add_runtime_path"; then :;
+elif test "$dynamic" = "no"; then add_runtime_path=no
elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
else case "$opsys" in
sol2 | irix* | *bsd* | decosf* ) add_runtime_path=yes ;;
if test "$with_msw" = "yes"; then
AC_DEFINE(HAVE_MS_WINDOWS)
install_pp="$blddir/lib-src/installexe.sh"
- XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32, libs_system)
+ XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32 -lwinspool, libs_system)
test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)
if test "$window_system" != x11; then
window_system=msw
AC_CHECK_HEADER(X11/$athena_variant/ThreeD.h,
athena_h_path=X11/$athena_variant,))
+ dnl Is the variant specific header directory directly under include?
+ if test -z "$athena_h_path"; then
+ AC_CHECK_HEADER($athena_variant/XawInit.h,
+ AC_CHECK_HEADER($athena_variant/ThreeD.h,
+ athena_h_path=$athena_variant,))
+ fi
+
dnl If we couldn't find the specific variant, try the generic Athena 3d headers
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
AC_CHECK_HEADER(X11/Xaw3d/XawInit.h,
],))
fi
+ dnl Also generic 3d headers directly under include dir
+ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
+ AC_CHECK_HEADER(Xaw3d/XawInit.h,
+ AC_CHECK_HEADER(Xaw3d/ThreeD.h,
+ [
+ AC_MSG_WARN("Assuming that Xaw3d headers are suitable for $athena_variant.")
+ athena_h_path=Xaw3d
+ ],))
+ fi
+
dnl If nothing yet found, see if Xaw is a 3d header set...
dnl We AC_MSG_WARN if we fail because I am all out of ideas...
if test -z "$athena_h_path"; then
test "$with_scrollbars" != "no" && AC_DEFINE(HAVE_SCROLLBARS)
test "$with_dialogs" != "no" && AC_DEFINE(HAVE_DIALOGS)
test "$with_toolbars" != "no" && AC_DEFINE(HAVE_TOOLBARS)
-test "$with_widgets" != "no" && AC_DEFINE(HAVE_WIDGETS)
+test "$with_widgets" != "no" && AC_DEFINE(HAVE_WIDGETS)
test "$with_menubars" = "lucid" && AC_DEFINE(LWLIB_MENUBARS_LUCID)
test "$with_scrollbars" = "lucid" && AC_DEFINE(LWLIB_SCROLLBARS_LUCID)
test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
-test "$with_menubars" != "no" && XE_ADD_OBJS(menubar.o)
-test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar.o)
-test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog.o)
-test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar.o)
+test "$with_menubars" != "no" && XE_ADD_OBJS(menubar.o)
+test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar.o)
+test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog.o)
+test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar.o)
if test "$with_x11" = "yes"; then
- test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o)
- test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o)
- test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o)
- test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-x.o)
+ test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o)
+ test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o)
+ test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o)
+ test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-x.o)
test "$all_widgets" != "no no no no no" && XE_ADD_OBJS(gui-x.o)
fi
XE_COMPUTE_RUNPATH()
fi
-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask)
-
-dnl realpath is buggy on linux, decosf and aix4
+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask)
-dnl The realpath() in linux libc (4.6.27) sometimes fails with ELOOP.
-dnl The realpath in ELF linux libc's is O.K.
-dnl For example, call realpath on a file thirty-five or so directories deep
-dnl and you get ELOOP even if no symlinks at all are involved.
-dnl Reports as of 11/1997 indicate BSDi has problems too.
-dnl The realpath() in UnixWare2.1.3 could not get any pathname fragment in error condition.
-case "$opsys" in
- linuxaout* | bsdos3* | freebsd* | decosf4-0* | aix4* ) XE_ADD_OBJS(realpath.o) ;;
- * )
- case "$canonical" in
- *-*-sysv4.2uw2* ) XE_ADD_OBJS(realpath.o) ;;
- * ) AC_CHECK_FUNCS(realpath)
- test "$ac_cv_func_realpath" != "yes" && XE_ADD_OBJS(realpath.o) ;;
- esac ;;
-esac
+dnl Use our own realpath always.
+XE_ADD_OBJS(realpath.o)
dnl Check whether the system provides getloadavg (Solaris 7 has it)
AC_CHECK_FUNCS(getloadavg)
To bytecompile both of these files the command is:
xemacs-21.0 -vanilla -batch -f batch-byte-compile \
- lisp-utils/auto-autoloads.el lisp-utils/custom-laod.el
+ lisp-utils/auto-autoloads.el lisp-utils/custom-load.el
** Building XEmacs and XEmacs packages from scratch
===================================================
* Changes in XEmacs 21.2
========================
-** `delete-key-deletes-forward' now defaults to t.
+** The delete key now deletes forward by default.
-`delete-key-deletes-forward' is the variable that regulates the
-behaviour of the delete key on the systems that offer both a backspace
-and a delete key. If set to nil, the key labeled "Delete" will delete
-backward. If set to non-nil, the "Delete" key will delete forward,
-except on keyboards where a "Backspace" key is not provided.
+This is regulated by the variable `delete-key-deletes-forward', which
+now defaults to t. `delete-key-deletes-forward' takes effect only on
+the systems that offer both a backspace and a delete key. If set to
+nil, the key labeled "Delete" will always delete backward. If set to
+non-nil, the "Delete" key will delete forward, except on keyboards
+where a "Backspace" key is not provided (e.g. old DEC keyboards.)
Unless our implementation has bugs, the only reason why you would want
to set `delete-key-deletes-forward' to nil is if you want to use the
searches, like `zap-to-char', `list-matching-lines', `tags-search'
etc. The incremental search facility has always behaved that way.
+** Incremental search will now highlight all visible matches, making
+it easier to anticipate where consecutive C-s or C-r will place the
+point. If you want to disable the feature, set
+`isearch-highlight-all-matches' to nil.
+
+** You can now use the buffer tabs to switch between buffers. The
+tabs are located between the toolbar and the uppermost window, in a
+location called "gutter". If you dislike the buffer tabs, you can
+disable them by specifying:
+
+ (set-specifier default-gutter-visible-p nil)
+
+in your `.emacs'. You can change the location of the gutter with
+`set-default-gutter-position', however currently only MS-Windows
+supports tab widgets with orientations other than vertical..
+
+** When you press RET at a minibuffer prompt that provides a default
+value, the value is stored in history instead of an empty line. Also,
+you can now edit the default value by pressing the down arrow,
+accessing the logical "future" value. Not all minibuffer prompts have
+yet been converted to support this feature.
+
** The rectangle functions have been almost completely rewritten in
order to avoid inserting undesirable spaces, notably at the end of
lines. Two typical examples of the old behavior were
understands the special value `coerce', which means that the line
should not be filled if it is too short to reach the desired column.
-** Incremental search will now highlight all visible matches, making
-it easier to anticipate where consecutive C-s or C-r will place the
-point. If you want to disable the feature, set
-`isearch-highlight-all-matches' to nil.
-
-** You can now customize and save comments for faces and variables.
-In Custom buffers, a new menu entry allows you to add and edit a
-comment. Comments for variables can also be assigned by calling
-`customize-set-(value|variable)' with a prefix argument.
+** Customize now supports adding comments about your face and variable
+settings using a new menu entry. Comments for variables can also be
+assigned by calling `customize-set-(value|variable)' with a prefix
+argument.
** XEmacs now locates the early package hierarchies at
~/.xemacs/mule-packages/ and ~/.xemacs/xemacs-packages/. Previously,
If you set this variable to nil then pressing the Alt key under
MS-Windows will no longer activate the menubar. The default is t.
+** Pixel-based scrolling has been implemented.
+By default this will attempt to scroll in increments equal to the
+height of the default face. Set `window-pixel-scroll-increment' to
+modify this behaviour.
+
** Etags changes.
*** In DOS, etags looks for file.cgz if it cannot find file.c.
*** New option --ignore-case-regex is an alternative to --regex. It is now
possible to bind a regexp to a language, by prepending the regexp with
-{lang}, where lang is one of the languages that `etags --help' prints out.
-This feature is useful especially for regex files, where each line contains
-a regular expression. The manual contains details.
+{lang}, where lang is one of the languages that `etags --help' prints
+out. This feature is useful especially for regex files, where each
+line contains a regular expression. The manual contains details.
*** In C and derived languages, etags creates tags for function
declarations when given the --declarations option.
* Lisp and internal changes in XEmacs 21.2
==========================================
-** A new portable dumper is available.
+** A new portable dumper is available for beta testing.
Olivier Galibert has written a portable dumper for XEmacs, based on
initial work by Kyle Jones. Normally, XEmacs C sources link into an
can try it out by simply running `src/temacs'. If it starts without
failure, the portable dumping worked.
+#### NOTE: the portable dumper is not really usable yet, because the
+state of built-in variables is not yet saved. Olivier promised to fix
+it. Nag, nag.
+
** Much effort has been invested to make XEmacs Lisp faster:
*** Many basic lisp operations are now faster.
buttons, scrollbars, combo boxes, edit fields and progress gauges in a
buffer. As a side effect subwindow support now works once again.
-All of this is still very experimental. This feature is currently
-more complete under MS-Windows.
+All of this is still fairly experimental and there is no
+documentation. The current APIs might change in a future version of
+XEmacs. Some widgets are only available under MS-Windows. See the
+file glyphs-test.el in the XEmacs src distribution for examples of
+usage.
-** user-init-directory is now an absolute, unexpanded path.
-Previously, `user-init-directory' used to be relative to
-(concat "~" init-file-user). This turned out to be too complicated
-for most packages (and some core Lisp files) to use correctly.
+The buffers-tab functionality and progress gauge have been implemented
+using this feature.
-Also, `init-file-user' has been obsoleted in the process.
+** `user-init-file' and `user-init-directory' are now absolute
+file/directory names. Previously, both variables used to be relative
+to (concat "~" init-file-user). This turned out to be too complicated
+for most packages (and some core Lisp files) to use correctly. Also,
+the `init-file-user' variable has been obsoleted in the process.
+
+The user-visible options like `-u' have not changed their behaviour.
** XEmacs finally has an automated test suite!
Although this is not yet very sophisticated, it is already responsible
`base64-encode-region', `base64-encode-string', `base64-decode-region'
and `base64-decode-string'.
+** The functions `read-string', `read-expression', `eval-minibuffer',
+`read-variable', `read-command', `read-function', `read-number',
+`read-shell-command', `read-from-minibuffer', and `completing-read'
+now take an additional argument which specifies the default value. If
+this argument is non-nil, it should be a string; that string is used
+in two ways:
+
+ It is returned if the user enters empty input.
+ It is available through the history command M-n.
+
+** LDAP changes.
+
+*** The LDAP interface now consists of two layers, a low-level layer
+that closely matches the LDAP C API, and a more convenient
+higher-level set of functions.
+
+*** The low-level functions that used to be named *-internal are now
+named more simply: `ldap-open', `ldap-close', `ldap-search-basic',
+`ldap-add', and `ldap-modify'. They should be used directly for very
+specific purposes (such as multiple operations on a connection) only.
+
+*** The higher-level functions provide a more convenient way to access
+LDAP directories hiding the subtleties of handling the connection,
+translating arguments and ensuring compliance with LDAP
+internationalization rules and formats (currently partly implemented
+only.) This layer provides atomic operations for searches,
+modification, addition and deletion of multiple entries at once:
+`ldap-search-entries', `ldap-add-entries', `ldap-delete-entries', and
+`ldap-modify-entries'.
+
+*** To maintain compatibility with previous code, the now obsolete
+function `ldap-search' is now merely a wrapper that calls either
+`ldap-search-basic' or `ldap-search-entries'. Please don't use the
+`ldap-search' function in your new programs -- a direct call to one of
+the two replacements is more efficient and unambiguous.
+
** The arguments to `locate-file' are now more Lisp-like. As before,
the usage is:
\1f
Indirect:
cl.info-1: 1164
-cl.info-2: 46335
-cl.info-3: 89116
-cl.info-4: 138874
-cl.info-5: 176870
-cl.info-6: 219475
+cl.info-2: 46306
+cl.info-3: 89087
+cl.info-4: 138385
+cl.info-5: 176381
+cl.info-6: 218986
\1f
Tag Table:
(Indirect)
Node: Organization\7f5645
Node: Installation\7f7468
Node: Naming Conventions\7f8621
-Node: Program Structure\7f10760
-Node: Argument Lists\7f11228
-Node: Time of Evaluation\7f21011
-Node: Function Aliases\7f26991
-Node: Predicates\7f27575
-Node: Type Predicates\7f27895
-Node: Equality Predicates\7f32937
-Node: Control Structure\7f35713
-Node: Assignment\7f36517
-Node: Generalized Variables\7f37758
-Node: Basic Setf\7f39065
-Node: Modify Macros\7f46335
-Node: Customizing Setf\7f53544
-Node: Variable Bindings\7f60833
-Node: Dynamic Bindings\7f61414
-Node: Lexical Bindings\7f62304
-Node: Function Bindings\7f66408
-Node: Macro Bindings\7f68795
-Node: Conditionals\7f71718
-Node: Blocks and Exits\7f74801
-Node: Iteration\7f77857
-Node: Loop Facility\7f83330
-Node: Loop Basics\7f84257
-Node: Loop Examples\7f86857
-Node: For Clauses\7f89116
-Node: Iteration Clauses\7f100993
-Node: Accumulation Clauses\7f102834
-Node: Other Clauses\7f105178
-Node: Multiple Values\7f111247
-Node: Macros\7f113140
-Node: Declarations\7f116358
-Node: Symbols\7f124850
-Node: Property Lists\7f125150
-Node: Creating Symbols\7f128351
-Node: Numbers\7f130429
-Node: Predicates on Numbers\7f130909
-Node: Numerical Functions\7f131938
-Node: Random Numbers\7f136165
-Node: Implementation Parameters\7f138874
-Node: Sequences\7f142446
-Node: Sequence Basics\7f143119
-Node: Mapping over Sequences\7f146697
-Node: Sequence Functions\7f152551
-Node: Searching Sequences\7f158726
-Node: Sorting Sequences\7f161763
-Node: Lists\7f164311
-Node: List Functions\7f164736
-Node: Substitution of Expressions\7f168999
-Node: Lists as Sets\7f170885
-Node: Association Lists\7f174947
-Node: Hash Tables\7f176650
-Node: Structures\7f176870
-Node: Assertions\7f191653
-Node: Efficiency Concerns\7f194596
-Node: Common Lisp Compatibility\7f200923
-Node: Old CL Compatibility\7f204079
-Node: Porting Common Lisp\7f208462
-Node: Function Index\7f219475
-Node: Variable Index\7f230738
+Node: Program Structure\7f10748
+Node: Argument Lists\7f11216
+Node: Time of Evaluation\7f20999
+Node: Function Aliases\7f26979
+Node: Predicates\7f27563
+Node: Type Predicates\7f27883
+Node: Equality Predicates\7f32925
+Node: Control Structure\7f35701
+Node: Assignment\7f36505
+Node: Generalized Variables\7f37746
+Node: Basic Setf\7f39053
+Node: Modify Macros\7f46306
+Node: Customizing Setf\7f53515
+Node: Variable Bindings\7f60804
+Node: Dynamic Bindings\7f61385
+Node: Lexical Bindings\7f62275
+Node: Function Bindings\7f66379
+Node: Macro Bindings\7f68766
+Node: Conditionals\7f71689
+Node: Blocks and Exits\7f74772
+Node: Iteration\7f77828
+Node: Loop Facility\7f83301
+Node: Loop Basics\7f84228
+Node: Loop Examples\7f86828
+Node: For Clauses\7f89087
+Node: Iteration Clauses\7f100964
+Node: Accumulation Clauses\7f102805
+Node: Other Clauses\7f105149
+Node: Multiple Values\7f111218
+Node: Macros\7f113111
+Node: Declarations\7f116329
+Node: Symbols\7f124821
+Node: Property Lists\7f125113
+Node: Creating Symbols\7f127862
+Node: Numbers\7f129940
+Node: Predicates on Numbers\7f130420
+Node: Numerical Functions\7f131449
+Node: Random Numbers\7f135676
+Node: Implementation Parameters\7f138385
+Node: Sequences\7f141957
+Node: Sequence Basics\7f142630
+Node: Mapping over Sequences\7f146208
+Node: Sequence Functions\7f152062
+Node: Searching Sequences\7f158237
+Node: Sorting Sequences\7f161274
+Node: Lists\7f163822
+Node: List Functions\7f164247
+Node: Substitution of Expressions\7f168510
+Node: Lists as Sets\7f170396
+Node: Association Lists\7f174458
+Node: Hash Tables\7f176161
+Node: Structures\7f176381
+Node: Assertions\7f191164
+Node: Efficiency Concerns\7f194107
+Node: Common Lisp Compatibility\7f200434
+Node: Old CL Compatibility\7f203590
+Node: Porting Common Lisp\7f207973
+Node: Function Index\7f218986
+Node: Variable Index\7f230192
\1f
End Tag Table
name:
defun* defsubst* defmacro* function*
- member* assoc* rassoc* get*
- remove* delete* mapcar* sort*
- floor* ceiling* truncate* round*
- mod* rem* random*
+ member* assoc* rassoc* remove*
+ delete* mapcar* sort* floor*
+ ceiling* truncate* round* mod*
+ rem* random*
Internal function and variable names in the package are prefixed by
`cl-'. Here is a complete list of functions _not_ prefixed by `cl-'
nth rest first .. tenth
aref elt nthcdr
symbol-function symbol-value symbol-plist
- get get* getf
- gethash subseq
+ get getf gethash
+ subseq
Note that for `nthcdr' and `getf', the list argument of the
function must itself be a valid PLACE form. For example,
* Menu:
-* Property Lists:: `get*', `remprop', `getf', `remf'
+* Property Lists:: `remprop', `getf', `remf'
* Creating Symbols:: `gensym', `gentemp'
\1f
functions for working with property lists as first-class data
structures not attached to particular symbols.
- - Function: get* symbol property &optional default
- This function is like `get', except that if the property is not
- found, the DEFAULT argument provides the return value. (The Emacs
- Lisp `get' function always uses `nil' as the default; this
- package's `get*' is equivalent to Common Lisp's `get'.)
-
- The `get*' function is `setf'-able; when used in this fashion, the
- DEFAULT argument is allowed but ignored.
-
- Function: remprop symbol property
This function removes the entry for PROPERTY from the property
list of SYMBOL. It returns a true value if the property was
(put sym prop val) == (setf (getf (symbol-plist sym) prop) val)
- The `get' and `get*' functions are also `setf'-able. The fact
- that `default' is ignored can sometimes be useful:
+ The `get' function is also `setf'-able. The fact that `default'
+ is ignored can sometimes be useful:
- (incf (get* 'foo 'usage-count 0))
+ (incf (get 'foo 'usage-count 0))
Here, symbol `foo''s `usage-count' property is incremented if it
exists, or set to 1 (an incremented 0) otherwise.
* gcd: Numerical Functions.
* gensym: Creating Symbols.
* gentemp: Creating Symbols.
-* get*: Property Lists.
* get-setf-method: Customizing Setf.
* getf: Property Lists.
* ignore-errors: Assertions.
Firstly, Elisp is an interpreted language, and this has serious speed
implications. Like all other interpreted languages (like Java), Elisp
is often suitable only for certain types of application or extension.
-So although Elisp is a general purpose language, and very ligh level,
+So although Elisp is a general purpose language, and very high level,
there are times when it is desirable to descend to a lower level
compiled language for speed purposes.
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
\1f
Indirect:
-internals.info-1: 1770
-internals.info-2: 45926
-internals.info-3: 92999
-internals.info-4: 141367
-internals.info-5: 183398
-internals.info-6: 232819
-internals.info-7: 281549
-internals.info-8: 331006
+internals.info-1: 1776
+internals.info-2: 45928
+internals.info-3: 93572
+internals.info-4: 141935
+internals.info-5: 183963
+internals.info-6: 233381
+internals.info-7: 282110
+internals.info-8: 331561
\1f
Tag Table:
(Indirect)
-Node: Top\7f1770
-Node: A History of Emacs\7f6352
-Node: Through Version 18\7f7877
-Node: Lucid Emacs\7f11298
-Node: GNU Emacs 19\7f14316
-Node: GNU Emacs 20\7f16499
-Node: XEmacs\7f16926
-Node: XEmacs From the Outside\7f20105
-Node: The Lisp Language\7f21873
-Node: XEmacs From the Perspective of Building\7f31418
-Node: XEmacs From the Inside\7f37543
-Node: The XEmacs Object System (Abstractly Speaking)\7f45926
+Node: Top\7f1776
+Node: A History of Emacs\7f6358
+Node: Through Version 18\7f7883
+Node: Lucid Emacs\7f11304
+Node: GNU Emacs 19\7f14322
+Node: GNU Emacs 20\7f16505
+Node: XEmacs\7f16932
+Node: XEmacs From the Outside\7f20111
+Node: The Lisp Language\7f21878
+Node: XEmacs From the Perspective of Building\7f31420
+Node: XEmacs From the Inside\7f37545
+Node: The XEmacs Object System (Abstractly Speaking)\7f45928
Node: How Lisp Objects Are Represented in C\7f60014
-Node: Rules When Writing New C Code\7f68576
-Node: General Coding Rules\7f69380
-Node: Writing Lisp Primitives\7f74540
-Node: Adding Global Lisp Variables\7f85709
-Node: Coding for Mule\7f89347
-Node: Character-Related Data Types\7f90326
-Node: Working With Character and Byte Positions\7f92999
-Node: Conversion to and from External Data\7f96749
-Node: General Guidelines for Writing Mule-Aware Code\7f101630
-Node: An Example of Mule-Aware Code\7f103661
-Node: Techniques for XEmacs Developers\7f105648
-Node: A Summary of the Various XEmacs Modules\7f109415
-Node: Low-Level Modules\7f110235
-Node: Basic Lisp Modules\7f117757
-Node: Modules for Standard Editing Operations\7f126081
-Node: Editor-Level Control Flow Modules\7f131969
-Node: Modules for the Basic Displayable Lisp Objects\7f135416
-Node: Modules for other Display-Related Lisp Objects\7f137938
-Node: Modules for the Redisplay Mechanism\7f139016
-Node: Modules for Interfacing with the File System\7f141367
-Node: Modules for Other Aspects of the Lisp Interpreter and Object System\7f145065
-Node: Modules for Interfacing with the Operating System\7f150519
-Node: Modules for Interfacing with X Windows\7f158180
-Node: Modules for Internationalization\7f161616
-Node: Allocation of Objects in XEmacs Lisp\7f164253
-Node: Introduction to Allocation\7f164807
-Node: Garbage Collection\7f170270
-Node: GCPROing\7f173223
-Node: Garbage Collection - Step by Step\7f180034
-Node: Invocation\7f180426
-Node: garbage_collect_1\7f183398
-Node: mark_object\7f192878
-Node: gc_sweep\7f194690
-Node: sweep_lcrecords_1\7f199753
-Node: compact_string_chars\7f200748
-Node: sweep_strings\7f202928
-Node: sweep_bit_vectors_1\7f203893
-Node: Integers and Characters\7f204569
-Node: Allocation from Frob Blocks\7f205321
-Node: lrecords\7f206925
-Node: Low-level allocation\7f219387
-Node: Pure Space\7f223555
-Node: Cons\7f223730
-Node: Vector\7f224446
-Node: Bit Vector\7f225023
-Node: Symbol\7f225516
-Node: Marker\7f226085
-Node: String\7f226640
-Node: Compiled Function\7f230255
-Node: Events and the Event Loop\7f230424
-Node: Introduction to Events\7f230903
-Node: Main Loop\7f232819
-Node: Specifics of the Event Gathering Mechanism\7f236395
-Node: Specifics About the Emacs Event\7f248848
-Node: The Event Stream Callback Routines\7f249103
-Node: Other Event Loop Functions\7f249348
-Node: Converting Events\7f250488
-Node: Dispatching Events; The Command Builder\7f251097
-Node: Evaluation; Stack Frames; Bindings\7f251332
-Node: Evaluation\7f251674
-Node: Dynamic Binding; The specbinding Stack; Unwind-Protects\7f258214
-Node: Simple Special Forms\7f260598
-Node: Catch and Throw\7f261380
-Node: Symbols and Variables\7f263955
-Node: Introduction to Symbols\7f264219
-Node: Obarrays\7f265257
-Node: Symbol Values\7f268790
-Node: Buffers and Textual Representation\7f271078
-Node: Introduction to Buffers\7f271736
-Node: The Text in a Buffer\7f274399
-Node: Buffer Lists\7f281549
-Node: Markers and Extents\7f283500
-Node: Bufbytes and Emchars\7f285765
-Node: The Buffer Object\7f285980
-Node: MULE Character Sets and Encodings\7f289460
-Node: Character Sets\7f290522
-Node: Encodings\7f293965
-Node: Japanese EUC (Extended Unix Code)\7f295032
-Node: JIS7\7f295846
-Node: Internal Mule Encodings\7f297196
-Node: Internal String Encoding\7f299026
-Node: Internal Character Encoding\7f301139
-Node: CCL\7f302863
-Node: The Lisp Reader and Compiler\7f309615
-Node: Lstreams\7f309828
-Node: Creating an Lstream\7f310859
-Node: Lstream Types\7f312069
-Node: Lstream Functions\7f312321
-Node: Lstream Methods\7f315890
-Node: Consoles; Devices; Frames; Windows\7f319033
-Node: Introduction to Consoles; Devices; Frames; Windows\7f319348
-Node: Point\7f321840
-Node: Window Hierarchy\7f323119
-Node: The Window Object\7f327569
-Node: The Redisplay Mechanism\7f331006
-Node: Critical Redisplay Sections\7f331798
-Node: Line Start Cache\7f332753
-Node: Redisplay Piece by Piece\7f335990
-Node: Extents\7f338026
-Node: Introduction to Extents\7f338564
-Node: Extent Ordering\7f339690
-Node: Format of the Extent Info\7f340931
-Node: Zero-Length Extents\7f342819
-Node: Mathematics of Extent Ordering\7f344217
-Node: Extent Fragments\7f348974
-Node: Faces\7f350061
-Node: Glyphs\7f350177
-Node: Specifiers\7f353195
-Node: Menus\7f353324
-Node: Subprocesses\7f355582
-Node: Interface to X Windows\7f357558
-Node: Index\7f357729
+Node: Rules When Writing New C Code\7f68572
+Node: General Coding Rules\7f69376
+Node: Writing Lisp Primitives\7f75113
+Node: Adding Global Lisp Variables\7f86282
+Node: Coding for Mule\7f89920
+Node: Character-Related Data Types\7f90899
+Node: Working With Character and Byte Positions\7f93572
+Node: Conversion to and from External Data\7f97322
+Node: General Guidelines for Writing Mule-Aware Code\7f102203
+Node: An Example of Mule-Aware Code\7f104234
+Node: Techniques for XEmacs Developers\7f106221
+Node: A Summary of the Various XEmacs Modules\7f109988
+Node: Low-Level Modules\7f110808
+Node: Basic Lisp Modules\7f118330
+Node: Modules for Standard Editing Operations\7f126651
+Node: Editor-Level Control Flow Modules\7f132539
+Node: Modules for the Basic Displayable Lisp Objects\7f135985
+Node: Modules for other Display-Related Lisp Objects\7f138507
+Node: Modules for the Redisplay Mechanism\7f139584
+Node: Modules for Interfacing with the File System\7f141935
+Node: Modules for Other Aspects of the Lisp Interpreter and Object System\7f145633
+Node: Modules for Interfacing with the Operating System\7f151086
+Node: Modules for Interfacing with X Windows\7f158747
+Node: Modules for Internationalization\7f162183
+Node: Allocation of Objects in XEmacs Lisp\7f164820
+Node: Introduction to Allocation\7f165374
+Node: Garbage Collection\7f170836
+Node: GCPROing\7f173789
+Node: Garbage Collection - Step by Step\7f180599
+Node: Invocation\7f180991
+Node: garbage_collect_1\7f183963
+Node: mark_object\7f193443
+Node: gc_sweep\7f195255
+Node: sweep_lcrecords_1\7f200318
+Node: compact_string_chars\7f201313
+Node: sweep_strings\7f203493
+Node: sweep_bit_vectors_1\7f204458
+Node: Integers and Characters\7f205134
+Node: Allocation from Frob Blocks\7f205886
+Node: lrecords\7f207490
+Node: Low-level allocation\7f219952
+Node: Pure Space\7f224120
+Node: Cons\7f224295
+Node: Vector\7f225011
+Node: Bit Vector\7f225588
+Node: Symbol\7f226081
+Node: Marker\7f226650
+Node: String\7f227205
+Node: Compiled Function\7f230818
+Node: Events and the Event Loop\7f230987
+Node: Introduction to Events\7f231466
+Node: Main Loop\7f233381
+Node: Specifics of the Event Gathering Mechanism\7f236956
+Node: Specifics About the Emacs Event\7f249409
+Node: The Event Stream Callback Routines\7f249664
+Node: Other Event Loop Functions\7f249909
+Node: Converting Events\7f251049
+Node: Dispatching Events; The Command Builder\7f251658
+Node: Evaluation; Stack Frames; Bindings\7f251893
+Node: Evaluation\7f252235
+Node: Dynamic Binding; The specbinding Stack; Unwind-Protects\7f258775
+Node: Simple Special Forms\7f261159
+Node: Catch and Throw\7f261941
+Node: Symbols and Variables\7f264516
+Node: Introduction to Symbols\7f264780
+Node: Obarrays\7f265818
+Node: Symbol Values\7f269351
+Node: Buffers and Textual Representation\7f271639
+Node: Introduction to Buffers\7f272297
+Node: The Text in a Buffer\7f274960
+Node: Buffer Lists\7f282110
+Node: Markers and Extents\7f284061
+Node: Bufbytes and Emchars\7f286326
+Node: The Buffer Object\7f286541
+Node: MULE Character Sets and Encodings\7f290021
+Node: Character Sets\7f291083
+Node: Encodings\7f294526
+Node: Japanese EUC (Extended Unix Code)\7f295593
+Node: JIS7\7f296407
+Node: Internal Mule Encodings\7f297757
+Node: Internal String Encoding\7f299587
+Node: Internal Character Encoding\7f301700
+Node: CCL\7f303424
+Node: The Lisp Reader and Compiler\7f310176
+Node: Lstreams\7f310389
+Node: Creating an Lstream\7f311420
+Node: Lstream Types\7f312630
+Node: Lstream Functions\7f312882
+Node: Lstream Methods\7f316448
+Node: Consoles; Devices; Frames; Windows\7f319590
+Node: Introduction to Consoles; Devices; Frames; Windows\7f319905
+Node: Point\7f322397
+Node: Window Hierarchy\7f323676
+Node: The Window Object\7f328124
+Node: The Redisplay Mechanism\7f331561
+Node: Critical Redisplay Sections\7f332353
+Node: Line Start Cache\7f333308
+Node: Redisplay Piece by Piece\7f336544
+Node: Extents\7f338580
+Node: Introduction to Extents\7f339118
+Node: Extent Ordering\7f340244
+Node: Format of the Extent Info\7f341485
+Node: Zero-Length Extents\7f343372
+Node: Mathematics of Extent Ordering\7f344770
+Node: Extent Fragments\7f349527
+Node: Faces\7f350613
+Node: Glyphs\7f350729
+Node: Specifiers\7f353747
+Node: Menus\7f353876
+Node: Subprocesses\7f356134
+Node: Interface to X Windows\7f358110
+Node: Index\7f358281
\1f
End Tag Table
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
displayable representations, and XEmacs provides a function
`redisplay()' that ensures that the display of all such objects matches
their internal state. Most of the time, a standard Lisp environment is
-in a "read-eval-print" loop - i.e. "read some Lisp code, execute it,
-and print the results". XEmacs has a similar loop:
+in a "read-eval-print" loop--i.e. "read some Lisp code, execute it, and
+print the results". XEmacs has a similar loop:
* read an event
installed by the top-level event loop, is executed; this prints
out the error and continues.) Routines can also specify cleanup
code (called an "unwind-protect") that will be called when control
- exits from a block of code, no matter how that exit occurs - i.e.
+ exits from a block of code, no matter how that exit occurs--i.e.
even if a function deeply nested below it causes a non-local exit
back to the top level.
"see" the local variable you declared. This is actually
considered a bug in Emacs Lisp and in all other early dialects of
Lisp, and was corrected in Common Lisp. (In Common Lisp, you can
- still declare dynamically scoped variables if you want to - they
- are sometimes useful - but variables by default are "lexically
+ still declare dynamically scoped variables if you want to--they
+ are sometimes useful--but variables by default are "lexically
scoped" as in C.)
For those familiar with Lisp, Emacs Lisp is modelled after MacLisp,
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
like integers in many ways but are logically considered text
rather than numbers and have a different read syntax. (the read
syntax for a char contains the char itself or some textual
- encoding of it - for example, a Japanese Kanji character might be
- encoded as `^[$(B#&^[(B' using the ISO-2022 encoding standard -
- rather than the numerical representation of the char; this way, if
- the mapping between chars and integers changes, which is quite
- possible for Kanji characters and other extended characters, the
- same character will still be created. Note that some primitives
- confuse chars and integers. The worst culprit is `eq', which
- makes a special exception and considers a char to be `eq' to its
- integer equivalent, even though in no other case are objects of two
- different types `eq'. The reason for this monstrosity is
- compatibility with existing code; the separation of char from
- integer came fairly recently.)
+ encoding of it--for example, a Japanese Kanji character might be
+ encoded as `^[$(B#&^[(B' using the ISO-2022 encoding
+ standard--rather than the numerical representation of the char;
+ this way, if the mapping between chars and integers changes, which
+ is quite possible for Kanji characters and other extended
+ characters, the same character will still be created. Note that
+ some primitives confuse chars and integers. The worst culprit is
+ `eq', which makes a special exception and considers a char to be
+ `eq' to its integer equivalent, even though in no other case are
+ objects of two different types `eq'. The reason for this
+ monstrosity is compatibility with existing code; the separation of
+ char from integer came fairly recently.)
`symbol'
An object that contains Lisp objects and is referred to by name;
all others, the lower 28 bits contain a pointer. The mark bit is used
during garbage-collection, and is always 0 when garbage collection is
not happening. (The way that garbage collection works, basically, is
-that it loops over all places where Lisp objects could exist - this
+that it loops over all places where Lisp objects could exist--this
includes all global variables in C that contain Lisp objects [including
`Vobarray', the C equivalent of `obarray'; through this, all Lisp
-variables will get marked], plus various other places - and recursively
+variables will get marked], plus various other places--and recursively
scans through the Lisp objects, marking each object it finds by setting
the mark bit. Then it goes through the lists of all objects allocated,
freeing the ones that are not marked and turning off the mark bit of
`EXPLICIT_SIGN_EXTEND'.
Note that when `ERROR_CHECK_TYPECHECK' is defined, the extractor
-macros become more complicated - they check the tag bits and/or the
-type field in the first four bytes of a record type to ensure that the
+macros become more complicated--they check the tag bits and/or the type
+field in the first four bytes of a record type to ensure that the
object is really of the correct type. This is great for catching places
-where an incorrect type is being dereferenced - this typically results
+where an incorrect type is being dereferenced--this typically results
in a pointer being dereferenced as the wrong type of structure, with
unpredictable (and sometimes not easily traceable) results.
to ensure that certain tricks played by various `s/' and `m/' files
work out correctly.
+ When including header files, always use angle brackets, not double
+quotes, except when the file to be included is in the same directory as
+the including file. If either file is a generated file, then that is
+not likely to be the case. In order to understand why we have this
+rule, imagine what happens when you do a build in the source directory
+using `./configure' and another build in another directory using
+`../work/configure'. There will be two different `config.h' files.
+Which one will be used if you `#include "config.h"'?
+
*All global and static variables that are to be modifiable must be
declared uninitialized.* This means that you may not use the "declare
with initializer" form for these variables, such as `int some_variable
dumped executable. This allows this memory to be shared among multiple
running XEmacs processes. XEmacs is careful to place as much constant
data as possible into initialized variables (in particular, into what's
-called the "pure space" - see below) during the `temacs' phase.
+called the "pure space"--see below) during the `temacs' phase.
*Please note:* This kludge only works on a few systems nowadays, and
is rapidly becoming irrelevant because most modern operating systems
The C source code makes heavy use of C preprocessor macros. One
popular macro style is:
- #define FOO(var, value) do { \
- Lisp_Object FOO_value = (value); \
- ... /* compute using FOO_value */ \
- (var) = bar; \
+ #define FOO(var, value) do { \
+ Lisp_Object FOO_value = (value); \
+ ... /* compute using FOO_value */ \
+ (var) = bar; \
} while (0)
The `do {...} while (0)' is a standard trick to allow FOO to have
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
typedefs section as necessary.
`lrecord.h' contains the basic structures and macros that implement
-all record-type Lisp objects - i.e. all objects whose type is a field
-in their C structure, which includes all objects except the few most
-basic ones.
+all record-type Lisp objects--i.e. all objects whose type is a field in
+their C structure, which includes all objects except the few most basic
+ones.
`lisp.h' contains prototypes for most of the exported functions in
the various modules. Lisp primitives defined using `DEFUN' that need
type-specific methods. This scheme is a fundamental principle of
object-oriented programming and is heavily used throughout XEmacs. The
great advantage of this is that it allows for a clean separation of
-functionality into different modules - new classes of Lisp objects, new
+functionality into different modules--new classes of Lisp objects, new
event interfaces, new device types, new stream interfaces, etc. can be
added transparently without affecting code anywhere else in XEmacs.
Because the different subsystems are divided into general and specific
`symbols.c' implements the handling of symbols, obarrays, and
retrieving the values of symbols. Much of the code is devoted to
handling the special "symbol-value-magic" objects that define special
-types of variables - this includes buffer-local variables, variable
+types of variables--this includes buffer-local variables, variable
aliases, variables that forward into C variables, etc. This module is
initialized extremely early (right after `alloc.c'), because it is here
that the basic symbols `t' and `nil' are created, and those symbols are
keyboard.c
`keyboard.c' contains functions that implement the actual editor
-command loop - i.e. the event loop that cyclically retrieves and
+command loop--i.e. the event loop that cyclically retrieves and
dispatches events. This code is also rather tricky, just like
`event-stream.c'.
font-lock.c
- This file provides C support for syntax highlighting - i.e.
+ This file provides C support for syntax highlighting--i.e.
highlighting different syntactic constructs of a source file in
different colors, for easy reading. The C support is provided so that
this is fast.
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
with them, in case the block of memory contains other Lisp objects that
need to be marked for garbage-collection purposes. (If you need other
object methods, such as a finalize method, you should just go ahead and
-create a new Lisp object type - it's not hard.)
+create a new Lisp object type--it's not hard.)
abbrev.c
memory that are subdivided into individual objects. This saves a
lot on malloc overhead, since there are typically quite a lot of
these objects around, and the objects are small. (A cons, for
- example, occupies 8 bytes on 32-bit machines - 4 bytes for each of
+ example, occupies 8 bytes on 32-bit machines--4 bytes for each of
the two objects it contains.) Vectors are individually
`malloc()'ed since they are of variable size. (It would be
possible, and desirable, to allocate vectors of certain small
the next enclosing stack frame. Each `GCPRO'ed thing is an
lvalue, and the `struct gcpro' local variable contains a pointer to
this lvalue. This is why things will mess up badly if you don't
- pair up the `GCPRO's and `UNGCPRO's - you will end up with
+ pair up the `GCPRO's and `UNGCPRO's--you will end up with
`gcprolist's containing pointers to `struct gcpro's or local
`Lisp_Object' variables in no-longer-active stack frames.
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
strings", are all `malloc()'ed as their own block. (#### Although it
would make more sense for the threshold for big strings to be somewhat
lower, e.g. 1/2 or 1/4 the size of a string-chars block. It seems that
-this was indeed the case formerly - indeed, the threshold was set at
-1/8 - but Mly forgot about this when rewriting things for 19.8.)
+this was indeed the case formerly--indeed, the threshold was set at
+1/8--but Mly forgot about this when rewriting things for 19.8.)
Note also that the string data in string-chars blocks is padded as
necessary so that proper alignment constraints on the `struct
provides an abstract layer on top of the system-dependent nature of the
most basic events that are received. Part of the complex nature of the
XEmacs event collection process involves converting from the
-operating-system events into the proper Emacs events - there may not be
+operating-system events into the proper Emacs events--there may not be
a one-to-one correspondence.
Emacs events are documented in `events.h'; I'll discuss them later.
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
elsewhere.
The guts of the command loop are in `command_loop_1()'. This
-function doesn't catch errors, though - that's the job of
+function doesn't catch errors, though--that's the job of
`command_loop_2()', which is a condition-case (i.e. error-trapping)
wrapper around `command_loop_1()'. `command_loop_1()' never returns,
but may get thrown out of.
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
- Macro: void Lstream_ungetc (Lstream *STREAM, int C)
Push one byte back onto the input queue. This will be the next
byte read from the stream. Any number of bytes can be pushed back
- and will be read in the reverse order they were pushed back - most
- recent first. (This is necessary for consistency - if there are a
+ and will be read in the reverse order they were pushed back--most
+ recent first. (This is necessary for consistency--if there are a
number of bytes that have been unread and I read and unread a
byte, it needs to be the first to be read again.) This is a macro
and so it is very efficient. The C argument is only evaluated
- Function: void Lstream_reopen (Lstream *STREAM)
Reopen a closed stream. This enables I/O on it again. This is not
meant to be called except from a wrapper routine that reinitializes
- variables and such - the close routine may well have freed some
+ variables and such--the close routine may well have freed some
necessary storage structures, for example.
- Function: void Lstream_rewind (Lstream *STREAM)
Rewind the stream. If this is `NULL', the stream is not seekable.
- Lstream Method: int seekable_p (Lstream *STREAM)
- Indicate whether this stream is seekable - i.e. it can be rewound.
+ Indicate whether this stream is seekable--i.e. it can be rewound.
This method is ignored if the stream does not have a rewind
method. If this method is not present, the result is determined
by whether a rewind method is present.
7. Leaf windows also have markers in their `start' (the first buffer
position displayed in the window) and `pointm' (the window's
- stashed value of `point' - see above) fields, while combination
+ stashed value of `point'--see above) fields, while combination
windows have nil in these fields.
8. The list of children for a window is threaded through the `next'
1 and clear out the `next', `prev', `hchild', and `vchild' fields,
for GC purposes.
- 10. Most frames actually have two top-level windows - one for the
+ 10. Most frames actually have two top-level windows--one for the
minibuffer and one (the "root") for everything else. The modeline
(if present) separates these two. The `next' field of the root
points to the minibuffer, and the `prev' field of the minibuffer
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
END-INFO-DIR-ENTRY
Copyright (C) 1992 - 1996 Ben Wing. Copyright (C) 1996, 1997 Sun
information. The second thing we can do is be smart about invalidating
the cache.
- TODO - Be smart about invalidating the cache. Potential places:
+ TODO--Be smart about invalidating the cache. Potential places:
* Insertions at end-of-line which don't cause line-wraps do not
alter the starting positions of any display lines. These types of
An extent-info structure consists of a list of the buffer or string's
extents and a "stack of extents" that lists all of the extents over a
particular position. The stack-of-extents info is used for
-optimization purposes - it basically caches some info that might be
+optimization purposes--it basically caches some info that might be
expensive to compute. Certain otherwise hard computations are easy
given the stack of extents over a particular position, and if the stack
of extents over a nearby position is known (because it was calculated
An extent fragment is a structure that holds data about the run that
contains a particular buffer position (if the buffer position is at the
-junction of two runs, the run after the position is used) - the
+junction of two runs, the run after the position is used)--the
beginning and end of the run, a list of all of the extents in that run,
the "merged face" that results from merging all of the faces
corresponding to those extents, the begin and end glyphs at the
Any action on a glyph first consults the cache before actually
instantiating a widget.
-Widget-Glyphs in the MS-WIndows Environment
+Widget-Glyphs in the MS-Windows Environment
===========================================
To Do
\1f
Indirect:
lispref.info-1: 2366
-lispref.info-2: 48385
-lispref.info-3: 96924
-lispref.info-4: 146766
-lispref.info-5: 195600
-lispref.info-6: 243285
-lispref.info-7: 291568
-lispref.info-8: 340704
-lispref.info-9: 387518
-lispref.info-10: 436970
-lispref.info-11: 485198
-lispref.info-12: 534963
-lispref.info-13: 582862
-lispref.info-14: 631085
-lispref.info-15: 679339
-lispref.info-16: 729095
-lispref.info-17: 777846
-lispref.info-18: 824696
-lispref.info-19: 871747
-lispref.info-20: 920477
-lispref.info-21: 969899
-lispref.info-22: 1016818
-lispref.info-23: 1063845
-lispref.info-24: 1113244
-lispref.info-25: 1162926
-lispref.info-26: 1212836
-lispref.info-27: 1262059
-lispref.info-28: 1310826
-lispref.info-29: 1360263
-lispref.info-30: 1401598
-lispref.info-31: 1450741
-lispref.info-32: 1499954
-lispref.info-33: 1549528
-lispref.info-34: 1597705
-lispref.info-35: 1643337
-lispref.info-36: 1684653
-lispref.info-37: 1729594
-lispref.info-38: 1779281
-lispref.info-39: 1828385
-lispref.info-40: 1877789
-lispref.info-41: 1927673
-lispref.info-42: 1976664
-lispref.info-43: 2020556
-lispref.info-44: 2058892
+lispref.info-2: 48386
+lispref.info-3: 96925
+lispref.info-4: 146765
+lispref.info-5: 195599
+lispref.info-6: 243284
+lispref.info-7: 291562
+lispref.info-8: 340698
+lispref.info-9: 387512
+lispref.info-10: 436964
+lispref.info-11: 485192
+lispref.info-12: 534964
+lispref.info-13: 582863
+lispref.info-14: 631086
+lispref.info-15: 679340
+lispref.info-16: 729096
+lispref.info-17: 777847
+lispref.info-18: 824752
+lispref.info-19: 872135
+lispref.info-20: 920976
+lispref.info-21: 970569
+lispref.info-22: 1017488
+lispref.info-23: 1064515
+lispref.info-24: 1113914
+lispref.info-25: 1163596
+lispref.info-26: 1213506
+lispref.info-27: 1262729
+lispref.info-28: 1311495
+lispref.info-29: 1360931
+lispref.info-30: 1402266
+lispref.info-31: 1451409
+lispref.info-32: 1500622
+lispref.info-33: 1550196
+lispref.info-34: 1598675
+lispref.info-35: 1644357
+lispref.info-36: 1686356
+lispref.info-37: 1731296
+lispref.info-38: 1780983
+lispref.info-39: 1830087
+lispref.info-40: 1879491
+lispref.info-41: 1928817
+lispref.info-42: 1977518
+lispref.info-43: 2022945
+lispref.info-44: 2061281
\1f
Tag Table:
(Indirect)
Node: Top\7f2366
-Node: Copying\7f48385
-Node: Introduction\7f67543
-Node: Caveats\7f69134
-Node: Lisp History\7f70865
-Node: Conventions\7f72121
-Node: Some Terms\7f72936
-Node: nil and t\7f73657
-Node: Evaluation Notation\7f75334
-Node: Printing Notation\7f76247
-Node: Error Messages\7f77121
-Node: Buffer Text Notation\7f77562
-Node: Format of Descriptions\7f78437
-Node: A Sample Function Description\7f79291
-Node: A Sample Variable Description\7f83277
-Node: Acknowledgements\7f84185
-Node: Lisp Data Types\7f86163
-Node: Printed Representation\7f88718
-Node: Comments\7f90760
-Node: Primitive Types\7f91657
-Node: Programming Types\7f93316
-Node: Integer Type\7f95268
-Node: Floating Point Type\7f96305
-Node: Character Type\7f96924
-Node: Symbol Type\7f104830
-Node: Sequence Type\7f107525
-Node: Cons Cell Type\7f109044
-Node: Dotted Pair Notation\7f113528
-Node: Association List Type\7f115649
-Node: Array Type\7f116532
-Node: String Type\7f117998
-Node: Vector Type\7f120679
-Node: Bit Vector Type\7f121451
-Node: Function Type\7f122313
-Node: Macro Type\7f123426
-Node: Primitive Function Type\7f124123
-Node: Compiled-Function Type\7f125649
-Node: Autoload Type\7f126203
-Node: Char Table Type\7f127217
-Node: Hash Table Type\7f127391
-Node: Range Table Type\7f128546
-Node: Weak List Type\7f129399
-Node: Editing Types\7f129549
-Node: Buffer Type\7f131176
-Node: Marker Type\7f133203
-Node: Extent Type\7f133927
-Node: Window Type\7f135195
-Node: Frame Type\7f136606
-Node: Device Type\7f137401
-Node: Console Type\7f138227
-Node: Window Configuration Type\7f139428
-Node: Event Type\7f140126
-Node: Process Type\7f140290
-Node: Stream Type\7f141325
-Node: Keymap Type\7f142448
-Node: Syntax Table Type\7f142986
-Node: Display Table Type\7f144009
-Node: Database Type\7f144448
-Node: Charset Type\7f144614
-Node: Coding System Type\7f144778
-Node: ToolTalk Message Type\7f144962
-Node: ToolTalk Pattern Type\7f145161
-Node: Window-System Types\7f145333
-Node: Face Type\7f146479
-Node: Glyph Type\7f146610
-Node: Specifier Type\7f146766
-Node: Font Instance Type\7f146939
-Node: Color Instance Type\7f147129
-Node: Image Instance Type\7f147326
-Node: Toolbar Button Type\7f147524
-Node: Subwindow Type\7f147717
-Node: X Resource Type\7f147896
-Node: Type Predicates\7f148049
-Node: Equality Predicates\7f157178
-Node: Numbers\7f161983
-Node: Integer Basics\7f163438
-Node: Float Basics\7f165787
-Node: Predicates on Numbers\7f167529
-Node: Comparison of Numbers\7f169162
-Node: Numeric Conversions\7f172983
-Node: Arithmetic Operations\7f174449
-Node: Rounding Operations\7f179914
-Node: Bitwise Operations\7f181019
-Node: Math Functions\7f190065
-Node: Random Numbers\7f192381
-Node: Strings and Characters\7f194147
-Node: String Basics\7f195600
-Node: Predicates for Strings\7f198018
-Node: Creating Strings\7f198781
-Node: Predicates for Characters\7f204098
-Node: Character Codes\7f205169
-Node: Text Comparison\7f206582
-Node: String Conversion\7f209944
-Node: Modifying Strings\7f213620
-Node: String Properties\7f214261
-Node: Formatting Strings\7f214904
-Node: Character Case\7f224522
-Node: Case Tables\7f227668
-Node: Char Tables\7f231566
-Node: Char Table Types\7f232958
-Node: Working With Char Tables\7f234533
-Node: Lists\7f236482
-Node: Cons Cells\7f237605
-Node: Lists as Boxes\7f238941
-Node: List-related Predicates\7f241583
-Node: List Elements\7f243285
-Node: Building Lists\7f248314
-Node: Modifying Lists\7f254306
-Node: Setcar\7f255118
-Node: Setcdr\7f257539
-Node: Rearrangement\7f260050
-Node: Sets And Lists\7f265636
-Node: Association Lists\7f269864
-Ref: Association Lists-Footnote-1\7f279159
-Node: Property Lists\7f279364
-Node: Working With Normal Plists\7f280912
-Node: Working With Lax Plists\7f283180
-Node: Converting Plists To/From Alists\7f285420
-Node: Weak Lists\7f286768
-Node: Sequences Arrays Vectors\7f288932
-Node: Sequence Functions\7f291568
-Node: Arrays\7f295227
-Node: Array Functions\7f298291
-Node: Vectors\7f300824
-Node: Vector Functions\7f302322
-Node: Bit Vectors\7f304893
-Node: Bit Vector Functions\7f305738
-Node: Symbols\7f307988
-Node: Symbol Components\7f309037
-Node: Definitions\7f313210
-Node: Creating Symbols\7f315435
-Node: Symbol Properties\7f322469
-Node: Plists and Alists\7f323985
-Node: Symbol Plists\7f325734
-Node: Other Plists\7f327543
-Node: Evaluation\7f329321
-Node: Intro Eval\7f330126
-Ref: Intro Eval-Footnote-1\7f333479
-Node: Eval\7f333614
-Node: Forms\7f338032
-Node: Self-Evaluating Forms\7f339191
-Node: Symbol Forms\7f340704
-Node: Classifying Lists\7f341621
-Node: Function Indirection\7f342377
-Node: Function Forms\7f345488
-Node: Macro Forms\7f346485
-Node: Special Forms\7f348085
-Node: Autoloading\7f350394
-Node: Quoting\7f350892
-Node: Control Structures\7f352253
-Node: Sequencing\7f353873
-Node: Conditionals\7f356738
-Node: Combining Conditions\7f360161
-Node: Iteration\7f363431
-Node: Nonlocal Exits\7f365210
-Node: Catch and Throw\7f365912
-Node: Examples of Catch\7f369751
-Node: Errors\7f371770
-Node: Signaling Errors\7f373259
-Node: Processing of Errors\7f377998
-Node: Handling Errors\7f380277
-Node: Error Symbols\7f387518
-Node: Cleanups\7f391474
-Node: Variables\7f395252
-Node: Global Variables\7f397021
-Node: Constant Variables\7f398097
-Node: Local Variables\7f398723
-Node: Void Variables\7f403660
-Node: Defining Variables\7f407176
-Node: Accessing Variables\7f414340
-Node: Setting Variables\7f415765
-Node: Variable Scoping\7f420284
-Node: Scope\7f421883
-Node: Extent\7f423408
-Node: Impl of Scope\7f424887
-Node: Using Scoping\7f426850
-Node: Buffer-Local Variables\7f428372
-Node: Intro to Buffer-Local\7f429208
-Node: Creating Buffer-Local\7f431751
-Node: Default Value\7f436970
-Node: Variable Aliases\7f440113
-Node: Functions\7f441898
-Node: What Is a Function\7f442992
-Node: Lambda Expressions\7f447038
-Node: Lambda Components\7f447948
-Node: Simple Lambda\7f449780
-Node: Argument List\7f451437
-Node: Function Documentation\7f455165
-Node: Function Names\7f457107
-Node: Defining Functions\7f459680
-Node: Calling Functions\7f462720
-Node: Mapping Functions\7f466569
-Node: Anonymous Functions\7f469257
-Node: Function Cells\7f472502
-Node: Inline Functions\7f477312
-Node: Related Topics\7f479122
-Node: Macros\7f480175
-Node: Simple Macro\7f481459
-Node: Expansion\7f482194
-Node: Compiling Macros\7f485198
-Node: Defining Macros\7f487034
-Node: Backquote\7f488351
-Node: Problems with Macros\7f490748
-Node: Argument Evaluation\7f491443
-Node: Surprising Local Vars\7f494358
-Node: Eval During Expansion\7f496426
-Node: Repeated Expansion\7f498119
-Node: Customization\7f500035
-Node: Common Keywords\7f500504
-Node: Group Definitions\7f503349
-Node: Variable Definitions\7f505541
-Node: Customization Types\7f510524
-Node: Simple Types\7f511959
-Node: Composite Types\7f514116
-Node: Splicing into Lists\7f518806
-Node: Type Keywords\7f520641
-Node: Loading\7f524161
-Node: How Programs Do Loading\7f525836
-Node: Autoload\7f534963
-Node: Repeated Loading\7f541042
-Node: Named Features\7f543155
-Node: Unloading\7f549587
-Node: Hooks for Loading\7f551743
-Node: Byte Compilation\7f552460
-Node: Speed of Byte-Code\7f554377
-Node: Compilation Functions\7f555584
-Node: Docs and Compilation\7f561971
-Node: Dynamic Loading\7f564624
-Node: Eval During Compile\7f566988
-Node: Compiled-Function Objects\7f568253
-Node: Disassembly\7f573051
-Node: Debugging\7f580305
-Node: Debugger\7f581717
-Node: Error Debugging\7f582862
-Node: Infinite Loops\7f585615
-Node: Function Debugging\7f586859
-Node: Explicit Debug\7f589649
-Node: Using Debugger\7f590420
-Node: Debugger Commands\7f592282
-Node: Invoking the Debugger\7f596599
-Node: Internals of Debugger\7f600514
-Node: Syntax Errors\7f605401
-Node: Excess Open\7f606649
-Node: Excess Close\7f608524
-Node: Compilation Errors\7f609945
-Node: Edebug\7f611233
-Node: Using Edebug\7f613341
-Node: Instrumenting\7f616038
-Node: Edebug Execution Modes\7f619527
-Node: Jumping\7f622637
-Node: Edebug Misc\7f624980
-Node: Breakpoints\7f626369
-Node: Global Break Condition\7f629175
-Node: Embedded Breakpoints\7f630130
-Node: Trapping Errors\7f631085
-Node: Edebug Views\7f633161
-Node: Edebug Eval\7f635126
-Node: Eval List\7f636303
-Node: Reading in Edebug\7f639688
-Node: Printing in Edebug\7f640487
-Node: Tracing\7f642202
-Node: Coverage Testing\7f644088
-Node: The Outside Context\7f646129
-Node: Checking Whether to Stop\7f647078
-Node: Edebug Display Update\7f647725
-Node: Edebug Recursive Edit\7f649748
-Node: Instrumenting Macro Calls\7f651403
-Node: Specification List\7f653885
-Node: Backtracking\7f663296
-Node: Debugging Backquote\7f665234
-Node: Specification Examples\7f668940
-Node: Edebug Options\7f671007
-Node: Read and Print\7f676344
-Node: Streams Intro\7f677321
-Node: Input Streams\7f679339
-Node: Input Functions\7f684240
-Node: Output Streams\7f686300
-Node: Output Functions\7f690351
-Node: Output Variables\7f694651
-Node: Minibuffers\7f699450
-Node: Intro to Minibuffers\7f700602
-Node: Text from Minibuffer\7f702790
-Node: Object from Minibuffer\7f707665
-Node: Minibuffer History\7f710892
-Node: Completion\7f713871
-Node: Basic Completion\7f715846
-Node: Minibuffer Completion\7f720875
-Node: Completion Commands\7f724452
-Node: High-Level Completion\7f729095
-Node: Reading File Names\7f733119
-Node: Programmed Completion\7f736803
-Node: Yes-or-No Queries\7f739185
-Node: Multiple Queries\7f744922
-Node: Reading a Password\7f748989
-Node: Minibuffer Misc\7f750326
-Node: Command Loop\7f755196
-Node: Command Overview\7f756540
-Node: Defining Commands\7f759818
-Node: Using Interactive\7f760566
-Node: Interactive Codes\7f765339
-Node: Interactive Examples\7f771131
-Node: Interactive Call\7f772445
-Node: Command Loop Info\7f777846
-Node: Events\7f782825
-Node: Event Types\7f784285
-Node: Event Contents\7f786208
-Node: Event Predicates\7f790684
-Node: Accessing Mouse Event Positions\7f792009
-Node: Frame-Level Event Position Info\7f792708
-Node: Window-Level Event Position Info\7f793748
-Node: Event Text Position Info\7f795512
-Node: Event Glyph Position Info\7f798004
-Node: Event Toolbar Position Info\7f799327
-Node: Other Event Position Info\7f799998
-Node: Accessing Other Event Info\7f800407
-Node: Working With Events\7f802027
-Node: Converting Events\7f808015
+Node: Copying\7f48386
+Node: Introduction\7f67544
+Node: Caveats\7f69135
+Node: Lisp History\7f70866
+Node: Conventions\7f72122
+Node: Some Terms\7f72937
+Node: nil and t\7f73658
+Node: Evaluation Notation\7f75335
+Node: Printing Notation\7f76248
+Node: Error Messages\7f77122
+Node: Buffer Text Notation\7f77563
+Node: Format of Descriptions\7f78438
+Node: A Sample Function Description\7f79292
+Node: A Sample Variable Description\7f83278
+Node: Acknowledgements\7f84186
+Node: Lisp Data Types\7f86164
+Node: Printed Representation\7f88719
+Node: Comments\7f90761
+Node: Primitive Types\7f91658
+Node: Programming Types\7f93317
+Node: Integer Type\7f95269
+Node: Floating Point Type\7f96306
+Node: Character Type\7f96925
+Node: Symbol Type\7f104829
+Node: Sequence Type\7f107524
+Node: Cons Cell Type\7f109043
+Node: Dotted Pair Notation\7f113527
+Node: Association List Type\7f115648
+Node: Array Type\7f116531
+Node: String Type\7f117997
+Node: Vector Type\7f120678
+Node: Bit Vector Type\7f121450
+Node: Function Type\7f122312
+Node: Macro Type\7f123425
+Node: Primitive Function Type\7f124122
+Node: Compiled-Function Type\7f125648
+Node: Autoload Type\7f126202
+Node: Char Table Type\7f127216
+Node: Hash Table Type\7f127390
+Node: Range Table Type\7f128545
+Node: Weak List Type\7f129398
+Node: Editing Types\7f129548
+Node: Buffer Type\7f131175
+Node: Marker Type\7f133202
+Node: Extent Type\7f133926
+Node: Window Type\7f135194
+Node: Frame Type\7f136605
+Node: Device Type\7f137400
+Node: Console Type\7f138226
+Node: Window Configuration Type\7f139427
+Node: Event Type\7f140125
+Node: Process Type\7f140289
+Node: Stream Type\7f141324
+Node: Keymap Type\7f142447
+Node: Syntax Table Type\7f142985
+Node: Display Table Type\7f144008
+Node: Database Type\7f144447
+Node: Charset Type\7f144613
+Node: Coding System Type\7f144777
+Node: ToolTalk Message Type\7f144961
+Node: ToolTalk Pattern Type\7f145160
+Node: Window-System Types\7f145332
+Node: Face Type\7f146478
+Node: Glyph Type\7f146609
+Node: Specifier Type\7f146765
+Node: Font Instance Type\7f146938
+Node: Color Instance Type\7f147128
+Node: Image Instance Type\7f147325
+Node: Toolbar Button Type\7f147523
+Node: Subwindow Type\7f147716
+Node: X Resource Type\7f147895
+Node: Type Predicates\7f148048
+Node: Equality Predicates\7f157177
+Node: Numbers\7f161982
+Node: Integer Basics\7f163437
+Node: Float Basics\7f165786
+Node: Predicates on Numbers\7f167528
+Node: Comparison of Numbers\7f169161
+Node: Numeric Conversions\7f172982
+Node: Arithmetic Operations\7f174448
+Node: Rounding Operations\7f179913
+Node: Bitwise Operations\7f181018
+Node: Math Functions\7f190064
+Node: Random Numbers\7f192380
+Node: Strings and Characters\7f194146
+Node: String Basics\7f195599
+Node: Predicates for Strings\7f198017
+Node: Creating Strings\7f198780
+Node: Predicates for Characters\7f204097
+Node: Character Codes\7f205168
+Node: Text Comparison\7f206581
+Node: String Conversion\7f209943
+Node: Modifying Strings\7f213619
+Node: String Properties\7f214260
+Node: Formatting Strings\7f214903
+Node: Character Case\7f224521
+Node: Case Tables\7f227667
+Node: Char Tables\7f231565
+Node: Char Table Types\7f232957
+Node: Working With Char Tables\7f234532
+Node: Lists\7f236481
+Node: Cons Cells\7f237604
+Node: Lists as Boxes\7f238940
+Node: List-related Predicates\7f241582
+Node: List Elements\7f243284
+Node: Building Lists\7f248313
+Node: Modifying Lists\7f254305
+Node: Setcar\7f255117
+Node: Setcdr\7f257538
+Node: Rearrangement\7f260049
+Node: Sets And Lists\7f265635
+Node: Association Lists\7f269863
+Ref: Association Lists-Footnote-1\7f279154
+Node: Property Lists\7f279359
+Node: Working With Normal Plists\7f280907
+Node: Working With Lax Plists\7f283175
+Node: Converting Plists To/From Alists\7f285415
+Node: Weak Lists\7f286763
+Node: Sequences Arrays Vectors\7f288926
+Node: Sequence Functions\7f291562
+Node: Arrays\7f295221
+Node: Array Functions\7f298285
+Node: Vectors\7f300818
+Node: Vector Functions\7f302316
+Node: Bit Vectors\7f304887
+Node: Bit Vector Functions\7f305732
+Node: Symbols\7f307982
+Node: Symbol Components\7f309031
+Node: Definitions\7f313204
+Node: Creating Symbols\7f315429
+Node: Symbol Properties\7f322463
+Node: Plists and Alists\7f323979
+Node: Symbol Plists\7f325728
+Node: Other Plists\7f327537
+Node: Evaluation\7f329315
+Node: Intro Eval\7f330120
+Ref: Intro Eval-Footnote-1\7f333473
+Node: Eval\7f333608
+Node: Forms\7f338026
+Node: Self-Evaluating Forms\7f339185
+Node: Symbol Forms\7f340698
+Node: Classifying Lists\7f341615
+Node: Function Indirection\7f342371
+Node: Function Forms\7f345482
+Node: Macro Forms\7f346479
+Node: Special Forms\7f348079
+Node: Autoloading\7f350388
+Node: Quoting\7f350886
+Node: Control Structures\7f352247
+Node: Sequencing\7f353867
+Node: Conditionals\7f356732
+Node: Combining Conditions\7f360155
+Node: Iteration\7f363425
+Node: Nonlocal Exits\7f365204
+Node: Catch and Throw\7f365906
+Node: Examples of Catch\7f369745
+Node: Errors\7f371764
+Node: Signaling Errors\7f373253
+Node: Processing of Errors\7f377992
+Node: Handling Errors\7f380271
+Node: Error Symbols\7f387512
+Node: Cleanups\7f391468
+Node: Variables\7f395246
+Node: Global Variables\7f397015
+Node: Constant Variables\7f398091
+Node: Local Variables\7f398717
+Node: Void Variables\7f403654
+Node: Defining Variables\7f407170
+Node: Accessing Variables\7f414334
+Node: Setting Variables\7f415759
+Node: Variable Scoping\7f420278
+Node: Scope\7f421877
+Node: Extent\7f423402
+Node: Impl of Scope\7f424881
+Node: Using Scoping\7f426844
+Node: Buffer-Local Variables\7f428366
+Node: Intro to Buffer-Local\7f429202
+Node: Creating Buffer-Local\7f431745
+Node: Default Value\7f436964
+Node: Variable Aliases\7f440107
+Node: Functions\7f441892
+Node: What Is a Function\7f442986
+Node: Lambda Expressions\7f447032
+Node: Lambda Components\7f447942
+Node: Simple Lambda\7f449774
+Node: Argument List\7f451431
+Node: Function Documentation\7f455159
+Node: Function Names\7f457101
+Node: Defining Functions\7f459674
+Node: Calling Functions\7f462714
+Node: Mapping Functions\7f466563
+Node: Anonymous Functions\7f469251
+Node: Function Cells\7f472496
+Node: Inline Functions\7f477306
+Node: Related Topics\7f479116
+Node: Macros\7f480169
+Node: Simple Macro\7f481453
+Node: Expansion\7f482188
+Node: Compiling Macros\7f485192
+Node: Defining Macros\7f487028
+Node: Backquote\7f488345
+Node: Problems with Macros\7f490742
+Node: Argument Evaluation\7f491437
+Node: Surprising Local Vars\7f494352
+Node: Eval During Expansion\7f496420
+Node: Repeated Expansion\7f498113
+Node: Customization\7f500029
+Node: Common Keywords\7f500498
+Node: Group Definitions\7f503343
+Node: Variable Definitions\7f505535
+Node: Customization Types\7f510525
+Node: Simple Types\7f511960
+Node: Composite Types\7f514117
+Node: Splicing into Lists\7f518807
+Node: Type Keywords\7f520642
+Node: Loading\7f524162
+Node: How Programs Do Loading\7f525837
+Node: Autoload\7f534964
+Node: Repeated Loading\7f541043
+Node: Named Features\7f543156
+Node: Unloading\7f549588
+Node: Hooks for Loading\7f551744
+Node: Byte Compilation\7f552461
+Node: Speed of Byte-Code\7f554378
+Node: Compilation Functions\7f555585
+Node: Docs and Compilation\7f561972
+Node: Dynamic Loading\7f564625
+Node: Eval During Compile\7f566989
+Node: Compiled-Function Objects\7f568254
+Node: Disassembly\7f573052
+Node: Debugging\7f580306
+Node: Debugger\7f581718
+Node: Error Debugging\7f582863
+Node: Infinite Loops\7f585616
+Node: Function Debugging\7f586860
+Node: Explicit Debug\7f589650
+Node: Using Debugger\7f590421
+Node: Debugger Commands\7f592283
+Node: Invoking the Debugger\7f596600
+Node: Internals of Debugger\7f600515
+Node: Syntax Errors\7f605402
+Node: Excess Open\7f606650
+Node: Excess Close\7f608525
+Node: Compilation Errors\7f609946
+Node: Edebug\7f611234
+Node: Using Edebug\7f613342
+Node: Instrumenting\7f616039
+Node: Edebug Execution Modes\7f619528
+Node: Jumping\7f622638
+Node: Edebug Misc\7f624981
+Node: Breakpoints\7f626370
+Node: Global Break Condition\7f629176
+Node: Embedded Breakpoints\7f630131
+Node: Trapping Errors\7f631086
+Node: Edebug Views\7f633162
+Node: Edebug Eval\7f635127
+Node: Eval List\7f636304
+Node: Reading in Edebug\7f639689
+Node: Printing in Edebug\7f640488
+Node: Tracing\7f642203
+Node: Coverage Testing\7f644089
+Node: The Outside Context\7f646130
+Node: Checking Whether to Stop\7f647079
+Node: Edebug Display Update\7f647726
+Node: Edebug Recursive Edit\7f649749
+Node: Instrumenting Macro Calls\7f651404
+Node: Specification List\7f653886
+Node: Backtracking\7f663297
+Node: Debugging Backquote\7f665235
+Node: Specification Examples\7f668941
+Node: Edebug Options\7f671008
+Node: Read and Print\7f676345
+Node: Streams Intro\7f677322
+Node: Input Streams\7f679340
+Node: Input Functions\7f684241
+Node: Output Streams\7f686301
+Node: Output Functions\7f690352
+Node: Output Variables\7f694652
+Node: Minibuffers\7f699451
+Node: Intro to Minibuffers\7f700603
+Node: Text from Minibuffer\7f702791
+Node: Object from Minibuffer\7f707666
+Node: Minibuffer History\7f710893
+Node: Completion\7f713872
+Node: Basic Completion\7f715847
+Node: Minibuffer Completion\7f720876
+Node: Completion Commands\7f724453
+Node: High-Level Completion\7f729096
+Node: Reading File Names\7f733120
+Node: Programmed Completion\7f736804
+Node: Yes-or-No Queries\7f739186
+Node: Multiple Queries\7f744923
+Node: Reading a Password\7f748990
+Node: Minibuffer Misc\7f750327
+Node: Command Loop\7f755197
+Node: Command Overview\7f756541
+Node: Defining Commands\7f759819
+Node: Using Interactive\7f760567
+Node: Interactive Codes\7f765340
+Node: Interactive Examples\7f771132
+Node: Interactive Call\7f772446
+Node: Command Loop Info\7f777847
+Node: Events\7f782826
+Node: Event Types\7f784286
+Node: Event Contents\7f786209
+Node: Event Predicates\7f790685
+Node: Accessing Mouse Event Positions\7f792010
+Node: Frame-Level Event Position Info\7f792709
+Node: Window-Level Event Position Info\7f793749
+Node: Event Text Position Info\7f795513
+Node: Event Glyph Position Info\7f798005
+Node: Event Toolbar Position Info\7f799328
+Node: Other Event Position Info\7f799999
+Node: Accessing Other Event Info\7f800408
+Node: Working With Events\7f802028
+Node: Converting Events\7f808016
Node: Reading Input\7f810968
Node: Key Sequence Input\7f811970
Node: Reading One Event\7f813924
-Node: Dispatching an Event\7f816685
-Node: Quoted Character Input\7f817136
-Node: Peeking and Discarding\7f818484
-Node: Waiting\7f822388
-Node: Quitting\7f824696
-Node: Prefix Command Arguments\7f829104
-Node: Recursive Editing\7f834191
-Node: Disabling Commands\7f838987
-Node: Command History\7f841055
-Node: Keyboard Macros\7f842792
-Node: Keymaps\7f845009
-Node: Keymap Terminology\7f846586
-Node: Format of Keymaps\7f849515
-Node: Creating Keymaps\7f849926
-Node: Inheritance and Keymaps\7f852005
-Node: Key Sequences\7f854377
-Node: Prefix Keys\7f858947
-Node: Active Keymaps\7f862532
-Node: Key Lookup\7f871747
-Node: Functions for Key Lookup\7f876910
-Node: Changing Key Bindings\7f882607
-Node: Key Binding Commands\7f889504
-Node: Scanning Keymaps\7f891569
-Node: Other Keymap Functions\7f900080
-Node: Menus\7f900702
-Node: Menu Format\7f901244
-Node: Menubar Format\7f909829
-Node: Menubar\7f910454
-Node: Modifying Menus\7f913567
-Node: Menu Filters\7f918581
-Node: Pop-Up Menus\7f920477
-Node: Menu Accelerators\7f922682
-Node: Creating Menu Accelerators\7f923404
-Node: Keyboard Menu Traversal\7f924722
-Node: Menu Accelerator Functions\7f925449
-Node: Buffers Menu\7f928484
-Node: Dialog Boxes\7f929778
-Node: Dialog Box Format\7f929945
-Node: Dialog Box Functions\7f931315
-Node: Toolbar\7f931712
-Node: Toolbar Intro\7f932037
-Node: Toolbar Descriptor Format\7f934447
-Node: Specifying the Toolbar\7f938941
-Node: Other Toolbar Variables\7f942546
-Node: Scrollbars\7f946973
-Node: Drag and Drop\7f947109
-Node: Supported Protocols\7f948185
-Node: OffiX DND\7f948688
-Node: CDE dt\7f949695
-Node: MSWindows OLE\7f950286
-Node: Loose ends\7f950457
-Node: Drop Interface\7f950849
-Node: Drag Interface\7f951871
-Node: Modes\7f952045
-Node: Major Modes\7f952996
-Node: Major Mode Conventions\7f955911
-Node: Example Major Modes\7f961866
-Node: Auto Major Mode\7f969899
-Node: Mode Help\7f977347
-Node: Derived Modes\7f978448
-Node: Minor Modes\7f980639
-Node: Minor Mode Conventions\7f981941
-Node: Keymaps and Minor Modes\7f984804
-Node: Modeline Format\7f985639
-Node: Modeline Data\7f987407
-Node: Modeline Variables\7f991677
-Node: %-Constructs\7f996393
-Node: Hooks\7f999304
-Node: Documentation\7f1006066
-Node: Documentation Basics\7f1007489
-Node: Accessing Documentation\7f1010539
-Node: Keys in Documentation\7f1016818
-Node: Describing Characters\7f1020297
-Node: Help Functions\7f1022646
-Node: Obsoleteness\7f1029097
-Node: Files\7f1032091
-Node: Visiting Files\7f1034016
-Node: Visiting Functions\7f1035521
-Node: Subroutines of Visiting\7f1040568
-Node: Saving Buffers\7f1042641
-Node: Reading from Files\7f1048734
-Node: Writing to Files\7f1050891
-Node: File Locks\7f1053608
-Node: Information about Files\7f1056661
-Node: Testing Accessibility\7f1057422
-Node: Kinds of Files\7f1061162
-Node: Truenames\7f1062843
-Node: File Attributes\7f1063845
-Node: Changing File Attributes\7f1068984
-Node: File Names\7f1074390
-Node: File Name Components\7f1075999
-Node: Directory Names\7f1079100
-Node: Relative File Names\7f1082553
-Node: File Name Expansion\7f1083631
-Node: Unique File Names\7f1087538
-Node: File Name Completion\7f1089153
-Node: User Name Completion\7f1091814
-Node: Contents of Directories\7f1093154
-Node: Create/Delete Dirs\7f1096467
-Node: Magic File Names\7f1097573
-Node: Partial Files\7f1103203
-Node: Intro to Partial Files\7f1103431
-Node: Creating a Partial File\7f1104671
-Node: Detached Partial Files\7f1105606
-Node: Format Conversion\7f1106728
-Node: Files and MS-DOS\7f1113244
-Node: Backups and Auto-Saving\7f1115308
-Node: Backup Files\7f1115983
-Node: Making Backups\7f1117380
-Node: Rename or Copy\7f1120129
-Node: Numbered Backups\7f1122622
-Node: Backup Names\7f1124866
-Node: Auto-Saving\7f1128158
-Node: Reverting\7f1136300
-Node: Buffers\7f1139458
-Node: Buffer Basics\7f1140875
-Node: Current Buffer\7f1142928
-Node: Buffer Names\7f1147616
-Node: Buffer File Name\7f1150821
-Node: Buffer Modification\7f1154940
-Node: Modification Time\7f1157133
-Node: Read Only Buffers\7f1160508
-Node: The Buffer List\7f1162926
-Node: Creating Buffers\7f1167756
-Node: Killing Buffers\7f1169902
-Node: Indirect Buffers\7f1173633
-Node: Windows\7f1176205
-Node: Basic Windows\7f1177683
-Node: Splitting Windows\7f1180781
-Node: Deleting Windows\7f1187670
-Node: Selecting Windows\7f1190350
-Node: Cyclic Window Ordering\7f1193479
-Node: Buffers and Windows\7f1198103
-Node: Displaying Buffers\7f1199944
-Node: Choosing Window\7f1205120
-Node: Window Point\7f1212836
-Node: Window Start\7f1214882
-Node: Vertical Scrolling\7f1219372
-Node: Horizontal Scrolling\7f1225509
-Node: Size of Window\7f1229018
-Node: Position of Window\7f1233736
-Node: Resizing Windows\7f1235976
-Node: Window Configurations\7f1241405
-Node: Frames\7f1244830
-Node: Creating Frames\7f1246599
-Node: Frame Properties\7f1247940
-Node: Property Access\7f1248756
-Node: Initial Properties\7f1249605
-Node: X Frame Properties\7f1252091
-Node: Size and Position\7f1256725
-Node: Frame Name\7f1258721
-Node: Frame Titles\7f1259635
-Node: Deleting Frames\7f1261459
-Node: Finding All Frames\7f1262059
-Node: Frames and Windows\7f1264053
-Node: Minibuffers and Frames\7f1265758
-Node: Input Focus\7f1266676
-Node: Visibility of Frames\7f1269753
-Node: Raising and Lowering\7f1271672
-Node: Frame Configurations\7f1274048
-Node: Frame Hooks\7f1274642
-Node: Consoles and Devices\7f1276447
-Node: Basic Console Functions\7f1279191
-Node: Basic Device Functions\7f1279614
-Node: Console Types and Device Classes\7f1280330
-Node: Connecting to a Console or Device\7f1282527
-Node: The Selected Console and Device\7f1284690
-Node: Console and Device I/O\7f1285716
-Node: Positions\7f1286480
-Node: Point\7f1287449
-Node: Motion\7f1290539
-Node: Character Motion\7f1291306
-Node: Word Motion\7f1293543
-Node: Buffer End Motion\7f1295044
-Node: Text Lines\7f1296541
-Node: Screen Lines\7f1301136
-Node: List Motion\7f1305199
-Node: Skipping Characters\7f1308607
-Node: Excursions\7f1310826
-Node: Narrowing\7f1313858
-Node: Markers\7f1319183
-Node: Overview of Markers\7f1320089
-Node: Predicates on Markers\7f1324781
-Node: Creating Markers\7f1326027
-Node: Information from Markers\7f1330064
-Node: Changing Markers\7f1331162
-Node: The Mark\7f1332540
-Node: The Region\7f1341034
-Node: Text\7f1346721
-Node: Near Point\7f1349420
-Node: Buffer Contents\7f1353607
-Node: Comparing Text\7f1355013
-Node: Insertion\7f1356421
-Node: Commands for Insertion\7f1360263
-Node: Deletion\7f1363219
-Node: User-Level Deletion\7f1366814
-Node: The Kill Ring\7f1370975
-Node: Kill Ring Concepts\7f1373149
-Node: Kill Functions\7f1374203
-Node: Yank Commands\7f1376108
-Node: Low-Level Kill Ring\7f1377979
-Node: Internals of Kill Ring\7f1380765
-Node: Undo\7f1383545
-Node: Maintaining Undo\7f1387874
-Node: Filling\7f1390494
-Node: Margins\7f1396488
-Node: Auto Filling\7f1400417
-Node: Sorting\7f1401598
-Node: Columns\7f1410898
-Node: Indentation\7f1413414
-Node: Primitive Indent\7f1414193
-Node: Mode-Specific Indent\7f1415437
-Node: Region Indent\7f1417948
-Node: Relative Indent\7f1420896
-Node: Indent Tabs\7f1423278
-Node: Motion by Indent\7f1424599
-Node: Case Changes\7f1425378
-Node: Text Properties\7f1428629
-Node: Examining Properties\7f1430442
-Node: Changing Properties\7f1432309
-Node: Property Search\7f1435900
-Node: Special Properties\7f1440611
-Node: Saving Properties\7f1440892
-Node: Substitution\7f1444034
-Node: Registers\7f1447304
-Node: Transposition\7f1449847
-Node: Change Hooks\7f1450741
-Node: Transformations\7f1452781
-Node: Searching and Matching\7f1457166
-Node: String Search\7f1458297
-Node: Regular Expressions\7f1463021
-Node: Syntax of Regexps\7f1464388
-Node: Regexp Example\7f1478767
-Node: Regexp Search\7f1480937
-Node: POSIX Regexps\7f1487025
-Node: Search and Replace\7f1488860
-Node: Match Data\7f1492225
-Node: Simple Match Data\7f1493355
-Node: Replacing Match\7f1497620
-Node: Entire Match Data\7f1499954
-Node: Saving Match Data\7f1501945
-Node: Searching and Case\7f1503326
-Node: Standard Regexps\7f1505360
-Node: Syntax Tables\7f1507558
-Node: Syntax Basics\7f1508672
-Node: Syntax Descriptors\7f1511644
-Node: Syntax Class Table\7f1513494
-Node: Syntax Flags\7f1519532
-Node: Syntax Table Functions\7f1522749
-Node: Motion and Syntax\7f1526613
-Node: Parsing Expressions\7f1528065
-Node: Standard Syntax Tables\7f1534134
-Node: Syntax Table Internals\7f1534978
-Node: Abbrevs\7f1536004
-Node: Abbrev Mode\7f1537807
-Node: Abbrev Tables\7f1538527
-Node: Defining Abbrevs\7f1540060
-Node: Abbrev Files\7f1541965
-Node: Abbrev Expansion\7f1543738
-Node: Standard Abbrev Tables\7f1548369
-Node: Extents\7f1549528
-Node: Intro to Extents\7f1550771
-Node: Creating and Modifying Extents\7f1554765
-Node: Extent Endpoints\7f1556272
-Node: Finding Extents\7f1559535
-Node: Mapping Over Extents\7f1563284
-Node: Extent Properties\7f1569401
-Node: Detached Extents\7f1579545
-Node: Extent Parents\7f1581404
-Node: Duplicable Extents\7f1583099
-Node: Extents and Events\7f1586320
-Node: Atomic Extents\7f1588227
-Node: Specifiers\7f1588674
-Node: Introduction to Specifiers\7f1590481
-Node: Specifiers In-Depth\7f1592791
-Node: Specifier Instancing\7f1597705
-Node: Specifier Types\7f1600967
-Node: Adding Specifications\7f1606041
-Node: Retrieving Specifications\7f1615403
-Node: Specifier Tag Functions\7f1619138
-Node: Specifier Instancing Functions\7f1622372
-Node: Specifier Example\7f1625779
-Node: Creating Specifiers\7f1628885
-Node: Specifier Validation Functions\7f1631134
-Node: Other Specification Functions\7f1633518
-Node: Faces and Window-System Objects\7f1637337
-Node: Faces\7f1637661
-Node: Merging Faces\7f1639278
-Node: Basic Face Functions\7f1641239
-Node: Face Properties\7f1643337
-Node: Face Convenience Functions\7f1652896
-Node: Other Face Display Functions\7f1656026
-Node: Fonts\7f1656839
-Node: Font Specifiers\7f1657540
-Node: Font Instances\7f1657781
-Node: Font Instance Names\7f1658748
-Node: Font Instance Size\7f1659589
-Node: Font Instance Characteristics\7f1660875
-Node: Font Convenience Functions\7f1662044
-Node: Colors\7f1663334
-Node: Color Specifiers\7f1663774
-Node: Color Instances\7f1664001
-Node: Color Instance Properties\7f1664745
-Node: Color Convenience Functions\7f1665371
-Node: Glyphs\7f1666424
-Node: Glyph Functions\7f1668016
-Node: Creating Glyphs\7f1668423
-Node: Glyph Properties\7f1670010
-Node: Glyph Convenience Functions\7f1679177
-Node: Glyph Dimensions\7f1683124
-Node: Images\7f1684204
-Node: Image Specifiers\7f1684653
-Node: Image Instantiator Conversion\7f1696075
-Node: Image Instances\7f1697440
-Node: Image Instance Types\7f1698191
-Node: Image Instance Functions\7f1700846
-Node: Glyph Types\7f1705415
-Node: Mouse Pointer\7f1707187
-Node: Redisplay Glyphs\7f1710190
-Node: Subwindows\7f1711223
-Node: Annotations\7f1711466
-Node: Annotation Basics\7f1712482
-Node: Annotation Primitives\7f1716420
-Node: Annotation Properties\7f1717749
-Node: Locating Annotations\7f1720789
-Node: Margin Primitives\7f1721626
-Node: Annotation Hooks\7f1723520
-Node: Display\7f1724180
-Node: Refresh Screen\7f1725158
-Node: Truncation\7f1727069
-Node: The Echo Area\7f1729594
-Node: Warnings\7f1736029
-Node: Invisible Text\7f1740465
-Node: Selective Display\7f1743044
-Node: Overlay Arrow\7f1747170
-Node: Temporary Displays\7f1748523
-Node: Blinking\7f1752644
-Node: Usual Display\7f1754829
-Node: Display Tables\7f1757378
-Node: Display Table Format\7f1758182
-Node: Active Display Table\7f1759624
-Node: Character Descriptors\7f1760816
-Node: Beeping\7f1761573
-Node: Hash Tables\7f1766339
-Node: Introduction to Hash Tables\7f1766947
-Node: Working With Hash Tables\7f1772970
-Node: Weak Hash Tables\7f1774087
-Node: Range Tables\7f1775886
-Node: Introduction to Range Tables\7f1776575
-Node: Working With Range Tables\7f1777006
-Node: Databases\7f1777891
-Node: Connecting to a Database\7f1778190
-Node: Working With a Database\7f1779281
-Node: Other Database Functions\7f1780139
-Node: Processes\7f1780713
-Node: Subprocess Creation\7f1782937
-Node: Synchronous Processes\7f1786226
-Node: MS-DOS Subprocesses\7f1792944
-Node: Asynchronous Processes\7f1794018
-Node: Deleting Processes\7f1797731
-Node: Process Information\7f1799602
-Node: Input to Processes\7f1803528
-Node: Signals to Processes\7f1805818
-Node: Output from Processes\7f1810238
-Node: Process Buffers\7f1811050
-Node: Filter Functions\7f1813917
-Node: Accepting Output\7f1819487
-Node: Sentinels\7f1821014
-Node: Process Window Size\7f1824504
-Node: Transaction Queues\7f1824853
-Node: Network\7f1826551
-Node: System Interface\7f1828385
-Node: Starting Up\7f1829655
-Node: Start-up Summary\7f1830249
-Node: Init File\7f1833803
-Node: Terminal-Specific\7f1836184
-Node: Command Line Arguments\7f1839343
-Node: Getting Out\7f1842832
-Node: Killing XEmacs\7f1843401
-Node: Suspending XEmacs\7f1845070
-Node: System Environment\7f1848412
-Node: User Identification\7f1855079
-Node: Time of Day\7f1858608
-Node: Time Conversion\7f1861395
-Node: Timers\7f1866435
-Node: Terminal Input\7f1868608
-Node: Input Modes\7f1869111
-Node: Translating Input\7f1871524
-Node: Recording Input\7f1875689
-Node: Terminal Output\7f1877789
-Node: Flow Control\7f1881412
-Node: Batch Mode\7f1885204
-Node: X-Windows\7f1886586
-Node: X Selections\7f1887398
-Node: X Server\7f1889608
-Node: Resources\7f1890009
-Node: Server Data\7f1895150
-Node: Grabs\7f1896357
-Node: X Miscellaneous\7f1897938
-Node: ToolTalk Support\7f1900323
-Node: XEmacs ToolTalk API Summary\7f1900540
-Node: Sending Messages\7f1901840
-Node: Example of Sending Messages\7f1902091
-Node: Elisp Interface for Sending Messages\7f1903153
-Node: Receiving Messages\7f1909546
-Node: Example of Receiving Messages\7f1909769
-Node: Elisp Interface for Receiving Messages\7f1910605
-Node: LDAP Support\7f1914430
-Node: Building XEmacs with LDAP support\7f1914926
-Node: XEmacs LDAP API\7f1915904
-Node: LDAP Variables\7f1916634
-Node: The High-Level LDAP API\7f1919110
-Node: The Low-Level LDAP API\7f1920215
-Node: The LDAP Lisp Object\7f1920489
-Node: Opening and Closing a LDAP Connection\7f1921042
-Node: Searching on a LDAP Server (Low-level)\7f1922825
-Node: Syntax of Search Filters\7f1924218
-Node: Internationalization\7f1925516
-Node: I18N Levels 1 and 2\7f1925853
-Node: I18N Level 3\7f1926559
-Node: Level 3 Basics\7f1926840
-Node: Level 3 Primitives\7f1927673
-Node: Dynamic Messaging\7f1929279
-Node: Domain Specification\7f1929742
-Node: Documentation String Extraction\7f1931645
-Node: I18N Level 4\7f1932563
-Node: MULE\7f1932755
-Node: Internationalization Terminology\7f1933866
-Node: Charsets\7f1942405
-Node: Charset Properties\7f1943101
-Node: Basic Charset Functions\7f1947787
-Node: Charset Property Functions\7f1949968
-Node: Predefined Charsets\7f1952011
-Node: MULE Characters\7f1954931
-Node: Composite Characters\7f1955778
-Node: ISO 2022\7f1957032
-Node: Coding Systems\7f1962754
-Node: Coding System Types\7f1964676
-Node: EOL Conversion\7f1966495
-Node: Coding System Properties\7f1967678
-Node: Basic Coding System Functions\7f1971530
-Node: Coding System Property Functions\7f1973434
-Node: Encoding and Decoding Text\7f1973992
-Node: Detection of Textual Encoding\7f1975128
-Node: Big5 and Shift-JIS Functions\7f1976664
-Node: CCL\7f1977752
-Node: CCL Syntax\7f1980856
-Node: CCL Statements\7f1982444
-Node: CCL Expressions\7f1987092
-Node: Calling CCL\7f1989631
-Node: CCL Examples\7f1992620
-Node: Category Tables\7f1992757
-Node: Tips\7f1995116
-Node: Style Tips\7f1995757
-Node: Compilation Tips\7f2005276
-Node: Documentation Tips\7f2007190
-Node: Comment Tips\7f2012699
-Node: Library Headers\7f2015701
-Node: Building XEmacs and Object Allocation\7f2019673
-Node: Building XEmacs\7f2020556
-Node: Pure Storage\7f2026891
-Node: Garbage Collection\7f2029679
-Node: Standard Errors\7f2040818
-Node: Standard Buffer-Local Variables\7f2045027
-Node: Standard Keymaps\7f2047660
-Node: Standard Hooks\7f2051392
-Node: Index\7f2058892
+Node: Dispatching an Event\7f816741
+Node: Quoted Character Input\7f817192
+Node: Peeking and Discarding\7f818540
+Node: Waiting\7f822444
+Node: Quitting\7f824752
+Node: Prefix Command Arguments\7f829160
+Node: Recursive Editing\7f834247
+Node: Disabling Commands\7f839043
+Node: Command History\7f841111
+Node: Keyboard Macros\7f842848
+Node: Keymaps\7f845065
+Node: Keymap Terminology\7f846642
+Node: Format of Keymaps\7f849571
+Node: Creating Keymaps\7f849982
+Node: Inheritance and Keymaps\7f852061
+Node: Key Sequences\7f854433
+Node: Prefix Keys\7f859229
+Node: Active Keymaps\7f862814
+Node: Key Lookup\7f872135
+Node: Functions for Key Lookup\7f877298
+Node: Changing Key Bindings\7f882995
+Node: Key Binding Commands\7f889892
+Node: Scanning Keymaps\7f891957
+Node: Other Keymap Functions\7f900468
+Node: Menus\7f901090
+Node: Menu Format\7f901682
+Node: Menubar Format\7f910328
+Node: Menubar\7f910953
+Node: Modifying Menus\7f914066
+Node: Menu Filters\7f919080
+Node: Pop-Up Menus\7f920976
+Node: Menu Accelerators\7f923181
+Node: Creating Menu Accelerators\7f923937
+Node: Keyboard Menu Traversal\7f925297
+Node: Menu Accelerator Functions\7f926024
+Node: Buffers Menu\7f929101
+Node: Dialog Boxes\7f930395
+Node: Dialog Box Format\7f930562
+Node: Dialog Box Functions\7f931987
+Node: Toolbar\7f932384
+Node: Toolbar Intro\7f932709
+Node: Toolbar Descriptor Format\7f935118
+Node: Specifying the Toolbar\7f939612
+Node: Other Toolbar Variables\7f943217
+Node: Scrollbars\7f947643
+Node: Drag and Drop\7f947779
+Node: Supported Protocols\7f948855
+Node: OffiX DND\7f949358
+Node: CDE dt\7f950365
+Node: MSWindows OLE\7f950956
+Node: Loose ends\7f951127
+Node: Drop Interface\7f951519
+Node: Drag Interface\7f952541
+Node: Modes\7f952715
+Node: Major Modes\7f953666
+Node: Major Mode Conventions\7f956581
+Node: Example Major Modes\7f962536
+Node: Auto Major Mode\7f970569
+Node: Mode Help\7f978017
+Node: Derived Modes\7f979118
+Node: Minor Modes\7f981309
+Node: Minor Mode Conventions\7f982611
+Node: Keymaps and Minor Modes\7f985474
+Node: Modeline Format\7f986309
+Node: Modeline Data\7f988077
+Node: Modeline Variables\7f992347
+Node: %-Constructs\7f997063
+Node: Hooks\7f999974
+Node: Documentation\7f1006736
+Node: Documentation Basics\7f1008159
+Node: Accessing Documentation\7f1011209
+Node: Keys in Documentation\7f1017488
+Node: Describing Characters\7f1020967
+Node: Help Functions\7f1023316
+Node: Obsoleteness\7f1029767
+Node: Files\7f1032761
+Node: Visiting Files\7f1034686
+Node: Visiting Functions\7f1036191
+Node: Subroutines of Visiting\7f1041238
+Node: Saving Buffers\7f1043311
+Node: Reading from Files\7f1049404
+Node: Writing to Files\7f1051561
+Node: File Locks\7f1054278
+Node: Information about Files\7f1057331
+Node: Testing Accessibility\7f1058092
+Node: Kinds of Files\7f1061832
+Node: Truenames\7f1063513
+Node: File Attributes\7f1064515
+Node: Changing File Attributes\7f1069654
+Node: File Names\7f1075060
+Node: File Name Components\7f1076669
+Node: Directory Names\7f1079770
+Node: Relative File Names\7f1083223
+Node: File Name Expansion\7f1084301
+Node: Unique File Names\7f1088208
+Node: File Name Completion\7f1089823
+Node: User Name Completion\7f1092484
+Node: Contents of Directories\7f1093824
+Node: Create/Delete Dirs\7f1097137
+Node: Magic File Names\7f1098243
+Node: Partial Files\7f1103873
+Node: Intro to Partial Files\7f1104101
+Node: Creating a Partial File\7f1105341
+Node: Detached Partial Files\7f1106276
+Node: Format Conversion\7f1107398
+Node: Files and MS-DOS\7f1113914
+Node: Backups and Auto-Saving\7f1115978
+Node: Backup Files\7f1116653
+Node: Making Backups\7f1118050
+Node: Rename or Copy\7f1120799
+Node: Numbered Backups\7f1123292
+Node: Backup Names\7f1125536
+Node: Auto-Saving\7f1128828
+Node: Reverting\7f1136970
+Node: Buffers\7f1140128
+Node: Buffer Basics\7f1141545
+Node: Current Buffer\7f1143598
+Node: Buffer Names\7f1148286
+Node: Buffer File Name\7f1151491
+Node: Buffer Modification\7f1155610
+Node: Modification Time\7f1157803
+Node: Read Only Buffers\7f1161178
+Node: The Buffer List\7f1163596
+Node: Creating Buffers\7f1168426
+Node: Killing Buffers\7f1170572
+Node: Indirect Buffers\7f1174303
+Node: Windows\7f1176875
+Node: Basic Windows\7f1178353
+Node: Splitting Windows\7f1181451
+Node: Deleting Windows\7f1188340
+Node: Selecting Windows\7f1191020
+Node: Cyclic Window Ordering\7f1194149
+Node: Buffers and Windows\7f1198773
+Node: Displaying Buffers\7f1200614
+Node: Choosing Window\7f1205790
+Node: Window Point\7f1213506
+Node: Window Start\7f1215552
+Node: Vertical Scrolling\7f1220042
+Node: Horizontal Scrolling\7f1226179
+Node: Size of Window\7f1229688
+Node: Position of Window\7f1234406
+Node: Resizing Windows\7f1236646
+Node: Window Configurations\7f1242075
+Node: Frames\7f1245500
+Node: Creating Frames\7f1247269
+Node: Frame Properties\7f1248610
+Node: Property Access\7f1249426
+Node: Initial Properties\7f1250275
+Node: X Frame Properties\7f1252761
+Node: Size and Position\7f1257395
+Node: Frame Name\7f1259391
+Node: Frame Titles\7f1260305
+Node: Deleting Frames\7f1262129
+Node: Finding All Frames\7f1262729
+Node: Frames and Windows\7f1264723
+Node: Minibuffers and Frames\7f1266428
+Node: Input Focus\7f1267346
+Node: Visibility of Frames\7f1270423
+Node: Raising and Lowering\7f1272342
+Node: Frame Configurations\7f1274718
+Node: Frame Hooks\7f1275312
+Node: Consoles and Devices\7f1277117
+Node: Basic Console Functions\7f1279860
+Node: Basic Device Functions\7f1280283
+Node: Console Types and Device Classes\7f1280999
+Node: Connecting to a Console or Device\7f1283196
+Node: The Selected Console and Device\7f1285359
+Node: Console and Device I/O\7f1286385
+Node: Positions\7f1287149
+Node: Point\7f1288118
+Node: Motion\7f1291208
+Node: Character Motion\7f1291975
+Node: Word Motion\7f1294212
+Node: Buffer End Motion\7f1295713
+Node: Text Lines\7f1297210
+Node: Screen Lines\7f1301805
+Node: List Motion\7f1305868
+Node: Skipping Characters\7f1309276
+Node: Excursions\7f1311495
+Node: Narrowing\7f1314527
+Node: Markers\7f1319852
+Node: Overview of Markers\7f1320758
+Node: Predicates on Markers\7f1325450
+Node: Creating Markers\7f1326696
+Node: Information from Markers\7f1330733
+Node: Changing Markers\7f1331831
+Node: The Mark\7f1333209
+Node: The Region\7f1341703
+Node: Text\7f1347389
+Node: Near Point\7f1350088
+Node: Buffer Contents\7f1354275
+Node: Comparing Text\7f1355681
+Node: Insertion\7f1357089
+Node: Commands for Insertion\7f1360931
+Node: Deletion\7f1363887
+Node: User-Level Deletion\7f1367482
+Node: The Kill Ring\7f1371643
+Node: Kill Ring Concepts\7f1373817
+Node: Kill Functions\7f1374871
+Node: Yank Commands\7f1376776
+Node: Low-Level Kill Ring\7f1378647
+Node: Internals of Kill Ring\7f1381433
+Node: Undo\7f1384213
+Node: Maintaining Undo\7f1388542
+Node: Filling\7f1391162
+Node: Margins\7f1397156
+Node: Auto Filling\7f1401085
+Node: Sorting\7f1402266
+Node: Columns\7f1411566
+Node: Indentation\7f1414082
+Node: Primitive Indent\7f1414861
+Node: Mode-Specific Indent\7f1416105
+Node: Region Indent\7f1418616
+Node: Relative Indent\7f1421564
+Node: Indent Tabs\7f1423946
+Node: Motion by Indent\7f1425267
+Node: Case Changes\7f1426046
+Node: Text Properties\7f1429297
+Node: Examining Properties\7f1431110
+Node: Changing Properties\7f1432977
+Node: Property Search\7f1436568
+Node: Special Properties\7f1441279
+Node: Saving Properties\7f1441560
+Node: Substitution\7f1444702
+Node: Registers\7f1447972
+Node: Transposition\7f1450515
+Node: Change Hooks\7f1451409
+Node: Transformations\7f1453449
+Node: Searching and Matching\7f1457834
+Node: String Search\7f1458965
+Node: Regular Expressions\7f1463689
+Node: Syntax of Regexps\7f1465056
+Node: Regexp Example\7f1479435
+Node: Regexp Search\7f1481605
+Node: POSIX Regexps\7f1487693
+Node: Search and Replace\7f1489528
+Node: Match Data\7f1492893
+Node: Simple Match Data\7f1494023
+Node: Replacing Match\7f1498288
+Node: Entire Match Data\7f1500622
+Node: Saving Match Data\7f1502613
+Node: Searching and Case\7f1503994
+Node: Standard Regexps\7f1506028
+Node: Syntax Tables\7f1508226
+Node: Syntax Basics\7f1509340
+Node: Syntax Descriptors\7f1512312
+Node: Syntax Class Table\7f1514162
+Node: Syntax Flags\7f1520200
+Node: Syntax Table Functions\7f1523417
+Node: Motion and Syntax\7f1527281
+Node: Parsing Expressions\7f1528733
+Node: Standard Syntax Tables\7f1534802
+Node: Syntax Table Internals\7f1535646
+Node: Abbrevs\7f1536672
+Node: Abbrev Mode\7f1538475
+Node: Abbrev Tables\7f1539195
+Node: Defining Abbrevs\7f1540728
+Node: Abbrev Files\7f1542633
+Node: Abbrev Expansion\7f1544406
+Node: Standard Abbrev Tables\7f1549037
+Node: Extents\7f1550196
+Node: Intro to Extents\7f1551439
+Node: Creating and Modifying Extents\7f1555433
+Node: Extent Endpoints\7f1556940
+Node: Finding Extents\7f1560203
+Node: Mapping Over Extents\7f1563951
+Node: Extent Properties\7f1570068
+Node: Detached Extents\7f1580212
+Node: Extent Parents\7f1582071
+Node: Duplicable Extents\7f1583765
+Node: Extents and Events\7f1586986
+Node: Atomic Extents\7f1588893
+Node: Specifiers\7f1589340
+Node: Introduction to Specifiers\7f1591453
+Node: Specifiers In-Depth\7f1593763
+Node: Specifier Instancing\7f1598675
+Node: Specifier Types\7f1601937
+Node: Adding Specifications\7f1607011
+Node: Retrieving Specifications\7f1616373
+Node: Specifier Tag Functions\7f1620108
+Node: Specifier Instancing Functions\7f1623342
+Node: Specifier Example\7f1626749
+Node: Creating Specifiers\7f1629905
+Node: Specifier Validation Functions\7f1632154
+Node: Other Specification Functions\7f1634538
+Node: Faces and Window-System Objects\7f1638357
+Node: Faces\7f1638681
+Node: Merging Faces\7f1640298
+Node: Basic Face Functions\7f1642259
+Node: Face Properties\7f1644357
+Node: Face Convenience Functions\7f1654599
+Node: Other Face Display Functions\7f1657729
+Node: Fonts\7f1658542
+Node: Font Specifiers\7f1659243
+Node: Font Instances\7f1659484
+Node: Font Instance Names\7f1660451
+Node: Font Instance Size\7f1661292
+Node: Font Instance Characteristics\7f1662578
+Node: Font Convenience Functions\7f1663747
+Node: Colors\7f1665037
+Node: Color Specifiers\7f1665477
+Node: Color Instances\7f1665704
+Node: Color Instance Properties\7f1666448
+Node: Color Convenience Functions\7f1667074
+Node: Glyphs\7f1668127
+Node: Glyph Functions\7f1669719
+Node: Creating Glyphs\7f1670126
+Node: Glyph Properties\7f1671713
+Node: Glyph Convenience Functions\7f1680880
+Node: Glyph Dimensions\7f1684827
+Node: Images\7f1685907
+Node: Image Specifiers\7f1686356
+Node: Image Instantiator Conversion\7f1697777
+Node: Image Instances\7f1699142
+Node: Image Instance Types\7f1699893
+Node: Image Instance Functions\7f1702548
+Node: Glyph Types\7f1707117
+Node: Mouse Pointer\7f1708889
+Node: Redisplay Glyphs\7f1711892
+Node: Subwindows\7f1712925
+Node: Annotations\7f1713168
+Node: Annotation Basics\7f1714184
+Node: Annotation Primitives\7f1718122
+Node: Annotation Properties\7f1719451
+Node: Locating Annotations\7f1722491
+Node: Margin Primitives\7f1723328
+Node: Annotation Hooks\7f1725222
+Node: Display\7f1725882
+Node: Refresh Screen\7f1726860
+Node: Truncation\7f1728771
+Node: The Echo Area\7f1731296
+Node: Warnings\7f1737731
+Node: Invisible Text\7f1742167
+Node: Selective Display\7f1744746
+Node: Overlay Arrow\7f1748872
+Node: Temporary Displays\7f1750225
+Node: Blinking\7f1754346
+Node: Usual Display\7f1756531
+Node: Display Tables\7f1759080
+Node: Display Table Format\7f1759884
+Node: Active Display Table\7f1761326
+Node: Character Descriptors\7f1762518
+Node: Beeping\7f1763275
+Node: Hash Tables\7f1768041
+Node: Introduction to Hash Tables\7f1768649
+Node: Working With Hash Tables\7f1774672
+Node: Weak Hash Tables\7f1775789
+Node: Range Tables\7f1777588
+Node: Introduction to Range Tables\7f1778277
+Node: Working With Range Tables\7f1778708
+Node: Databases\7f1779593
+Node: Connecting to a Database\7f1779892
+Node: Working With a Database\7f1780983
+Node: Other Database Functions\7f1781841
+Node: Processes\7f1782415
+Node: Subprocess Creation\7f1784639
+Node: Synchronous Processes\7f1787928
+Node: MS-DOS Subprocesses\7f1794646
+Node: Asynchronous Processes\7f1795720
+Node: Deleting Processes\7f1799433
+Node: Process Information\7f1801304
+Node: Input to Processes\7f1805230
+Node: Signals to Processes\7f1807520
+Node: Output from Processes\7f1811940
+Node: Process Buffers\7f1812752
+Node: Filter Functions\7f1815619
+Node: Accepting Output\7f1821189
+Node: Sentinels\7f1822716
+Node: Process Window Size\7f1826206
+Node: Transaction Queues\7f1826555
+Node: Network\7f1828253
+Node: System Interface\7f1830087
+Node: Starting Up\7f1831357
+Node: Start-up Summary\7f1831951
+Node: Init File\7f1835505
+Node: Terminal-Specific\7f1837886
+Node: Command Line Arguments\7f1841045
+Node: Getting Out\7f1844534
+Node: Killing XEmacs\7f1845103
+Node: Suspending XEmacs\7f1846772
+Node: System Environment\7f1850114
+Node: User Identification\7f1856781
+Node: Time of Day\7f1860310
+Node: Time Conversion\7f1863097
+Node: Timers\7f1868137
+Node: Terminal Input\7f1870310
+Node: Input Modes\7f1870813
+Node: Translating Input\7f1873226
+Node: Recording Input\7f1877391
+Node: Terminal Output\7f1879491
+Node: Flow Control\7f1883114
+Node: Batch Mode\7f1886906
+Node: X-Windows\7f1888288
+Node: X Selections\7f1889159
+Node: X Server\7f1891369
+Node: Resources\7f1891820
+Node: Server Data\7f1897129
+Node: Grabs\7f1898336
+Node: X Miscellaneous\7f1899916
+Node: ToolTalk Support\7f1902301
+Node: XEmacs ToolTalk API Summary\7f1902518
+Node: Sending Messages\7f1903818
+Node: Example of Sending Messages\7f1904069
+Node: Elisp Interface for Sending Messages\7f1905131
+Node: Receiving Messages\7f1911523
+Node: Example of Receiving Messages\7f1911746
+Node: Elisp Interface for Receiving Messages\7f1912582
+Node: LDAP Support\7f1916407
+Node: Building XEmacs with LDAP support\7f1916903
+Node: XEmacs LDAP API\7f1917881
+Node: LDAP Variables\7f1918611
+Node: The High-Level LDAP API\7f1921087
+Node: The Low-Level LDAP API\7f1922192
+Node: The LDAP Lisp Object\7f1922466
+Node: Opening and Closing a LDAP Connection\7f1923019
+Node: Searching on a LDAP Server (Low-level)\7f1924802
+Node: Syntax of Search Filters\7f1926195
+Node: Internationalization\7f1927493
+Node: I18N Levels 1 and 2\7f1927830
+Node: I18N Level 3\7f1928536
+Node: Level 3 Basics\7f1928817
+Node: Level 3 Primitives\7f1929650
+Node: Dynamic Messaging\7f1931256
+Node: Domain Specification\7f1931719
+Node: Documentation String Extraction\7f1933622
+Node: I18N Level 4\7f1934540
+Node: MULE\7f1934732
+Node: Internationalization Terminology\7f1935843
+Node: Charsets\7f1944377
+Node: Charset Properties\7f1945073
+Node: Basic Charset Functions\7f1949759
+Node: Charset Property Functions\7f1951940
+Node: Predefined Charsets\7f1953982
+Node: MULE Characters\7f1956902
+Node: Composite Characters\7f1957749
+Node: ISO 2022\7f1959003
+Node: Coding Systems\7f1965145
+Node: Coding System Types\7f1967066
+Node: EOL Conversion\7f1968885
+Node: Coding System Properties\7f1970068
+Node: Basic Coding System Functions\7f1973920
+Node: Coding System Property Functions\7f1975824
+Node: Encoding and Decoding Text\7f1976382
+Node: Detection of Textual Encoding\7f1977518
+Node: Big5 and Shift-JIS Functions\7f1979054
+Node: CCL\7f1980142
+Node: CCL Syntax\7f1983246
+Node: CCL Statements\7f1984834
+Node: CCL Expressions\7f1989482
+Node: Calling CCL\7f1992021
+Node: CCL Examples\7f1995010
+Node: Category Tables\7f1995147
+Node: Tips\7f1997505
+Node: Style Tips\7f1998146
+Node: Compilation Tips\7f2007665
+Node: Documentation Tips\7f2009579
+Node: Comment Tips\7f2015088
+Node: Library Headers\7f2018090
+Node: Building XEmacs and Object Allocation\7f2022062
+Node: Building XEmacs\7f2022945
+Node: Pure Storage\7f2029280
+Node: Garbage Collection\7f2032068
+Node: Standard Errors\7f2043207
+Node: Standard Buffer-Local Variables\7f2047416
+Node: Standard Keymaps\7f2050049
+Node: Standard Hooks\7f2053781
+Node: Index\7f2061281
\1f
End Tag Table
* Buffer Type:: The basic object of editing.
* Window Type:: What makes buffers visible.
-* Window Configuration Type::Save what the screen looks like.
+* Window Configuration Type:: Save what the screen looks like.
* Marker Type:: A position in a buffer.
* Process Type:: A process running on the underlying OS.
* Stream Type:: Receive or send characters.
Strings and Characters
-* Basics: String Basics. Basic properties of strings and characters.
+* String Basics:: Basic properties of strings and characters.
* Predicates for Strings:: Testing whether an object is a string or char.
* Creating Strings:: Functions to allocate new strings.
* Predicates for Characters:: Testing whether an object is a character.
(defcustom show-paren-mode nil
"Toggle Show Paren mode...."
:set (lambda (symbol value)
- (show-paren-mode (or value 0)))
+ (show-paren-mode (or value 0)))
:initialize 'custom-initialize-default
:type 'boolean
:group 'paren-showing
This function converts a numeric ASCII value to an event structure,
replete with modifier bits. CH is the character to convert, and
EVENT is the event object to fill in. This function contains
- knowledge about what the codes "mean" - for example, the number 9
- is converted to the character <Tab>, not the distinct character
+ knowledge about what the codes "mean"--for example, the number 9 is
+ converted to the character <Tab>, not the distinct character
<Control-I>.
Note that CH does not have to be a numeric value, but can be a
`dispatch-event') and discarded. This function is provided as a
convenience; it is equivalent to the Lisp code
- (while (progn
- (next-event event)
- (not (or (key-press-event-p event)
- (button-press-event-p event)
- (button-release-event-p event)
- (menu-event-p event))))
- (dispatch-event event))
+ (while (progn
+ (next-event event)
+ (not (or (key-press-event-p event)
+ (button-press-event-p event)
+ (button-release-event-p event)
+ (menu-event-p event))))
+ (dispatch-event event))
Here is what happens if you call `next-command-event' and then
press the right-arrow function key:
elements of this vector may also be keysyms if they have no modifiers.
That is, the `A' keystroke is represented by all of these forms:
- A ?A 65 (A) (?A) (65)
- [A] [?A] [65] [(A)] [(?A)] [(65)]
+ A ?A 65 (A) (?A) (65)
+ [A] [?A] [65] [(A)] [(?A)] [(65)]
the `control-a' keystroke is represented by these forms:
- (control A) (control ?A) (control 65)
- [(control A)] [(control ?A)] [(control 65)]
+ (control A) (control ?A) (control 65)
+ [(control A)] [(control ?A)] [(control 65)]
the key sequence `control-c control-a' is represented by these forms:
- [(control c) (control a)] [(control ?c) (control ?a)]
- [(control 99) (control 65)] etc.
+ [(control c) (control a)] [(control ?c) (control ?a)]
+ [(control 99) (control 65)] etc.
Mouse button clicks work just like keypresses: `(control button1)'
means pressing the left mouse button while holding down the control
Binding a command to this will actually bind both of those key
sequences. Likewise for the following pairs:
- control h backspace
- control i tab
- control m return
- control j linefeed
- control [ escape
- control @ control space
+ control h backspace
+ control i tab
+ control m return
+ control j linefeed
+ control [ escape
+ control @ control space
After binding a command to two key sequences with a form like
- (define-key global-map "\^X\^I" 'command-1)
+ (define-key global-map "\^X\^I" 'command-1)
it is possible to redefine only one of those sequences like so:
- (define-key global-map [(control x) (control i)] 'command-2)
- (define-key global-map [(control x) tab] 'command-3)
+ (define-key global-map [(control x) (control i)] 'command-2)
+ (define-key global-map [(control x) tab] 'command-3)
Of course, all of this applies only when running under a window
system. If you're talking to XEmacs through a TTY connection, you
=> #<keymap lisp-interaction-mode-map 5 entries 0x558>
(describe-bindings-internal (current-local-map))
=> ; Inserted into the buffer:
- backspace backward-delete-char-untabify
- linefeed eval-print-last-sexp
- delete delete-char
- C-j eval-print-last-sexp
- C-x << Prefix Command >>
- M-tab lisp-complete-symbol
- M-; lisp-indent-for-comment
- M-C-i lisp-complete-symbol
- M-C-q indent-sexp
- M-C-x eval-defun
- Alt-backspace backward-kill-sexp
- Alt-delete kill-sexp
+ backspace backward-delete-char-untabify
+ linefeed eval-print-last-sexp
+ delete delete-char
+ C-j eval-print-last-sexp
+ C-x << Prefix Command >>
+ M-tab lisp-complete-symbol
+ M-; lisp-indent-for-comment
+ M-C-i lisp-complete-symbol
+ M-C-q indent-sexp
+ M-C-x eval-defun
+ Alt-backspace backward-kill-sexp
+ Alt-delete kill-sexp
- C-x x edebug-defun
+ C-x x edebug-defun
- Function: current-minor-mode-maps
This function returns a list of the keymaps of currently enabled
* Menu:
-* Menu Format:: Format of a menu description.
-* Menubar Format:: How to specify a menubar.
-* Menubar:: Functions for controlling the menubar.
-* Modifying Menus:: Modifying a menu description.
-* Pop-Up Menus:: Functions for specifying pop-up menus.
-* Menu Filters:: Filter functions for the default menubar.
-* Menu Accelerators:: Using and controlling menu accelerator keys
-* Buffers Menu:: The menu that displays the list of buffers.
+* Menu Format:: Format of a menu description.
+* Menubar Format:: How to specify a menubar.
+* Menubar:: Functions for controlling the menubar.
+* Modifying Menus:: Modifying a menu description.
+* Pop-Up Menus:: Functions for specifying pop-up menus.
+* Menu Filters:: Filter functions for the default menubar.
+* Menu Accelerators:: Using and controlling menu accelerator keys
+* Buffers Menu:: The menu that displays the list of buffers.
\1f
File: lispref.info, Node: Menu Format, Next: Menubar Format, Up: Menus
For example:
("File"
- :filter file-menu-filter ; file-menu-filter is a function that takes
- ; one argument (a list of menu items) and
- ; returns a list of menu items
+ :filter file-menu-filter ; file-menu-filter is a function that takes
+ ; one argument (a list of menu items) and
+ ; returns a list of menu items
[ "Save As..." write-file]
[ "Revert Buffer" revert-buffer :active (buffer-modified-p) ]
[ "Read Only" toggle-read-only :style toggle :selected buffer-read-only ]
* Menu:
-* Creating Menu Accelerators:: How to add accelerator keys to a menu.
-* Keyboard Menu Traversal:: How to use and modify the keys which are used
- to traverse the menu structure.
-* Menu Accelerator Functions:: Functions for working with menu accelerators.
+* Creating Menu Accelerators:: How to add accelerator keys to a menu.
+* Keyboard Menu Traversal:: How to use and modify the keys which are used
+ to traverse the menu structure.
+* Menu Accelerator Functions:: Functions for working with menu accelerators.
\1f
File: lispref.info, Node: Creating Menu Accelerators, Next: Keyboard Menu Traversal, Up: Menu Accelerators
For example, the command
(add-submenu nil '("%_Test"
- ["One" (insert "1") :accelerator ?1 :active t]
- ["%_Two" (insert "2")]
- ["%_3" (insert "3")]))
+ ["One" (insert "1") :accelerator ?1 :active t]
+ ["%_Two" (insert "2")]
+ ["%_3" (insert "3")]))
will add a new menu to the top level menubar. The new menu can be
reached by pressing "t" while the top level menubar is active. When
(setq menu-accelerator-modifiers '(meta control))
(setq menu-accelerator-enabled 'menu-force)
(add-submenu nil '("%_Test"
- ["One" (insert "1") :accelerator ?1 :active t]
- ["%_Two" (insert "2")]
- ["%_3" (insert "3")]))
+ ["One" (insert "1") :accelerator ?1 :active t]
+ ["%_Two" (insert "2")]
+ ["%_3" (insert "3")]))
will add the menu "Test" to the top level menubar. Pressing C-x
followed by C-M-T will activate the menubar and display the "Test"
The syntax, more precisely:
- form := <something to pass to `eval'>
- command := <a symbol or string, to pass to `call-interactively'>
- callback := command | form
- active-p := <t, nil, or a form to evaluate to decide whether this
- button should be selectable>
- name := <string>
- partition := 'nil'
- button := '[' name callback active-p ']'
- dialog := '(' name [ button ]+ [ partition [ button ]+ ] ')'
+ form := <something to pass to `eval'>
+ command := <a symbol or string, to pass to `call-interactively'>
+ callback := command | form
+ active-p := <t, nil, or a form to evaluate to decide whether this
+ button should be selectable>
+ name := <string>
+ partition := 'nil'
+ button := '[' name callback active-p ']'
+ dialog := '(' name [ button ]+ [ partition [ button ]+ ] ')'
\1f
File: lispref.info, Node: Dialog Box Functions, Prev: Dialog Box Format, Up: Dialog Boxes
=============
A "toolbar" is a bar of icons displayed along one edge of a frame.
-You can view a toolbar as a series of menu shortcuts - the most common
+You can view a toolbar as a series of menu shortcuts--the most common
menu options can be accessed with a single click rather than a series
of clicks and/or drags to select the option from a menu. Consistent
with this, a help string (called the "help-echo") describing what an
buffer does not specify a left toolbar or has a nil value specified for
`left-toolbar-visible-p'), you will find that, when that buffer is
displayed in the selected window, the window will have a width of 86 or
-87 characters - the frame is sized for a 68-pixel left toolbar but the
+87 characters--the frame is sized for a 68-pixel left toolbar but the
selected window specifies that the left toolbar is not visible, so it is
expanded to take up the slack.
A "console" is an object representing a single input connection to
XEmacs, such as an X display or a TTY connection. It is possible for
XEmacs to have frames on multiple consoles at once (even on
-heterogeneous types - you can simultaneously have a frame on an X
+heterogeneous types--you can simultaneously have a frame on an X
display and a TTY connection). Normally, there is only one console in
existence.
When `zmacs-regions' is non-`nil' (this is the default), the concept
of an "active region" exists. The region is active when the
corresponding mark is active. Note that only one active region at a
-time can exist - i.e. only one buffer's region is active at a time.
+time can exist--i.e. only one buffer's region is active at a time.
*Note The Mark::, for more information about active regions.
- User Option: zmacs-regions
`old-memq', etc.) that pretend like characters are integers are the
same. Byte code compiled under any version 19 Emacs will have all such
functions mapped to their `old-' equivalents when the byte code is read
-into XEmacs 20. This is to preserve compatibility - Emacs 19 converts
+into XEmacs 20. This is to preserve compatibility--Emacs 19 converts
all constant characters to the equivalent integer during
byte-compilation, and thus there is no other way to preserve byte-code
compatibility even if the code has specifically been written with the
code". For example, the character `A' is represented as the
integer 65, following the standard ASCII representation of characters.
If XEmacs was not compiled with MULE support, the range of this integer
-will always be 0 to 255 - eight bits, or one byte. (Integers outside
+will always be 0 to 255--eight bits, or one byte. (Integers outside
this range are accepted but silently truncated; however, you should
most decidedly _not_ rely on this, because it will not work under
XEmacs with MULE support.) When MULE support is present, the range of
The following low-level functions are provided for explicitly
traversing the extents in a buffer according to the display order.
-These functions are mostly intended for debugging - in normal
-operation, you should probably use `mapcar-extents' or `map-extents',
-or loop using the BEFORE argument to `extent-at', rather than creating
-a loop using `next-extent'.
+These functions are mostly intended for debugging--in normal operation,
+you should probably use `mapcar-extents' or `map-extents', or loop
+using the BEFORE argument to `extent-at', rather than creating a loop
+using `next-extent'.
- Function: next-extent extent
Given an extent EXTENT, this function returns the next extent in
It is possible for an extent's parent to itself have a parent, and
so on. Through this, a whole tree of extents can be created, all
deriving their properties from one root extent. Note, however, that
-you cannot create an inheritance loop - this is explicitly disallowed.
+you cannot create an inheritance loop--this is explicitly disallowed.
Parent extents are used to implement the extents over the modeline.
* Menu:
-* Introduction to Specifiers:: Specifiers provide a clean way for
- display and other properties to vary
- (under user control) in a wide variety
- of contexts.
-* Specifiers In-Depth:: Gory details about specifier innards.
-* Specifier Instancing:: Instancing means obtaining the ``value'' of
- a specifier in a particular context.
-* Specifier Types:: Specifiers come in different flavors.
-* Adding Specifications:: Specifications control a specifier's ``value''
- by giving conditions under which a
- particular value is valid.
-* Retrieving Specifications:: Querying a specifier's specifications.
-* Specifier Tag Functions:: Working with specifier tags.
+* Introduction to Specifiers:: Specifiers provide a clean way for
+ display and other properties to vary
+ (under user control) in a wide variety
+ of contexts.
+* Specifiers In-Depth:: Gory details about specifier innards.
+* Specifier Instancing:: Instancing means obtaining the ``value'' of
+ a specifier in a particular context.
+* Specifier Types:: Specifiers come in different flavors.
+* Adding Specifications:: Specifications control a specifier's ``value''
+ by giving conditions under which a
+ particular value is valid.
+* Retrieving Specifications:: Querying a specifier's specifications.
+* Specifier Tag Functions:: Working with specifier tags.
* Specifier Instancing Functions::
- Functions to instance a specifier.
-* Specifier Example:: Making all this stuff clearer.
-* Creating Specifiers:: Creating specifiers for your own use.
+ Functions to instance a specifier.
+* Specifier Example:: Making all this stuff clearer.
+* Creating Specifiers:: Creating specifiers for your own use.
* Specifier Validation Functions::
- Validating the components of a specifier.
+ Validating the components of a specifier.
* Other Specification Functions::
- Other ways of working with specifications.
+ Other ways of working with specifications.
\1f
File: lispref.info, Node: Introduction to Specifiers, Next: Specifiers In-Depth, Up: Specifiers
an optional predicate specified. An application can create its own
tag, use it to mark all its instantiators, and be fairly confident that
it will not interfere with other applications that modify the same
-specifier - Functions that add a specification to a specifier usually
+specifier--Functions that add a specification to a specifier usually
only overwrite existing inst-pairs with the same tag set as was given,
and a particular tag or tag set can be specified when removing
instantiators.
different font names, with possibly different foundries, widths, etc.,
on different devices), the extra properties of that font on that
device, etc. Furthermore, this conversion (called "instantiation")
-might fail - a font or color might not exist on a particular device,
-for example.
+might fail--a font or color might not exist on a particular device, for
+example.
=> ((#<buffer "device.c"> (nil . "forest green"))
(#<window on "Makefile" 0x8a2b> (nil . "hot pink"))
(#<x-frame "emacs" 0x4ac> (nil . "puke orange")
- (nil . "moccasin"))
+ (nil . "moccasin"))
(#<x-frame "VM" 0x4ac> (nil . "magenta"))
- (global ((tty) . "cyan") (nil . "white"))
+ (global ((tty) . "cyan") (nil . "white"))
)
Then, say we want to determine what the background color of the
The result is arrived at like this:
1. First, we look for a specification matching the buffer displayed
- in the window, i.e. `*scratch'. There are none, so we proceed.
+ in the window, i.e. `*scratch*'. There are none, so we proceed.
2. Then, we look for a specification matching the window itself.
Again, there are none.
If the value of the property is not a specifier, it will
automatically be converted into a `generic' specifier.
+ - Function: remove-face-property face property &optional local tag-set
+ exact-p
+ This function removes a property of a FACE.
+
+ For built-in properties, this is analogous to `remove-specifier'.
+ For more information, *Note Other Specification Functions::.
+
+ When PROPERTY is not a built-in property, this function will just
+ remove its value if LOCALE is `nil' or `all'. However, if LOCALE
+ is other than that, this function will attempt to remove VALUE as
+ the instantiator for the given LOCALE with `remove-specifier'. If
+ the value of the property is not a specifier, it will be converted
+ into a `generic' specifier automatically.
+
- Function: face-property face property &optional locale
This function returns FACE's value of the given PROPERTY.
Image instantiators come in many formats: `xbm', `xpm', `gif',
`jpeg', etc. This describes the format of the data describing the
-image. The resulting image instances also come in many types -
-`mono-pixmap', `color-pixmap', `text', `pointer', etc. This refers to
-the behavior of the image and the sorts of places it can appear. (For
-example, a color-pixmap image has fixed colors specified for it, while
-a mono-pixmap image comes in two unspecified shades "foreground" and
-"background" that are determined from the face of the glyph or
-surrounding text; a text image appears as a string of text and has an
-unspecified foreground, background, and font; a pointer image behaves
-like a mono-pixmap image but can only be used as a mouse pointer
-[mono-pixmap images cannot be used as mouse pointers]; etc.) It is
-important to keep the distinction between image instantiator format and
-image instance type in mind. Typically, a given image instantiator
+image. The resulting image instances also come in many
+types--`mono-pixmap', `color-pixmap', `text', `pointer', etc. This
+refers to the behavior of the image and the sorts of places it can
+appear. (For example, a color-pixmap image has fixed colors specified
+for it, while a mono-pixmap image comes in two unspecified shades
+"foreground" and "background" that are determined from the face of the
+glyph or surrounding text; a text image appears as a string of text and
+has an unspecified foreground, background, and font; a pointer image
+behaves like a mono-pixmap image but can only be used as a mouse
+pointer [mono-pixmap images cannot be used as mouse pointers]; etc.) It
+is important to keep the distinction between image instantiator format
+and image instance type in mind. Typically, a given image instantiator
format can result in many different image instance types (for example,
`xpm' can be instanced as `color-pixmap', `mono-pixmap', or `pointer';
whereas `cursor-font' can be instanced only as `pointer'), and a
* Menu:
-* Basics: String Basics. Basic properties of strings and characters.
+* String Basics:: Basic properties of strings and characters.
* Predicates for Strings:: Testing whether an object is a string or char.
* Creating Strings:: Functions to allocate new strings.
* Predicates for Characters:: Testing whether an object is a character.
* Menu:
-* X Selections:: Transferring text to and from other X clients.
-* X Server:: Information about the X server connected to
- a particular device.
+* X Selections:: Transferring text to and from other X clients.
+* X Server:: Information about the X server connected to
+ a particular device.
* X Miscellaneous:: Other X-specific functions and variables.
\1f
* Menu:
-* Resources:: Getting resource values from the server.
-* Server Data:: Getting info about the X server.
-* Grabs:: Restricting access to the server by other apps.
+* Resources:: Getting resource values from the server.
+* Server Data:: Getting info about the X server.
+* Grabs:: Restricting access to the server by other apps.
\1f
File: lispref.info, Node: Resources, Next: Server Data, Up: X Server
is an interface to a C call something like
`XrmGetResource (db, "xemacs.buffer.BUFFER-NAME.foreground",
- "Emacs.EmacsLocaleType.EmacsBuffer.Foreground",
- "String");'
+ "Emacs.EmacsLocaleType.EmacsBuffer.Foreground",
+ "String");'
2. If LOCALE is a frame, a call
is an interface to a C call something like
`XrmGetResource (db, "xemacs.frame.FRAME-NAME.foreground",
- "Emacs.EmacsLocaleType.EmacsFrame.Foreground",
- "String");'
+ "Emacs.EmacsLocaleType.EmacsFrame.Foreground",
+ "String");'
3. If LOCALE is a device, a call
is an interface to a C call something like
`XrmGetResource (db, "xemacs.device.DEVICE-NAME.foreground",
- "Emacs.EmacsLocaleType.EmacsDevice.Foreground",
- "String");'
+ "Emacs.EmacsLocaleType.EmacsDevice.Foreground",
+ "String");'
4. If LOCALE is the symbol `global', a call
is an interface to a C call something like
`XrmGetResource (db, "xemacs.foreground",
- "Emacs.Foreground",
- "String");'
+ "Emacs.Foreground",
+ "String");'
Note that for `global', no prefix is added other than that of the
application itself; thus, you can use this locale to retrieve
- Function: x-grab-keyboard &optional device
This function grabs the keyboard on the given device (defaulting
to the selected one). So long as the keyboard is grabbed, all
- keyboard events will be delivered to XEmacs - it is not possible
+ keyboard events will be delivered to XEmacs--it is not possible
for other X clients to eavesdrop on them. Ungrab the keyboard
with `x-ungrab-keyboard' (use an `unwind-protect'). Returns `t'
if the grab was successful; `nil' otherwise.
Send a reply to this message. The second argument can be `reply',
`reject' or `fail'; the default is `reply'. Before sending a
reply, all message arguments whose mode is `TT_INOUT' or `TT_OUT'
- should have been filled in - see `set-tooltalk-message-attribute'.
+ should have been filled in--see `set-tooltalk-message-attribute'.
- Function: get-tooltalk-message-attribute msg attribute &optional argn
* Domain Specification::
* Documentation String Extraction::
-\1f
-File: lispref.info, Node: Level 3 Basics, Next: Level 3 Primitives, Up: I18N Level 3
-
-Level 3 Basics
---------------
-
- XEmacs now provides alpha-level functionality for I18N Level 3.
-This means that everything necessary for full messaging is available,
-but not every file has been converted.
-
- The two message files which have been created are `src/emacs.po' and
-`lisp/packages/mh-e.po'. Both files need to be converted using
-`msgfmt', and the resulting `.mo' files placed in some locale's
-`LC_MESSAGES' directory. The test "translations" in these files are
-the original messages prefixed by `TRNSLT_'.
-
- The domain for a variable is stored on the variable's property list
-under the property name VARIABLE-DOMAIN. The function
-`documentation-property' uses this information when translating a
-variable's documentation.
-
Foundation instead of in the original English.
\1f
+File: lispref.info, Node: Level 3 Basics, Next: Level 3 Primitives, Up: I18N Level 3
+
+Level 3 Basics
+--------------
+
+ XEmacs now provides alpha-level functionality for I18N Level 3.
+This means that everything necessary for full messaging is available,
+but not every file has been converted.
+
+ The two message files which have been created are `src/emacs.po' and
+`lisp/packages/mh-e.po'. Both files need to be converted using
+`msgfmt', and the resulting `.mo' files placed in some locale's
+`LC_MESSAGES' directory. The test "translations" in these files are
+the original messages prefixed by `TRNSLT_'.
+
+ The domain for a variable is stored on the variable's property list
+under the property name VARIABLE-DOMAIN. The function
+`documentation-property' uses this information when translating a
+variable's documentation.
+
+\1f
File: lispref.info, Node: Level 3 Primitives, Next: Dynamic Messaging, Prev: Level 3 Basics, Up: I18N Level 3
Level 3 Primitives
In some cases, the differences will be significant enough that it is
actually possible to identify two or more distinct shapes that both
represent the same character. For example, the lowercase letters `a'
-and `g' each have two distinct possible shapes - the `a' can optionally
+and `g' each have two distinct possible shapes--the `a' can optionally
have a curved tail projecting off the top, and the `g' can be formed
either of two loops, or of one loop and a tail hanging off the bottom.
Such distinct possible shapes of a character are called "glyphs". The
important characteristic of two glyphs making up the same character is
that the choice between one or the other is purely stylistic and has no
linguistic effect on a word (this is the reason why a capital `A' and
-lowercase `a' are different characters rather than different glyphs -
-e.g. `Aspen' is a city while `aspen' is a kind of tree).
+lowercase `a' are different characters rather than different
+glyphs--e.g. `Aspen' is a city while `aspen' is a kind of tree).
Note that "character" and "glyph" are used differently here than
elsewhere in XEmacs.
letters, etc. Note that for many of the Asian character sets, there is
no natural ordering of the characters. The actual orderings are based
on one or more salient characteristic, of which there are many to
-choose from - e.g. number of strokes, common radicals, phonetic
+choose from--e.g. number of strokes, common radicals, phonetic
ordering, etc.
The set of numbers assigned to any particular character are called
not understand the difference between a character set and an encoding.)
This is not possible, however, if more than one character set is to be
used in the encoding. For example, printed Japanese text typically
-requires characters from multiple character sets - ASCII, JISX0208, and
+requires characters from multiple character sets--ASCII, JISX0208, and
JISX0212, to be specific. Each of these is indexed using one or more
position codes in the range 33 through 126, so the position codes could
not be used directly or there would be no way to tell which character
-was meant. Different Japanese encodings handle this differently - JIS
+was meant. Different Japanese encodings handle this differently--JIS
uses special escape characters to denote different character sets; EUC
sets the high bit of the position codes for JISX0208 and JISX0212, and
puts a special extra byte before each JISX0212 character; etc. (JIS,
(in TTY mode) of CHARSET.
- Function: charset-direction charset
- This function returns the display direction of CHARSET - either
+ This function returns the display direction of CHARSET--either
`l2r' or `r2l'.
- Function: charset-final charset
into 4 areas: C0, GL, C1, and GR. GL and GR are the areas into which a
register of charset can be invoked into.
- C0: 0x00 - 0x1F
- GL: 0x20 - 0x7F
- C1: 0x80 - 0x9F
- GR: 0xA0 - 0xFF
+ C0: 0x00 - 0x1F
+ GL: 0x20 - 0x7F
+ C1: 0x80 - 0x9F
+ GR: 0xA0 - 0xFF
Usually, in the initial state, G0 is invoked into GL, and G1 is
invoked into GR.
Charset designation is done by escape sequences of the form:
- ESC [I] I F
+ ESC [I] I F
where I is an intermediate character in the range 0x20 - 0x2F, and F
is the final character identifying this charset.
The meaning of intermediate characters are:
- $ [0x24]: indicate charset of dimension 2 (94x94 or 96x96).
- ( [0x28]: designate to G0 a 94-charset whose final byte is F.
- ) [0x29]: designate to G1 a 94-charset whose final byte is F.
- * [0x2A]: designate to G2 a 94-charset whose final byte is F.
- + [0x2B]: designate to G3 a 94-charset whose final byte is F.
- - [0x2D]: designate to G1 a 96-charset whose final byte is F.
- . [0x2E]: designate to G2 a 96-charset whose final byte is F.
- / [0x2F]: designate to G3 a 96-charset whose final byte is F.
+ $ [0x24]: indicate charset of dimension 2 (94x94 or 96x96).
+ ( [0x28]: designate to G0 a 94-charset whose final byte is F.
+ ) [0x29]: designate to G1 a 94-charset whose final byte is F.
+ * [0x2A]: designate to G2 a 94-charset whose final byte is F.
+ + [0x2B]: designate to G3 a 94-charset whose final byte is F.
+ - [0x2D]: designate to G1 a 96-charset whose final byte is F.
+ . [0x2E]: designate to G2 a 96-charset whose final byte is F.
+ / [0x2F]: designate to G3 a 96-charset whose final byte is F.
The following rule is not allowed in ISO 2022 but can be used in
Mule.
- , [0x2C]: designate to G0 a 96-charset whose final byte is F.
+ , [0x2C]: designate to G0 a 96-charset whose final byte is F.
Here are examples of designations:
- ESC ( B : designate to G0 ASCII
- ESC - A : designate to G1 Latin-1
- ESC $ ( A or ESC $ A : designate to G0 GB2312
- ESC $ ( B or ESC $ B : designate to G0 JISX0208
- ESC $ ) C : designate to G1 KSC5601
+ ESC ( B : designate to G0 ASCII
+ ESC - A : designate to G1 Latin-1
+ ESC $ ( A or ESC $ A : designate to G0 GB2312
+ ESC $ ( B or ESC $ B : designate to G0 JISX0208
+ ESC $ ) C : designate to G1 KSC5601
To use a charset designated to G2 or G3, and to use a charset
designated to G1 in a 7-bit environment, you must explicitly invoke G1,
Locking Shift is done as follows:
- LS0 or SI (0x0F): invoke G0 into GL
- LS1 or SO (0x0E): invoke G1 into GL
- LS2: invoke G2 into GL
- LS3: invoke G3 into GL
- LS1R: invoke G1 into GR
- LS2R: invoke G2 into GR
- LS3R: invoke G3 into GR
+ LS0 or SI (0x0F): invoke G0 into GL
+ LS1 or SO (0x0E): invoke G1 into GL
+ LS2: invoke G2 into GL
+ LS3: invoke G3 into GL
+ LS1R: invoke G1 into GR
+ LS2R: invoke G2 into GR
+ LS3R: invoke G3 into GR
Single Shift is done as follows:
- SS2 or ESC N: invoke G2 into GL
- SS3 or ESC O: invoke G3 into GL
+ SS2 or ESC N: invoke G2 into GL
+ SS3 or ESC O: invoke G3 into GL
(#### Ben says: I think the above is slightly incorrect. It appears
that SS2 invokes G2 into GR and SS3 invokes G3 into GR, whereas ESC N
Here are several examples:
junet -- Coding system used in JUNET.
- 1. G0 <- ASCII, G1..3 <- never used
- 2. Yes.
- 3. Yes.
- 4. Yes.
- 5. 7-bit environment
- 6. No.
- 7. Use ASCII
- 8. Use JISX0208-1983
+ 1. G0 <- ASCII, G1..3 <- never used
+ 2. Yes.
+ 3. Yes.
+ 4. Yes.
+ 5. 7-bit environment
+ 6. No.
+ 7. Use ASCII
+ 8. Use JISX0208-1983
ctext -- Compound Text
- 1. G0 <- ASCII, G1 <- Latin-1, G2,3 <- never used
- 2. No.
- 3. No.
- 4. Yes.
- 5. 8-bit environment
- 6. No.
- 7. Use ASCII
- 8. Use JISX0208-1983
+ 1. G0 <- ASCII, G1 <- Latin-1, G2,3 <- never used
+ 2. No.
+ 3. No.
+ 4. Yes.
+ 5. 8-bit environment
+ 6. No.
+ 7. Use ASCII
+ 8. Use JISX0208-1983
euc-china -- Chinese EUC. Although many people call this
as "GB encoding", the name may cause misunderstanding.
- 1. G0 <- ASCII, G1 <- GB2312, G2,3 <- never used
- 2. No.
- 3. Yes.
- 4. Yes.
- 5. 8-bit environment
- 6. No.
- 7. Use ASCII
- 8. Use JISX0208-1983
+ 1. G0 <- ASCII, G1 <- GB2312, G2,3 <- never used
+ 2. No.
+ 3. Yes.
+ 4. Yes.
+ 5. 8-bit environment
+ 6. No.
+ 7. Use ASCII
+ 8. Use JISX0208-1983
korean-mail -- Coding system used in Korean network.
- 1. G0 <- ASCII, G1 <- KSC5601, G2,3 <- never used
- 2. No.
- 3. Yes.
- 4. Yes.
- 5. 7-bit environment
- 6. Yes.
- 7. No.
- 8. No.
+ 1. G0 <- ASCII, G1 <- KSC5601, G2,3 <- never used
+ 2. No.
+ 3. Yes.
+ 4. Yes.
+ 5. 7-bit environment
+ 6. Yes.
+ 7. No.
+ 8. No.
Mule creates all these coding systems by default.
For example, many ISO-2022-compliant coding systems (such as Compound
Text, which is used for inter-client data under the X Window System) use
-escape sequences to switch between different charsets - Japanese Kanji,
+escape sequences to switch between different charsets--Japanese Kanji,
for example, is invoked with `ESC $ ( B'; ASCII is invoked with `ESC (
B'; and Cyrillic is invoked with `ESC - L'. See `make-coding-system'
for more information.
encoding. The length of the encoded text is returned. BUFFER
defaults to the current buffer if unspecified.
-\1f
-File: lispref.info, Node: Detection of Textual Encoding, Next: Big5 and Shift-JIS Functions, Prev: Encoding and Decoding Text, Up: Coding Systems
-
-Detection of Textual Encoding
------------------------------
-
- - Function: coding-category-list
- This function returns a list of all recognized coding categories.
-
- - Function: set-coding-priority-list list
- This function changes the priority order of the coding categories.
- LIST should be a list of coding categories, in descending order of
- priority. Unspecified coding categories will be lower in priority
- than all specified ones, in the same relative order they were in
- previously.
-
- - Function: coding-priority-list
- This function returns a list of coding categories in descending
- order of priority.
-
- - Function: set-coding-category-system coding-category coding-system
- This function changes the coding system associated with a coding
- category.
-
- - Function: coding-category-system coding-category
- This function returns the coding system associated with a coding
- category.
-
- - Function: detect-coding-region start end &optional buffer
- This function detects coding system of the text in the region
- between START and END. Returned value is a list of possible coding
- systems ordered by priority. If only ASCII characters are found,
- it returns `autodetect' or one of its subsidiary coding systems
- according to a detected end-of-line type. Optional arg BUFFER
- defaults to the current buffer.
-
Foundation instead of in the original English.
\1f
+File: lispref.info, Node: Detection of Textual Encoding, Next: Big5 and Shift-JIS Functions, Prev: Encoding and Decoding Text, Up: Coding Systems
+
+Detection of Textual Encoding
+-----------------------------
+
+ - Function: coding-category-list
+ This function returns a list of all recognized coding categories.
+
+ - Function: set-coding-priority-list list
+ This function changes the priority order of the coding categories.
+ LIST should be a list of coding categories, in descending order of
+ priority. Unspecified coding categories will be lower in priority
+ than all specified ones, in the same relative order they were in
+ previously.
+
+ - Function: coding-priority-list
+ This function returns a list of coding categories in descending
+ order of priority.
+
+ - Function: set-coding-category-system coding-category coding-system
+ This function changes the coding system associated with a coding
+ category.
+
+ - Function: coding-category-system coding-category
+ This function returns the coding system associated with a coding
+ category.
+
+ - Function: detect-coding-region start end &optional buffer
+ This function detects coding system of the text in the region
+ between START and END. Returned value is a list of possible coding
+ systems ordered by priority. If only ASCII characters are found,
+ it returns `autodetect' or one of its subsidiary coding systems
+ according to a detected end-of-line type. Optional arg BUFFER
+ defaults to the current buffer.
+
+\1f
File: lispref.info, Node: Big5 and Shift-JIS Functions, Prev: Detection of Textual Encoding, Up: Coding Systems
Big5 and Shift-JIS Functions
A category table is a type of char table used for keeping track of
categories. Categories are used for classifying characters for use in
-regexps - you can refer to a category rather than having to use a
+regexps--you can refer to a category rather than having to use a
complicated [] expression (and category lookups are significantly
faster).
* remassq: Association Lists.
* remhash: Working With Hash Tables.
* remove-database: Working With a Database.
+* remove-face-property: Face Properties.
* remove-glyph-property: Glyph Properties.
* remove-hook: Hooks.
* remove-range-table: Working With Range Tables.
- Function: remassoc key alist
This function deletes by side effect any associations with key KEY
- in ALIST - i.e. it removes any elements from ALIST whose `car' is
+ in ALIST--i.e. it removes any elements from ALIST whose `car' is
`equal' to KEY. The modified ALIST is returned.
If the first member of ALIST has a `car' that is `equal' to KEY,
- Function: remassq key alist
This function deletes by side effect any associations with key KEY
- in ALIST - i.e. it removes any elements from ALIST whose `car' is
+ in ALIST--i.e. it removes any elements from ALIST whose `car' is
`eq' to KEY. The modified ALIST is returned.
This function is exactly like `remassoc', but comparisons between
- Function: remrassoc value alist
This function deletes by side effect any associations with value
- VALUE in ALIST - i.e. it removes any elements from ALIST whose
+ VALUE in ALIST--i.e. it removes any elements from ALIST whose
`cdr' is `equal' to VALUE. The modified ALIST is returned.
If the first member of ALIST has a `car' that is `equal' to VALUE,
- Function: remrassq value alist
This function deletes by side effect any associations with value
- VALUE in ALIST - i.e. it removes any elements from ALIST whose
+ VALUE in ALIST--i.e. it removes any elements from ALIST whose
`cdr' is `eq' to VALUE. The modified ALIST is returned.
This function is exactly like `remrassoc', but comparisons between
done with the elements, they will automatically disappear from the list.
Weak lists are used internally, for example, to manage the list
-holding the children of an extent - an extent that is unused but has a
+holding the children of an extent--an extent that is unused but has a
parent will still be reclaimed, and will automatically be removed from
its parent's list of children.
Indirect:
new-users-guide.info-1: 635
new-users-guide.info-2: 50468
-new-users-guide.info-3: 99970
+new-users-guide.info-3: 100027
\1f
Tag Table:
(Indirect)
Node: Customizing Menus\7f44979
Node: Help\7f50468
Node: The Help Menu\7f51156
-Node: Modes\7f56081
-Node: Major Modes\7f56997
-Node: Minor Modes\7f60946
-Node: Files\7f65032
-Node: File Names\7f65754
-Node: Visiting\7f67557
-Node: Saving Files\7f69681
-Node: Other Customizations\7f73058
-Node: Setting Variables\7f75526
-Node: Init File\7f78735
-Node: Select and Move\7f84205
-Node: Selecting Text\7f85159
-Node: Mouse\7f86672
-Node: Region Operation\7f87997
-Node: Moving Text\7f89257
-Node: Accumulating text\7f90497
-Node: Search and Replace\7f92817
-Node: Key Index\7f96681
-Node: Command Index\7f99970
-Node: Variable Index\7f104072
-Node: Concept Index\7f104649
+Node: Modes\7f56122
+Node: Major Modes\7f57038
+Node: Minor Modes\7f60987
+Node: Files\7f65081
+Node: File Names\7f65803
+Node: Visiting\7f67606
+Node: Saving Files\7f69730
+Node: Other Customizations\7f73107
+Node: Setting Variables\7f75583
+Node: Init File\7f78792
+Node: Select and Move\7f84262
+Node: Selecting Text\7f85216
+Node: Mouse\7f86729
+Node: Region Operation\7f88054
+Node: Moving Text\7f89314
+Node: Accumulating text\7f90554
+Node: Search and Replace\7f92874
+Node: Key Index\7f96738
+Node: Command Index\7f100027
+Node: Variable Index\7f104129
+Node: Concept Index\7f104706
\1f
End Tag Table
for that particular buffer also. For example, if you are in
"Texinfo" mode, part of your list will contain:
- C-c C-c n texinfo-insert-@node
- C-c C-c o texinfo-insert-@noindent
- C-c C-c s texinfo-insert-@samp
- C-c C-c t texinfo-insert-@table
- C-c C-c v texinfo-insert-@var
- C-c C-c x texinfo-insert-@example
- C-c C-c { texinfo-insert-braces
+ C-c C-c n texinfo-insert-@node
+ C-c C-c o texinfo-insert-@noindent
+ C-c C-c s texinfo-insert-@samp
+ C-c C-c t texinfo-insert-@table
+ C-c C-c v texinfo-insert-@var
+ C-c C-c x texinfo-insert-@example
+ C-c C-c { texinfo-insert-braces
These keybindings apply only to "Texinfo" mode. *Note Modes::, for
more information on various modes.
example shows how to enable the font-lock mode when the major mode
is c-mode.
- (add-hook 'c-mode-hook 'turn-on-font-lock)
+ (add-hook 'c-mode-hook 'turn-on-font-lock)
*Note Other Customizations::.
(add-hook 'texinfo-mode-hook 'turn-on-font-lock)
;;; enables the font-lock mode in C Mode
- (add-hook 'c-mode-hook 'turn-on-font-lock)
+ (add-hook 'c-mode-hook 'turn-on-font-lock)
To turn on the font-lock mode in other Major Modes like emacs-lisp,
just put the name of the mode with "-hook" appended to it as the middle
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* Widgets: (widget). The Emacs Widget Library.
+* Widgets: (widget). The Emacs Widget Library.
END-INFO-DIR-ENTRY
\1f
(make-local-variable 'widget-example-repeat)
(widget-insert "Here is some documentation.\n\nName: ")
(widget-create 'editable-field
- :size 13
- "My Name")
+ :size 13
+ "My Name")
(widget-create 'menu-choice
- :tag "Choose"
- :value "This"
- :help-echo "Choose me, please!"
- :notify (lambda (widget &rest ignore)
- (message "%s is a good choice!"
- (widget-value widget)))
- '(item :tag "This option" :value "This")
- '(choice-item "That option")
- '(editable-field :menu-tag "No option" "Thus option"))
+ :tag "Choose"
+ :value "This"
+ :help-echo "Choose me, please!"
+ :notify (lambda (widget &rest ignore)
+ (message "%s is a good choice!"
+ (widget-value widget)))
+ '(item :tag "This option" :value "This")
+ '(choice-item "That option")
+ '(editable-field :menu-tag "No option" "Thus option"))
(widget-insert "Address: ")
(widget-create 'editable-field
- "Some Place\nIn some City\nSome country.")
+ "Some Place\nIn some City\nSome country.")
(widget-insert "\nSee also ")
(widget-create 'link
- :notify (lambda (&rest ignore)
- (widget-value-set widget-example-repeat
- '("En" "To" "Tre"))
- (widget-setup))
- "other work")
+ :notify (lambda (&rest ignore)
+ (widget-value-set widget-example-repeat
+ '("En" "To" "Tre"))
+ (widget-setup))
+ "other work")
(widget-insert " for more information.\n\nNumbers: count to three below\n")
(setq widget-example-repeat
- (widget-create 'editable-list
- :entry-format "%i %d %v"
- :notify (lambda (widget &rest ignore)
- (let ((old (widget-get widget
- ':example-length))
- (new (length (widget-value widget))))
- (unless (eq old new)
- (widget-put widget ':example-length new)
- (message "You can count to %d." new))))
- :value '("One" "Eh, two?" "Five!")
- '(editable-field :value "three")))
+ (widget-create 'editable-list
+ :entry-format "%i %d %v"
+ :notify (lambda (widget &rest ignore)
+ (let ((old (widget-get widget
+ ':example-length))
+ (new (length (widget-value widget))))
+ (unless (eq old new)
+ (widget-put widget ':example-length new)
+ (message "You can count to %d." new))))
+ :value '("One" "Eh, two?" "Five!")
+ '(editable-field :value "three")))
(widget-insert "\n\nSelect multiple:\n\n")
(widget-create 'checkbox t)
(widget-insert " This\n")
(widget-create 'checkbox nil)
(widget-insert " That\n")
(widget-create 'checkbox
- :notify (lambda (&rest ignore) (message "Tickle"))
- t)
+ :notify (lambda (&rest ignore) (message "Tickle"))
+ t)
(widget-insert " Thus\n\nSelect one:\n\n")
(widget-create 'radio-button-choice
- :value "One"
- :notify (lambda (widget &rest ignore)
- (message "You selected %s"
- (widget-value widget)))
- '(item "One") '(item "Another One.") '(item "A Final One."))
+ :value "One"
+ :notify (lambda (widget &rest ignore)
+ (message "You selected %s"
+ (widget-value widget)))
+ '(item "One") '(item "Another One.") '(item "A Final One."))
(widget-insert "\n")
(widget-create 'push-button
- :notify (lambda (&rest ignore)
- (if (= (length (widget-value widget-example-repeat))
- 3)
- (message "Congratulation!")
- (error "Three was the count!")))
- "Apply Form")
+ :notify (lambda (&rest ignore)
+ (if (= (length (widget-value widget-example-repeat))
+ 3)
+ (message "Congratulation!")
+ (error "Three was the count!")))
+ "Apply Form")
(widget-insert " ")
(widget-create 'push-button
- :notify (lambda (&rest ignore)
- (widget-example))
- "Reset Form")
+ :notify (lambda (&rest ignore)
+ (widget-example))
+ "Reset Form")
(widget-insert "\n")
(use-local-map widget-keymap)
(widget-setup))
\1f
Tag Table:
-Node: Top\7f201
-Node: Introduction\7f581
-Node: User Interface\7f4064
-Node: Programming Example\7f8959
-Node: Setting Up the Buffer\7f12276
-Node: Basic Types\7f13993
-Node: link\7f20038
-Node: url-link\7f20552
-Node: info-link\7f20864
-Node: push-button\7f21155
-Node: editable-field\7f21728
-Node: text\7f23067
-Node: menu-choice\7f23365
-Node: radio-button-choice\7f24218
-Node: item\7f25785
-Node: choice-item\7f26173
-Node: toggle\7f26671
-Node: checkbox\7f27408
-Node: checklist\7f27714
-Node: editable-list\7f29158
-Node: group\7f30340
-Node: Sexp Types\7f30627
-Node: constants\7f30940
-Node: generic\7f32019
-Node: atoms\7f32552
-Node: composite\7f34499
-Node: Widget Properties\7f36969
-Node: Defining New Widgets\7f40034
-Node: Widget Browser\7f45334
-Node: Widget Minor Mode\7f46192
-Node: Utilities\7f46749
-Node: Widget Wishlist\7f47230
+Node: Top\7f211
+Node: Introduction\7f591
+Node: User Interface\7f4074
+Node: Programming Example\7f8969
+Node: Setting Up the Buffer\7f13119
+Node: Basic Types\7f14836
+Node: link\7f20881
+Node: url-link\7f21395
+Node: info-link\7f21707
+Node: push-button\7f21998
+Node: editable-field\7f22571
+Node: text\7f23910
+Node: menu-choice\7f24208
+Node: radio-button-choice\7f25061
+Node: item\7f26628
+Node: choice-item\7f27016
+Node: toggle\7f27514
+Node: checkbox\7f28251
+Node: checklist\7f28557
+Node: editable-list\7f30001
+Node: group\7f31183
+Node: Sexp Types\7f31470
+Node: constants\7f31783
+Node: generic\7f32862
+Node: atoms\7f33395
+Node: composite\7f35342
+Node: Widget Properties\7f37812
+Node: Defining New Widgets\7f40877
+Node: Widget Browser\7f46177
+Node: Widget Minor Mode\7f47035
+Node: Utilities\7f47592
+Node: Widget Wishlist\7f48073
\1f
End Tag Table
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
END-INFO-DIR-ENTRY
\1f
Indirect:
-xemacs-faq.info-1: 195
-xemacs-faq.info-2: 49906
-xemacs-faq.info-3: 99720
-xemacs-faq.info-4: 149713
-xemacs-faq.info-5: 199295
+xemacs-faq.info-1: 205
+xemacs-faq.info-2: 50061
+xemacs-faq.info-3: 99308
+xemacs-faq.info-4: 149302
+xemacs-faq.info-5: 196381
\1f
Tag Table:
(Indirect)
-Node: Top\7f195
-Node: Introduction\7f16541
-Node: Q1.0.1\7f19944
-Node: Q1.0.2\7f20480
-Node: Q1.0.3\7f20975
-Node: Q1.0.4\7f21237
-Node: Q1.0.5\7f22687
-Node: Q1.0.6\7f23376
-Node: Q1.0.7\7f24382
-Node: Q1.0.8\7f24631
-Node: Q1.0.9\7f24846
-Node: Q1.0.10\7f25124
-Node: Q1.0.11\7f25367
-Node: Q1.0.12\7f25802
-Node: Q1.0.13\7f26170
-Node: Q1.0.14\7f26419
-Node: Q1.1.1\7f26893
-Node: Q1.1.2\7f27970
-Node: Q1.1.3\7f28363
-Node: Q1.2.1\7f29314
-Node: Q1.2.2\7f30370
-Node: Q1.2.3\7f30804
-Node: Q1.3.1\7f31888
-Node: Q1.3.2\7f35806
-Node: Q1.3.3\7f36361
-Node: Q1.3.4\7f36602
-Node: Q1.3.5\7f37366
-Node: Q1.3.6\7f39781
-Node: Q1.3.7\7f41276
-Node: Q1.4.1\7f42211
-Node: Q1.4.2\7f43073
-Node: Q1.4.3\7f43414
-Node: Q1.4.4\7f43833
-Node: Q1.4.5\7f45373
-Node: Q1.4.6\7f45677
-Node: Installation\7f46670
-Node: Q2.0.1\7f49033
-Node: Q2.0.2\7f49906
-Node: Q2.0.3\7f57109
-Node: Q2.0.4\7f58407
-Node: Q2.0.5\7f58999
-Node: Q2.0.6\7f59367
-Node: Q2.0.7\7f59748
-Node: Q2.0.8\7f60129
-Node: Q2.0.9\7f61707
-Node: Q2.0.10\7f63145
-Node: Q2.0.11\7f63989
-Node: Q2.0.12\7f64930
-Node: Q2.1.1\7f66452
-Node: Q2.1.2\7f69194
-Node: Q2.1.3\7f70371
-Node: Q2.1.4\7f71664
-Node: Q2.1.5\7f72463
-Node: Q2.1.6\7f72825
-Node: Q2.1.7\7f73302
-Node: Q2.1.8\7f73655
-Node: Q2.1.9\7f75171
-Node: Q2.1.10\7f75593
-Node: Q2.1.11\7f76350
-Node: Q2.1.12\7f77215
-Node: Q2.1.13\7f78170
-Node: Q2.1.14\7f79201
-Node: Q2.1.15\7f80312
-Node: Q2.1.16\7f87344
-Node: Q2.1.17\7f88038
-Node: Q2.1.18\7f88635
-Node: Q2.1.19\7f88762
-Node: Q2.1.20\7f89292
-Node: Q2.1.21\7f89674
-Node: Q2.1.22\7f89867
-Node: Q2.1.23\7f91164
-Node: Q2.1.24\7f91832
-Node: Customization\7f92362
-Node: Q3.0.1\7f97200
-Node: Q3.0.2\7f97906
-Node: Q3.0.3\7f98470
-Node: Q3.0.4\7f98887
-Node: Q3.0.5\7f99720
-Node: Q3.0.6\7f100501
-Node: Q3.0.7\7f101081
-Node: Q3.0.8\7f101745
-Node: Q3.0.9\7f102591
-Node: Q3.1.1\7f103152
-Node: Q3.1.2\7f103889
-Node: Q3.1.3\7f104320
-Node: Q3.1.4\7f104509
-Node: Q3.1.5\7f104698
-Node: Q3.1.6\7f105082
-Node: Q3.1.7\7f105763
-Node: Q3.1.8\7f107987
-Node: Q3.2.1\7f108529
-Node: Q3.2.2\7f109937
-Node: Q3.2.3\7f110736
-Node: Q3.2.4\7f111338
-Node: Q3.2.5\7f112372
-Node: Q3.2.6\7f112839
-Node: Q3.3.1\7f113801
-Node: Q3.3.2\7f114194
-Node: Q3.3.3\7f114825
-Node: Q3.3.4\7f115206
-Node: Q3.3.5\7f116300
-Node: Q3.4.1\7f117794
-Node: Q3.4.2\7f118437
-Node: Q3.5.1\7f118949
-Node: Q3.5.2\7f120403
-Node: Q3.5.3\7f120821
-Node: Q3.5.4\7f121661
-Node: Q3.5.5\7f122493
-Node: Q3.5.6\7f123633
-Node: Q3.5.7\7f124623
-Node: Q3.5.8\7f125975
-Node: Q3.5.9\7f126722
-Node: Q3.5.10\7f127502
-Node: Q3.5.11\7f128138
-Node: Q3.6.1\7f128691
-Node: Q3.6.2\7f129431
-Node: Q3.6.3\7f129859
-Node: Q3.7.1\7f130359
-Node: Q3.7.2\7f131247
-Node: Q3.7.3\7f131906
-Node: Q3.7.4\7f132328
-Node: Q3.7.5\7f132671
-Node: Q3.7.6\7f133139
-Node: Q3.7.7\7f133854
-Node: Q3.7.8\7f134874
-Node: Q3.8.1\7f135293
-Node: Q3.8.2\7f135753
-Node: Q3.8.3\7f136216
-Node: Q3.8.4\7f136822
-Node: Q3.8.5\7f137541
-Node: Q3.9.1\7f138326
-Node: Q3.9.2\7f139266
-Node: Q3.9.3\7f139864
-Node: Q3.9.4\7f140526
-Node: Q3.10.1\7f141405
-Node: Q3.10.2\7f142223
-Node: Q3.10.3\7f143228
-Node: Q3.10.4\7f143956
-Node: Q3.10.5\7f144339
-Node: Subsystems\7f145349
-Node: Q4.0.1\7f147836
-Node: Q4.0.2\7f148361
-Node: Q4.0.3\7f148919
-Node: Q4.0.4\7f149240
-Node: Q4.0.5\7f149482
-Node: Q4.0.6\7f149713
-Node: Q4.0.7\7f150294
-Node: Q4.0.8\7f150619
-Node: Q4.0.9\7f151846
-Node: Q4.0.10\7f153884
-Node: Q4.0.11\7f154338
-Node: Q4.0.12\7f155188
-Node: Q4.1.1\7f156161
-Node: Q4.1.2\7f156564
-Node: Q4.1.3\7f156891
-Node: Q4.2.1\7f157200
-Node: Q4.2.2\7f157830
-Node: Q4.2.3\7f158070
-Node: Q4.2.4\7f158614
-Node: Q4.3.1\7f159267
-Node: Q4.3.2\7f159851
-Node: Q4.3.3\7f161332
-Node: Q4.3.4\7f161604
-Node: Q4.3.5\7f162281
-Node: Q4.4.1\7f162909
-Node: Q4.4.2\7f164395
-Node: Q4.5.1\7f165599
-Node: Q4.6.1\7f166368
-Node: Q4.7.1\7f171628
-Node: Q4.7.2\7f172583
-Node: Q4.7.3\7f172880
-Node: Q4.7.4\7f173066
-Node: Q4.7.5\7f173950
-Node: Q4.7.6\7f175592
-Node: Miscellaneous\7f175881
-Node: Q5.0.1\7f179298
-Node: Q5.0.2\7f180032
-Node: Q5.0.3\7f180886
-Node: Q5.0.4\7f181588
-Node: Q5.0.5\7f182527
-Node: Q5.0.6\7f184507
-Node: Q5.0.7\7f185164
-Node: Q5.0.8\7f185769
-Node: Q5.0.9\7f186288
-Node: Q5.0.10\7f186802
-Node: Q5.0.11\7f187050
-Node: Q5.0.12\7f187588
-Node: Q5.0.13\7f188505
-Node: Q5.0.14\7f189189
-Node: Q5.0.15\7f189954
-Node: Q5.0.16\7f190251
-Node: Q5.0.17\7f190763
-Node: Q5.0.18\7f191028
-Node: Q5.0.19\7f191222
-Node: Q5.0.20\7f191646
-Node: Q5.1.1\7f192561
-Node: Q5.1.2\7f194630
-Node: Q5.1.3\7f195366
-Node: Q5.1.4\7f198760
-Node: Q5.1.5\7f199295
-Node: Q5.1.6\7f201389
-Node: Q5.1.7\7f202778
-Node: Q5.1.8\7f204379
-Node: Q5.1.9\7f204931
-Node: Q5.1.10\7f205816
-Node: Q5.1.11\7f206947
-Node: Q5.2.1\7f207496
-Node: Q5.2.2\7f208067
-Node: Q5.2.3\7f208484
-Node: Q5.2.4\7f208719
-Node: Q5.3.1\7f209629
-Node: Q5.3.2\7f210850
-Node: Q5.3.3\7f211626
-Node: Q5.3.4\7f212110
-Node: Q5.3.5\7f212777
-Node: Q5.3.6\7f213646
-Node: Q5.3.7\7f213891
-Node: Q5.3.8\7f216081
-Node: Q5.3.9\7f216328
-Node: Q5.3.10\7f217281
-Node: Q5.3.11\7f219365
-Node: Q5.3.12\7f220914
-Node: MS Windows\7f222188
-Node: Q6.0.1\7f223519
-Node: Q6.0.2\7f224266
-Node: Q6.0.3\7f224731
-Node: Q6.0.4\7f225011
-Node: Q6.1.1\7f227292
-Node: Q6.1.2\7f228163
-Node: Q6.1.3\7f228444
-Node: Q6.1.4\7f228726
-Node: Q6.1.5\7f229104
-Node: Q6.1.6\7f229936
-Node: Q6.2.1\7f230520
-Node: Q6.2.2\7f231421
-Node: Q6.2.3\7f231822
-Node: Q6.3.1\7f232111
-Node: Q6.3.2\7f233205
-Node: Q6.3.3\7f236386
-Node: Current Events\7f236640
-Node: Q7.0.1\7f237294
-Node: Q7.0.2\7f237933
-Node: Q7.0.3\7f239007
-Node: Q7.0.4\7f239235
+Node: Top\7f205
+Node: Introduction\7f16631
+Node: Q1.0.1\7f20034
+Node: Q1.0.2\7f20570
+Node: Q1.0.3\7f21065
+Node: Q1.0.4\7f21327
+Node: Q1.0.5\7f22777
+Node: Q1.0.6\7f23466
+Node: Q1.0.7\7f24472
+Node: Q1.0.8\7f24721
+Node: Q1.0.9\7f24936
+Node: Q1.0.10\7f25214
+Node: Q1.0.11\7f25457
+Node: Q1.0.12\7f25892
+Node: Q1.0.13\7f26260
+Node: Q1.0.14\7f26509
+Node: Q1.1.1\7f26983
+Node: Q1.1.2\7f28060
+Node: Q1.1.3\7f28453
+Node: Q1.2.1\7f29404
+Node: Q1.2.2\7f30460
+Node: Q1.2.3\7f30894
+Node: Q1.3.1\7f31978
+Node: Q1.3.2\7f35894
+Node: Q1.3.3\7f36449
+Node: Q1.3.4\7f36690
+Node: Q1.3.5\7f37479
+Node: Q1.3.6\7f39894
+Node: Q1.3.7\7f41431
+Node: Q1.4.1\7f42366
+Node: Q1.4.2\7f43228
+Node: Q1.4.3\7f43569
+Node: Q1.4.4\7f43988
+Node: Q1.4.5\7f45528
+Node: Q1.4.6\7f45832
+Node: Installation\7f46825
+Node: Q2.0.1\7f49188
+Node: Q2.0.2\7f50061
+Node: Q2.0.3\7f57513
+Node: Q2.0.4\7f58811
+Node: Q2.0.5\7f59403
+Node: Q2.0.6\7f59771
+Node: Q2.0.7\7f60152
+Node: Q2.0.8\7f60533
+Node: Q2.0.9\7f62110
+Node: Q2.0.10\7f63548
+Node: Q2.0.11\7f64392
+Node: Q2.0.12\7f65333
+Node: Q2.1.1\7f66855
+Node: Q2.1.2\7f69597
+Node: Q2.1.3\7f70774
+Node: Q2.1.4\7f72067
+Node: Q2.1.5\7f72866
+Node: Q2.1.6\7f73228
+Node: Q2.1.7\7f73705
+Node: Q2.1.8\7f74058
+Node: Q2.1.9\7f75592
+Node: Q2.1.10\7f76014
+Node: Q2.1.11\7f76771
+Node: Q2.1.12\7f77636
+Node: Q2.1.13\7f78591
+Node: Q2.1.14\7f79622
+Node: Q2.1.15\7f80733
+Node: Q2.1.16\7f87765
+Node: Q2.1.17\7f88459
+Node: Q2.1.18\7f89056
+Node: Q2.1.19\7f89183
+Node: Q2.1.20\7f89713
+Node: Q2.1.21\7f90095
+Node: Q2.1.22\7f90288
+Node: Q2.1.23\7f91585
+Node: Q2.1.24\7f92253
+Node: Customization\7f92783
+Node: Q3.0.1\7f97621
+Node: Q3.0.2\7f98327
+Node: Q3.0.3\7f98891
+Node: Q3.0.4\7f99308
+Node: Q3.0.5\7f100141
+Node: Q3.0.6\7f100922
+Node: Q3.0.7\7f101502
+Node: Q3.0.8\7f102166
+Node: Q3.0.9\7f103124
+Node: Q3.1.1\7f103685
+Node: Q3.1.2\7f104422
+Node: Q3.1.3\7f104853
+Node: Q3.1.4\7f105042
+Node: Q3.1.5\7f105231
+Node: Q3.1.6\7f105615
+Node: Q3.1.7\7f106324
+Node: Q3.1.8\7f108548
+Node: Q3.2.1\7f109090
+Node: Q3.2.2\7f110743
+Node: Q3.2.3\7f111542
+Node: Q3.2.4\7f112144
+Node: Q3.2.5\7f113178
+Node: Q3.2.6\7f113645
+Node: Q3.3.1\7f114607
+Node: Q3.3.2\7f115000
+Node: Q3.3.3\7f115631
+Node: Q3.3.4\7f116012
+Node: Q3.3.5\7f117113
+Node: Q3.4.1\7f118607
+Node: Q3.4.2\7f119250
+Node: Q3.5.1\7f119762
+Node: Q3.5.2\7f121211
+Node: Q3.5.3\7f121629
+Node: Q3.5.4\7f122467
+Node: Q3.5.5\7f123299
+Node: Q3.5.6\7f124439
+Node: Q3.5.7\7f125429
+Node: Q3.5.8\7f126869
+Node: Q3.5.9\7f127616
+Node: Q3.5.10\7f128396
+Node: Q3.5.11\7f129032
+Node: Q3.6.1\7f129585
+Node: Q3.6.2\7f130330
+Node: Q3.6.3\7f130758
+Node: Q3.7.1\7f131258
+Node: Q3.7.2\7f132146
+Node: Q3.7.3\7f132805
+Node: Q3.7.4\7f133227
+Node: Q3.7.5\7f133570
+Node: Q3.7.6\7f134038
+Node: Q3.7.7\7f134753
+Node: Q3.7.8\7f135773
+Node: Q3.8.1\7f136192
+Node: Q3.8.2\7f136652
+Node: Q3.8.3\7f137115
+Node: Q3.8.4\7f137721
+Node: Q3.8.5\7f138440
+Node: Q3.9.1\7f139225
+Node: Q3.9.2\7f140165
+Node: Q3.9.3\7f140763
+Node: Q3.9.4\7f141425
+Node: Q3.10.1\7f142304
+Node: Q3.10.2\7f143122
+Node: Q3.10.3\7f144127
+Node: Q3.10.4\7f144855
+Node: Q3.10.5\7f145238
+Node: Subsystems\7f146290
+Node: Q4.0.1\7f148777
+Node: Q4.0.2\7f149302
+Node: Q4.0.3\7f149860
+Node: Q4.0.4\7f150181
+Node: Q4.0.5\7f150423
+Node: Q4.0.6\7f150654
+Node: Q4.0.7\7f151242
+Node: Q4.0.8\7f151567
+Node: Q4.0.9\7f152794
+Node: Q4.0.10\7f154832
+Node: Q4.0.11\7f155321
+Node: Q4.0.12\7f156199
+Node: Q4.1.1\7f157172
+Node: Q4.1.2\7f157575
+Node: Q4.1.3\7f157902
+Node: Q4.2.1\7f158211
+Node: Q4.2.2\7f158841
+Node: Q4.2.3\7f159081
+Node: Q4.2.4\7f159625
+Node: Q4.3.1\7f160278
+Node: Q4.3.2\7f160862
+Node: Q4.3.3\7f162343
+Node: Q4.3.4\7f162615
+Node: Q4.3.5\7f163292
+Node: Q4.4.1\7f163920
+Node: Q4.4.2\7f165406
+Node: Q4.5.1\7f166610
+Node: Q4.6.1\7f167379
+Node: Q4.7.1\7f172639
+Node: Q4.7.2\7f173594
+Node: Q4.7.3\7f173891
+Node: Q4.7.4\7f174077
+Node: Q4.7.5\7f174961
+Node: Q4.7.6\7f176602
+Node: Miscellaneous\7f176891
+Node: Q5.0.1\7f180308
+Node: Q5.0.2\7f181047
+Node: Q5.0.3\7f181901
+Node: Q5.0.4\7f182603
+Node: Q5.0.5\7f183542
+Node: Q5.0.6\7f185522
+Node: Q5.0.7\7f186179
+Node: Q5.0.8\7f186784
+Node: Q5.0.9\7f187303
+Node: Q5.0.10\7f187817
+Node: Q5.0.11\7f188065
+Node: Q5.0.12\7f188603
+Node: Q5.0.13\7f189520
+Node: Q5.0.14\7f190204
+Node: Q5.0.15\7f190969
+Node: Q5.0.16\7f191266
+Node: Q5.0.17\7f191778
+Node: Q5.0.18\7f192043
+Node: Q5.0.19\7f192237
+Node: Q5.0.20\7f192661
+Node: Q5.1.1\7f193576
+Node: Q5.1.2\7f195645
+Node: Q5.1.3\7f196381
+Node: Q5.1.4\7f199775
+Node: Q5.1.5\7f200310
+Node: Q5.1.6\7f202434
+Node: Q5.1.7\7f203920
+Node: Q5.1.8\7f205521
+Node: Q5.1.9\7f206073
+Node: Q5.1.10\7f206958
+Node: Q5.1.11\7f208089
+Node: Q5.2.1\7f208638
+Node: Q5.2.2\7f209208
+Node: Q5.2.3\7f209625
+Node: Q5.2.4\7f209860
+Node: Q5.3.1\7f210770
+Node: Q5.3.2\7f211991
+Node: Q5.3.3\7f212767
+Node: Q5.3.4\7f213251
+Node: Q5.3.5\7f213918
+Node: Q5.3.6\7f214787
+Node: Q5.3.7\7f215032
+Node: Q5.3.8\7f217222
+Node: Q5.3.9\7f217469
+Node: Q5.3.10\7f218422
+Node: Q5.3.11\7f220506
+Node: Q5.3.12\7f222097
+Node: MS Windows\7f223371
+Node: Q6.0.1\7f224777
+Node: Q6.0.2\7f225524
+Node: Q6.0.3\7f225989
+Node: Q6.0.4\7f226269
+Node: Q6.1.1\7f228548
+Node: Q6.1.2\7f229419
+Node: Q6.1.3\7f229700
+Node: Q6.1.4\7f229982
+Node: Q6.1.5\7f230360
+Node: Q6.1.6\7f231192
+Node: Q6.2.1\7f231776
+Node: Q6.2.2\7f232677
+Node: Q6.2.3\7f233089
+Node: Q6.3.1\7f233378
+Node: Q6.3.2\7f234472
+Node: Q6.3.3\7f237653
+Node: Current Events\7f237907
+Node: Q7.0.1\7f238561
+Node: Q7.0.2\7f239200
+Node: Q7.0.3\7f240273
+Node: Q7.0.4\7f240501
\1f
End Tag Table
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
END-INFO-DIR-ENTRY
\1f
XEmacs on MS Windows
General Info:
-* Q6.0.1:: What is the status of the XEmacs port to Windows?
-* Q6.0.2:: What flavors of MS Windows are supported?
-* Q6.0.3:: Are binary kits available?
-* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
+* Q6.0.1:: What is the status of the XEmacs port to Windows?
+* Q6.0.2:: What flavors of MS Windows are supported?
+* Q6.0.3:: Are binary kits available?
+* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
Building XEmacs on MS Windows:
-* Q6.1.1:: I decided to run with X. Where do I get an X server?
-* Q6.1.2:: What compiler do I need to compile XEmacs?
-* Q6.1.3:: How do I compile for the native port?
-* Q6.1.4:: How do I compile for the X port?
-* Q6.1.5:: How do I compile for Cygnus' Cygwin?
-* Q6.1.6:: What do I need for Cygwin?
+* Q6.1.1:: I decided to run with X. Where do I get an X server?
+* Q6.1.2:: What compiler do I need to compile XEmacs?
+* Q6.1.3:: How do I compile for the native port?
+* Q6.1.4:: How do I compile for the X port?
+* Q6.1.5:: How do I compile for Cygnus' Cygwin?
+* Q6.1.6:: What do I need for Cygwin?
Customization and User Interface:
-* Q6.2.1:: How will the port cope with differences in the Windows user interface?
-* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
-* Q6.2.3:: Where do I put my `.emacs' file?
+* Q6.2.1:: How will the port cope with differences in the Windows user interface?
+* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
+* Q6.2.3:: Where do I put my `.emacs' file?
Miscellaneous:
-* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
-* Q6.3.2:: What are the differences between the various MS Windows emacsen?
-* Q6.3.3:: What is the porting team doing at the moment?
+* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
+* Q6.3.2:: What are the differences between the various MS Windows emacsen?
+* Q6.3.3:: What is the porting team doing at the moment?
Current Events:
integers are the same. Byte code compiled under any version 19
Emacs will have all such functions mapped to their `old-'
equivalents when the byte code is read into XEmacs 20. This is to
- preserve compatibility - Emacs 19 converts all constant characters
+ preserve compatibility--Emacs 19 converts all constant characters
to the equivalent integer during byte-compilation, and thus there
is no other way to preserve byte-code compatibility even if the
code has specifically been written with the distinction between
code". For example, the character `A' is represented as the
integer 65, following the standard ASCII representation of
characters. If XEmacs was not compiled with MULE support, the
- range of this integer will always be 0 to 255 - eight bits, or one
+ range of this integer will always be 0 to 255--eight bits, or one
byte. (Integers outside this range are accepted but silently
truncated; however, you should most decidedly _not_ rely on this,
because it will not work under XEmacs with MULE support.) When
However, menubar localization _does_ work, even in 19.14. To enable
it, add to your `Emacs' file entries like this:
- Emacs*XlwMenu.resourceLabels: True
- Emacs*XlwMenu.file.labelString: Fichier
- Emacs*XlwMenu.openInOtherWindow.labelString: In anderem Fenster offnen
+ Emacs*XlwMenu.resourceLabels: True
+ Emacs*XlwMenu.file.labelString: Fichier
+ Emacs*XlwMenu.openInOtherWindow.labelString: In anderem Fenster offnen
The name of the resource is derived from the non-localized entry by
removing punctuation and capitalizing as above.
(cond ((boundp 'MULE)
;; for original Mule
)
- ((string-match "XEmacs" emacs-version)
- ;; for XEmacs with Mule
- )
- (t
- ;; for next version of Emacs
- ))
+ ((string-match "XEmacs" emacs-version)
+ ;; for XEmacs with Mule
+ )
+ (t
+ ;; for next version of Emacs
+ ))
;; for old emacs variants
)
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
END-INFO-DIR-ENTRY
\1f
Now examine the space used by directory:
- 0 /usr/local/bin/xemacs
- 2048 /usr/local/bin/xemacs-19.13
+ 0 /usr/local/bin/xemacs
+ 2048 /usr/local/bin/xemacs-19.13
- 1546 /usr/local/lib/xemacs-19.13/i486-miranova-sco3.2v4.2
- 1158 /usr/local/lib/xemacs-19.13/i486-unknown-linux1.2.13
+ 1546 /usr/local/lib/xemacs-19.13/i486-miranova-sco3.2v4.2
+ 1158 /usr/local/lib/xemacs-19.13/i486-unknown-linux1.2.13
You need to keep these. XEmacs isn't stripped by default in
installation, you should consider stripping. That will save you
about 5MB right there.
- 207 /usr/local/lib/xemacs-19.13/etc/w3
- 122 /usr/local/lib/xemacs-19.13/etc/sounds
- 18 /usr/local/lib/xemacs-19.13/etc/sparcworks
- 159 /usr/local/lib/xemacs-19.13/etc/vm
- 6 /usr/local/lib/xemacs-19.13/etc/e
- 21 /usr/local/lib/xemacs-19.13/etc/eos
- 172 /usr/local/lib/xemacs-19.13/etc/toolbar
- 61 /usr/local/lib/xemacs-19.13/etc/ns
- 43 /usr/local/lib/xemacs-19.13/etc/gnus
+ 207 /usr/local/lib/xemacs-19.13/etc/w3
+ 122 /usr/local/lib/xemacs-19.13/etc/sounds
+ 18 /usr/local/lib/xemacs-19.13/etc/sparcworks
+ 159 /usr/local/lib/xemacs-19.13/etc/vm
+ 6 /usr/local/lib/xemacs-19.13/etc/e
+ 21 /usr/local/lib/xemacs-19.13/etc/eos
+ 172 /usr/local/lib/xemacs-19.13/etc/toolbar
+ 61 /usr/local/lib/xemacs-19.13/etc/ns
+ 43 /usr/local/lib/xemacs-19.13/etc/gnus
These are support directories for various packages. In general
they match a directory under
./xemacs-19.13/lib/xemacs-19.13/lisp/. If you do not require the
package, you may delete or gzip the support too.
- 1959 /usr/local/lib/xemacs-19.13/etc
- 175 /usr/local/lib/xemacs-19.13/lisp/bytecomp
- 340 /usr/local/lib/xemacs-19.13/lisp/calendar
- 342 /usr/local/lib/xemacs-19.13/lisp/comint
- 517 /usr/local/lib/xemacs-19.13/lisp/dired
- 42 /usr/local/lib/xemacs-19.13/lisp/electric
- 212 /usr/local/lib/xemacs-19.13/lisp/emulators
- 238 /usr/local/lib/xemacs-19.13/lisp/energize
- 289 /usr/local/lib/xemacs-19.13/lisp/gnus
- 457 /usr/local/lib/xemacs-19.13/lisp/ilisp
- 1439 /usr/local/lib/xemacs-19.13/lisp/modes
- 2276 /usr/local/lib/xemacs-19.13/lisp/packages
- 1040 /usr/local/lib/xemacs-19.13/lisp/prim
- 176 /usr/local/lib/xemacs-19.13/lisp/pcl-cvs
- 154 /usr/local/lib/xemacs-19.13/lisp/rmail
- 3 /usr/local/lib/xemacs-19.13/lisp/epoch
- 45 /usr/local/lib/xemacs-19.13/lisp/term
- 860 /usr/local/lib/xemacs-19.13/lisp/utils
- 851 /usr/local/lib/xemacs-19.13/lisp/vm
- 13 /usr/local/lib/xemacs-19.13/lisp/vms
- 157 /usr/local/lib/xemacs-19.13/lisp/x11
- 19 /usr/local/lib/xemacs-19.13/lisp/tooltalk
- 14 /usr/local/lib/xemacs-19.13/lisp/sunpro
- 291 /usr/local/lib/xemacs-19.13/lisp/games
- 198 /usr/local/lib/xemacs-19.13/lisp/edebug
- 619 /usr/local/lib/xemacs-19.13/lisp/w3
- 229 /usr/local/lib/xemacs-19.13/lisp/eos
- 55 /usr/local/lib/xemacs-19.13/lisp/iso
- 59 /usr/local/lib/xemacs-19.13/lisp/mailcrypt
- 187 /usr/local/lib/xemacs-19.13/lisp/eterm
- 356 /usr/local/lib/xemacs-19.13/lisp/ediff
- 408 /usr/local/lib/xemacs-19.13/lisp/hyperbole/kotl
- 1262 /usr/local/lib/xemacs-19.13/lisp/hyperbole
- 247 /usr/local/lib/xemacs-19.13/lisp/hm--html-menus
- 161 /usr/local/lib/xemacs-19.13/lisp/mh-e
- 299 /usr/local/lib/xemacs-19.13/lisp/viper
- 53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-x
- 4 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/DocWindow.nib
- 3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/InfoPanel.nib
- 3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/TreeView.nib
- 11 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj
- 53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx
- 466 /usr/local/lib/xemacs-19.13/lisp/oobr
- 14142 /usr/local/lib/xemacs-19.13/lisp
+ 1959 /usr/local/lib/xemacs-19.13/etc
+ 175 /usr/local/lib/xemacs-19.13/lisp/bytecomp
+ 340 /usr/local/lib/xemacs-19.13/lisp/calendar
+ 342 /usr/local/lib/xemacs-19.13/lisp/comint
+ 517 /usr/local/lib/xemacs-19.13/lisp/dired
+ 42 /usr/local/lib/xemacs-19.13/lisp/electric
+ 212 /usr/local/lib/xemacs-19.13/lisp/emulators
+ 238 /usr/local/lib/xemacs-19.13/lisp/energize
+ 289 /usr/local/lib/xemacs-19.13/lisp/gnus
+ 457 /usr/local/lib/xemacs-19.13/lisp/ilisp
+ 1439 /usr/local/lib/xemacs-19.13/lisp/modes
+ 2276 /usr/local/lib/xemacs-19.13/lisp/packages
+ 1040 /usr/local/lib/xemacs-19.13/lisp/prim
+ 176 /usr/local/lib/xemacs-19.13/lisp/pcl-cvs
+ 154 /usr/local/lib/xemacs-19.13/lisp/rmail
+ 3 /usr/local/lib/xemacs-19.13/lisp/epoch
+ 45 /usr/local/lib/xemacs-19.13/lisp/term
+ 860 /usr/local/lib/xemacs-19.13/lisp/utils
+ 851 /usr/local/lib/xemacs-19.13/lisp/vm
+ 13 /usr/local/lib/xemacs-19.13/lisp/vms
+ 157 /usr/local/lib/xemacs-19.13/lisp/x11
+ 19 /usr/local/lib/xemacs-19.13/lisp/tooltalk
+ 14 /usr/local/lib/xemacs-19.13/lisp/sunpro
+ 291 /usr/local/lib/xemacs-19.13/lisp/games
+ 198 /usr/local/lib/xemacs-19.13/lisp/edebug
+ 619 /usr/local/lib/xemacs-19.13/lisp/w3
+ 229 /usr/local/lib/xemacs-19.13/lisp/eos
+ 55 /usr/local/lib/xemacs-19.13/lisp/iso
+ 59 /usr/local/lib/xemacs-19.13/lisp/mailcrypt
+ 187 /usr/local/lib/xemacs-19.13/lisp/eterm
+ 356 /usr/local/lib/xemacs-19.13/lisp/ediff
+ 408 /usr/local/lib/xemacs-19.13/lisp/hyperbole/kotl
+ 1262 /usr/local/lib/xemacs-19.13/lisp/hyperbole
+ 247 /usr/local/lib/xemacs-19.13/lisp/hm--html-menus
+ 161 /usr/local/lib/xemacs-19.13/lisp/mh-e
+ 299 /usr/local/lib/xemacs-19.13/lisp/viper
+ 53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-x
+ 4 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/DocWindow.nib
+ 3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/InfoPanel.nib
+ 3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/TreeView.nib
+ 11 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj
+ 53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx
+ 466 /usr/local/lib/xemacs-19.13/lisp/oobr
+ 14142 /usr/local/lib/xemacs-19.13/lisp
These are all Emacs Lisp source code and bytecompiled object code.
You may safely gzip everything named *.el here. You may remove
definitely do *not* want to delete, although certain packages can
be removed from them if you do not use them.
- 1972 /usr/local/lib/xemacs-19.13/info
+ 1972 /usr/local/lib/xemacs-19.13/info
These are online texinfo sources. You may either gzip them or
remove them. In either case, `C-h i' (info mode) will no longer
work.
- 20778 /usr/local/lib/xemacs-19.13
+ 20778 /usr/local/lib/xemacs-19.13
The 20MB achieved is less than half of what the full distribution
takes up, *and* can be achieved without deleting a single file.
`_h_errno^@' with `h_errno^@^@'. Any version of Emacs will
suffice. If you don't understand how to do this, don't do it.
- 3. Rebuild XEmacs yourself - any working ELF version of libc should be
+ 3. Rebuild XEmacs yourself--any working ELF version of libc should be
O.K.
Hrvoje Niksic <hniksic@xemacs.org> writes:
color backgrounds and foregrounds into your
`.../app-defaults/Emacs' like:
- *Foreground: Black ;everything will be of black on grey95,
- *Background: Grey95 ;unless otherwise specified.
- *cursorColor: Red3 ;red3 cursor with grey95 border.
- *pointerColor: Red3 ;red3 pointer with grey95 border.
+ *Foreground: Black ;everything will be of black on grey95,
+ *Background: Grey95 ;unless otherwise specified.
+ *cursorColor: Red3 ;red3 cursor with grey95 border.
+ *pointerColor: Red3 ;red3 pointer with grey95 border.
Natalie Kershaw adds:
Use `setq-default' instead, since `tab-width' is all-buffer-local.
-\1f
-File: xemacs-faq.info, Node: Q3.0.4, Next: Q3.0.5, Prev: Q3.0.3, Up: Customization
-
-Q3.0.4: How can I add directories to the `load-path'?
------------------------------------------------------
-
- Here are two ways to do that, one that puts your directories at the
-front of the load-path, the other at the end:
-
- ;;; Add things at the beginning of the load-path, do not add
- ;;; duplicate directories:
- (pushnew "bar" load-path :test 'equal)
-
- (pushnew "foo" load-path :test 'equal)
-
- ;;; Add things at the end, unconditionally
- (setq load-path (nconc load-path '("foo" "bar")))
-
- keith (k.p.) hanlan <keithh@nortel.ca> writes:
-
- To add directories using Unix shell metacharacters use
- `expand-file-name' like this:
-
- (push (expand-file-name "~keithh/.emacsdir") load-path)
-
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
END-INFO-DIR-ENTRY
\1f
+File: xemacs-faq.info, Node: Q3.0.4, Next: Q3.0.5, Prev: Q3.0.3, Up: Customization
+
+Q3.0.4: How can I add directories to the `load-path'?
+-----------------------------------------------------
+
+ Here are two ways to do that, one that puts your directories at the
+front of the load-path, the other at the end:
+
+ ;;; Add things at the beginning of the load-path, do not add
+ ;;; duplicate directories:
+ (pushnew "bar" load-path :test 'equal)
+
+ (pushnew "foo" load-path :test 'equal)
+
+ ;;; Add things at the end, unconditionally
+ (setq load-path (nconc load-path '("foo" "bar")))
+
+ keith (k.p.) hanlan <keithh@nortel.ca> writes:
+
+ To add directories using Unix shell metacharacters use
+ `expand-file-name' like this:
+
+ (push (expand-file-name "~keithh/.emacsdir") load-path)
+
+\1f
File: xemacs-faq.info, Node: Q3.0.5, Next: Q3.0.6, Prev: Q3.0.4, Up: Customization
Q3.0.5: How to check if a lisp function is defined?
(setq default-minibuffer-frame
(make-frame
'(minibuffer only
- width 86
- height 1
- menubar-visible-p nil
- default-toolbar-visible-p nil
- name "minibuffer"
- top -2
- left -2
- has-modeline-p nil)))
+ width 86
+ height 1
+ menubar-visible-p nil
+ default-toolbar-visible-p nil
+ name "minibuffer"
+ top -2
+ left -2
+ has-modeline-p nil)))
(frame-notice-user-settings)
*Please note:* The single minibuffer frame may not be to everyone's
(setq frame-title-format
'("%S: " (buffer-file-name "%f"
- (dired-directory dired-directory "%b"))))
+ (dired-directory dired-directory "%b"))))
That is, use the file name, or the dired-directory, or the buffer
name.
(set-face-background 'default "bisque") ; frame background
(set-face-foreground 'default "black") ; normal text
(set-face-background 'zmacs-region "red") ; When selecting w/
- ; mouse
+ ; mouse
(set-face-foreground 'zmacs-region "yellow")
(set-face-font 'default "*courier-bold-r*120-100-100*")
(set-face-background 'highlight "blue") ; Ie when selecting
- ; buffers
+ ; buffers
(set-face-foreground 'highlight "yellow")
(set-face-background 'modeline "blue") ; Line at bottom
- ; of buffer
+ ; of buffer
(set-face-foreground 'modeline "white")
(set-face-font 'modeline "*bold-r-normal*140-100-100*")
(set-face-background 'isearch "yellow") ; When highlighting
- ; while searching
+ ; while searching
(set-face-foreground 'isearch "red")
(setq x-pointer-foreground-color "black") ; Adds to bg color,
- ; so keep black
+ ; so keep black
(setq x-pointer-background-color "blue") ; This is color
- ; you really
- ; want ptr/crsr
+ ; you really
+ ; want ptr/crsr
\1f
File: xemacs-faq.info, Node: Q3.2.2, Next: Q3.2.3, Prev: Q3.2.1, Up: Customization
mode:
(add-hook 'TeX-mode-hook
- '(lambda () (setq fume-display-in-modeline-p nil)))
+ '(lambda () (setq fume-display-in-modeline-p nil)))
David Hughes <dhughes@origin-at.co.uk> writes:
(global-set-key [(control ?.)]
(lambda () (interactive) (scroll-up 1)))
- (global-set-key [(control ? ;)]
- (lambda () (interactive) (scroll-up -1)))
+ (global-set-key [(control ?;)]
+ (lambda () (interactive) (scroll-up -1)))
This is fine if you only need a few functions within the lambda body.
If you're doing more it's cleaner to define a separate function as in
(scroll-down 1))
(global-set-key [(control ?.)] 'scroll-up-one-line) ; C-.
- (global-set-key [(control ? ;)] 'scroll-down-one-line) ; C-;
+ (global-set-key [(control ?;)] 'scroll-down-one-line) ; C-;
The key point is that you can only bind simple functions to keys; you
can not bind a key to a function that you're also passing arguments to.
Generally, the simplest way is to define a key as Multi_key with
xmodmap, e.g.
- xmodmap -e 'keycode 0xff20 = Multi_key'
+ xmodmap -e 'keycode 0xff20 = Multi_key'
You will need to pick an appropriate keycode. Use xev to find out
the keycodes for each key.
automatically define the right `Windows' key as Multi_key'.]
Once you have Multi_key defined, you can use e.g.
- Multi a ' => á
- Multi e " => ë
- Multi c , => ç
+ Multi a ' => á
+ Multi e " => ë
+ Multi c , => ç
etc.
Also, recent versions of XFree86 define various AltGr-<key>
combinations as dead keys, i.e.
- AltGr [ => dead_diaeresis
- AltGr ] => dead_tilde
- AltGr ; => dead_acute
+ AltGr [ => dead_diaeresis
+ AltGr ] => dead_tilde
+ AltGr ; => dead_acute
etc.
Running `xmodmap -pk' will list all of the defined keysyms.
You can use a color to make it stand out better:
- Emacs*cursorColor: Red
+ Emacs*cursorColor: Red
\1f
File: xemacs-faq.info, Node: Q3.6.2, Next: Q3.6.3, Prev: Q3.6.1, Up: Customization
(interactive "_P")
(let ((zmacs-region-stays t))
(if (interactive-p)
- (condition-case nil
- ad-do-it
- (end-of-buffer (goto-char (point-max))))
+ (condition-case nil
+ ad-do-it
+ (end-of-buffer (goto-char (point-max))))
ad-do-it)))
(defadvice scroll-down (around scroll-down freeze)
(interactive "_P")
(let ((zmacs-region-stays t))
(if (interactive-p)
- (condition-case nil
- ad-do-it
- (beginning-of-buffer (goto-char (point-min))))
+ (condition-case nil
+ ad-do-it
+ (beginning-of-buffer (goto-char (point-min))))
ad-do-it)))
Thanks to T. V. Raman <raman@adobe.com> for assistance in deriving
Of course substitute your actual password for MYPASS.
-\1f
-File: xemacs-faq.info, Node: Q4.0.2, Next: Q4.0.3, Prev: Q4.0.1, Up: Subsystems
-
-Q4.0.2: How do I get VM to filter mail for me?
-----------------------------------------------
-
- One possibility is to use procmail to split your mail before it gets
-to VM. I prefer this personally, since there are many strange and
-wonderful things one can do with procmail. Procmail may be found at
-`ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/'.
-
- Also see the Mail Filtering FAQ at:
-`ftp://rtfm.mit.edu/pub/usenet/news.answers/mail/filtering-faq'.
-
-\1f
-File: xemacs-faq.info, Node: Q4.0.3, Next: Q4.0.4, Prev: Q4.0.2, Up: Subsystems
-
-Q4.0.3: How can I get VM to automatically check for new mail?
--------------------------------------------------------------
-
- John Turner <turner@lanl.gov> writes:
-
- Use the following:
-
- (setq vm-auto-get-new-mail 60)
-
-\1f
-File: xemacs-faq.info, Node: Q4.0.4, Next: Q4.0.5, Prev: Q4.0.3, Up: Subsystems
-
-Q4.0.4: [This question intentionally left blank]
-------------------------------------------------
-
- Obsolete question, left blank to avoid renumbering.
-
-\1f
-File: xemacs-faq.info, Node: Q4.0.5, Next: Q4.0.6, Prev: Q4.0.4, Up: Subsystems
-
-Q4.0.5: How do I get my outgoing mail archived?
------------------------------------------------
-
- (setq mail-archive-file-name "~/outbox")
-
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
END-INFO-DIR-ENTRY
\1f
+File: xemacs-faq.info, Node: Q4.0.2, Next: Q4.0.3, Prev: Q4.0.1, Up: Subsystems
+
+Q4.0.2: How do I get VM to filter mail for me?
+----------------------------------------------
+
+ One possibility is to use procmail to split your mail before it gets
+to VM. I prefer this personally, since there are many strange and
+wonderful things one can do with procmail. Procmail may be found at
+`ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/'.
+
+ Also see the Mail Filtering FAQ at:
+`ftp://rtfm.mit.edu/pub/usenet/news.answers/mail/filtering-faq'.
+
+\1f
+File: xemacs-faq.info, Node: Q4.0.3, Next: Q4.0.4, Prev: Q4.0.2, Up: Subsystems
+
+Q4.0.3: How can I get VM to automatically check for new mail?
+-------------------------------------------------------------
+
+ John Turner <turner@lanl.gov> writes:
+
+ Use the following:
+
+ (setq vm-auto-get-new-mail 60)
+
+\1f
+File: xemacs-faq.info, Node: Q4.0.4, Next: Q4.0.5, Prev: Q4.0.3, Up: Subsystems
+
+Q4.0.4: [This question intentionally left blank]
+------------------------------------------------
+
+ Obsolete question, left blank to avoid renumbering.
+
+\1f
+File: xemacs-faq.info, Node: Q4.0.5, Next: Q4.0.6, Prev: Q4.0.4, Up: Subsystems
+
+Q4.0.5: How do I get my outgoing mail archived?
+-----------------------------------------------
+
+ (setq mail-archive-file-name "~/outbox")
+
+\1f
File: xemacs-faq.info, Node: Q4.0.6, Next: Q4.0.7, Prev: Q4.0.5, Up: Subsystems
Q4.0.6: I have various addresses at which I receive mail. How can I tell VM to ignore them when doing a "reply-all"?
(setq vm-reply-ignored-addresses
'("wing@nuspl@nvwls.cc.purdue.edu,netcom[0-9]*.netcom.com"
- "wing@netcom.com" "wing@xemacs.org"))
+ "wing@netcom.com" "wing@xemacs.org"))
Note that each string is a regular expression.
John.John S Cooper <Cooper@Eng.Sun.COM> writes:
- ; Don't use multiple frames
+ ; Don't use multiple frames
(setq vm-frame-per-composition nil)
(setq vm-frame-per-folder nil)
(setq vm-frame-per-edit nil)
For mh-e use the following:
(add-hook 'mh-show-mode-hook '(lambda ()
- (smiley-region (point-min)
+ (smiley-region (point-min)
(point-max))))
WJCarpenter <bill@carpenter.ORG> writes: For VM use the following:
Each package bundled with XEmacs means more work for the
maintainers, whether they want it or not. If you are ready to
take over the maintenance responsibilities for the package you
- port, be sure to say so - we will more likely include it.
+ port, be sure to say so--we will more likely include it.
3. The package simply hasn't been noted by the XEmacs development. If
that's the case, the messages like yours are very useful for
turned on. This can be done by `M-x font-lock-mode', or by having
XEmacs automatically start it by adding lines like:
- (add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock)
- (add-hook 'dired-mode-hook 'turn-on-font-lock)
+ (add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock)
+ (add-hook 'dired-mode-hook 'turn-on-font-lock)
to your `.emacs'. See the file `etc/sample.emacs' for more examples.
(global-set-key [unknown_keysym_0x4]
(lambda () (interactive) (cg--generate-char-event 4)))
-\1f
-File: xemacs-faq.info, Node: Q5.1.3, Next: Q5.1.4, Prev: Q5.1.2, Up: Miscellaneous
-
-Q5.1.3: Could you explain `read-kbd-macro' in more detail?
-----------------------------------------------------------
-
- The `read-kbd-macro' function returns the internal Emacs
-representation of a human-readable string (which is its argument).
-Thus:
-
- (read-kbd-macro "C-c C-a")
- => [(control ?c) (control ?a)]
-
- (read-kbd-macro "C-c C-. <up>")
- => [(control ?c) (control ?.) up]
-
- In GNU Emacs the same forms will be evaluated to what GNU Emacs
-understands internally--the sequences `"\C-x\C-c"' and `[3 67108910
-up]', respectively.
-
- The exact "human-readable" syntax is defined in the docstring of
-`edmacro-mode'. I'll repeat it here, for completeness.
-
- Format of keyboard macros during editing:
-
- Text is divided into "words" separated by whitespace. Except for
- the words described below, the characters of each word go directly
- as characters of the macro. The whitespace that separates words is
- ignored. Whitespace in the macro must be written explicitly, as in
- `foo <SPC> bar <RET>'.
-
- * The special words `RET', `SPC', `TAB', `DEL', `LFD', `ESC',
- and `NUL' represent special control characters. The words
- must be written in uppercase.
-
- * A word in angle brackets, e.g., `<return>', `<down>', or
- `<f1>', represents a function key. (Note that in the standard
- configuration, the function key `<return>' and the control key
- <RET> are synonymous.) You can use angle brackets on the
- words <RET>, <SPC>, etc., but they are not required there.
-
- * Keys can be written by their ASCII code, using a backslash
- followed by up to six octal digits. This is the only way to
- represent keys with codes above \377.
-
- * One or more prefixes `M-' (meta), `C-' (control), `S-'
- (shift), `A-' (alt), `H-' (hyper), and `s-' (super) may
- precede a character or key notation. For function keys, the
- prefixes may go inside or outside of the brackets: `C-<down>'
- == `<C-down>'. The prefixes may be written in any order:
- `M-C-x' == `C-M-x'.
-
- Prefixes are not allowed on multi-key words, e.g., `C-abc',
- except that the Meta prefix is allowed on a sequence of
- digits and optional minus sign: `M--123' == `M-- M-1 M-2 M-3'.
-
- * The `^' notation for control characters also works: `^M' ==
- `C-m'.
-
- * Double angle brackets enclose command names: `<<next-line>>'
- is shorthand for `M-x next-line <RET>'.
-
- * Finally, `REM' or `;;' causes the rest of the line to be
- ignored as a comment.
-
- Any word may be prefixed by a multiplier in the form of a decimal
- number and `*': `3*<right>' == `<right> <right> <right>', and
- `10*foo' == `foofoofoofoofoofoofoofoofoofoo'.
-
- Multiple text keys can normally be strung together to form a word,
- but you may need to add whitespace if the word would look like one
- of the above notations: `; ; ;' is a keyboard macro with three
- semicolons, but `;;;' is a comment. Likewise, `\ 1 2 3' is four
- keys but `\123' is a single key written in octal, and `< right >'
- is seven keys but `<right>' is a single function key. When in
- doubt, use whitespace.
-
-\1f
-File: xemacs-faq.info, Node: Q5.1.4, Next: Q5.1.5, Prev: Q5.1.3, Up: Miscellaneous
-
-Q5.1.4: What is the performance hit of `let'?
----------------------------------------------
-
- In most cases, not noticeable. Besides, there's no avoiding
-`let'--you have to bind your local variables, after all. Some pose a
-question whether to nest `let's, or use one `let' per function. I
-think because of clarity and maintenance (and possible future
-implementation), `let'-s should be used (nested) in a way to provide
-the clearest code.
-
INFO-DIR-SECTION XEmacs Editor
START-INFO-DIR-ENTRY
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
END-INFO-DIR-ENTRY
\1f
+File: xemacs-faq.info, Node: Q5.1.3, Next: Q5.1.4, Prev: Q5.1.2, Up: Miscellaneous
+
+Q5.1.3: Could you explain `read-kbd-macro' in more detail?
+----------------------------------------------------------
+
+ The `read-kbd-macro' function returns the internal Emacs
+representation of a human-readable string (which is its argument).
+Thus:
+
+ (read-kbd-macro "C-c C-a")
+ => [(control ?c) (control ?a)]
+
+ (read-kbd-macro "C-c C-. <up>")
+ => [(control ?c) (control ?.) up]
+
+ In GNU Emacs the same forms will be evaluated to what GNU Emacs
+understands internally--the sequences `"\C-x\C-c"' and `[3 67108910
+up]', respectively.
+
+ The exact "human-readable" syntax is defined in the docstring of
+`edmacro-mode'. I'll repeat it here, for completeness.
+
+ Format of keyboard macros during editing:
+
+ Text is divided into "words" separated by whitespace. Except for
+ the words described below, the characters of each word go directly
+ as characters of the macro. The whitespace that separates words is
+ ignored. Whitespace in the macro must be written explicitly, as in
+ `foo <SPC> bar <RET>'.
+
+ * The special words `RET', `SPC', `TAB', `DEL', `LFD', `ESC',
+ and `NUL' represent special control characters. The words
+ must be written in uppercase.
+
+ * A word in angle brackets, e.g., `<return>', `<down>', or
+ `<f1>', represents a function key. (Note that in the standard
+ configuration, the function key `<return>' and the control key
+ <RET> are synonymous.) You can use angle brackets on the
+ words <RET>, <SPC>, etc., but they are not required there.
+
+ * Keys can be written by their ASCII code, using a backslash
+ followed by up to six octal digits. This is the only way to
+ represent keys with codes above \377.
+
+ * One or more prefixes `M-' (meta), `C-' (control), `S-'
+ (shift), `A-' (alt), `H-' (hyper), and `s-' (super) may
+ precede a character or key notation. For function keys, the
+ prefixes may go inside or outside of the brackets: `C-<down>'
+ == `<C-down>'. The prefixes may be written in any order:
+ `M-C-x' == `C-M-x'.
+
+ Prefixes are not allowed on multi-key words, e.g., `C-abc',
+ except that the Meta prefix is allowed on a sequence of
+ digits and optional minus sign: `M--123' == `M-- M-1 M-2 M-3'.
+
+ * The `^' notation for control characters also works: `^M' ==
+ `C-m'.
+
+ * Double angle brackets enclose command names: `<<next-line>>'
+ is shorthand for `M-x next-line <RET>'.
+
+ * Finally, `REM' or `;;' causes the rest of the line to be
+ ignored as a comment.
+
+ Any word may be prefixed by a multiplier in the form of a decimal
+ number and `*': `3*<right>' == `<right> <right> <right>', and
+ `10*foo' == `foofoofoofoofoofoofoofoofoofoo'.
+
+ Multiple text keys can normally be strung together to form a word,
+ but you may need to add whitespace if the word would look like one
+ of the above notations: `; ; ;' is a keyboard macro with three
+ semicolons, but `;;;' is a comment. Likewise, `\ 1 2 3' is four
+ keys but `\123' is a single key written in octal, and `< right >'
+ is seven keys but `<right>' is a single function key. When in
+ doubt, use whitespace.
+
+\1f
+File: xemacs-faq.info, Node: Q5.1.4, Next: Q5.1.5, Prev: Q5.1.3, Up: Miscellaneous
+
+Q5.1.4: What is the performance hit of `let'?
+---------------------------------------------
+
+ In most cases, not noticeable. Besides, there's no avoiding
+`let'--you have to bind your local variables, after all. Some pose a
+question whether to nest `let's, or use one `let' per function. I
+think because of clarity and maintenance (and possible future
+implementation), `let'-s should be used (nested) in a way to provide
+the clearest code.
+
+\1f
File: xemacs-faq.info, Node: Q5.1.5, Next: Q5.1.6, Prev: Q5.1.4, Up: Miscellaneous
Q5.1.5: What is the recommended use of `setq'?
user-variable temporarily, use `let':
(let ((case-fold-search nil))
- ... ; code with searches that must be case-sensitive
+ ... ; code with searches that must be case-sensitive
...)
You will notice the user-variables by their docstrings beginning
unbound. The correct thing is to do it like this:
(defun my-function (whatever)
- (let (a) ; default initialization is to nil
+ (let (a) ; default initialization is to nil
... build a large list ...
... and exit, unbinding `a' in the process ...)
`defvar'ing them first, because the byte-compiler issues warnings. The
reason for the warning is the following:
- (defun flurgoze nil) ; ok, global internal variable
+ (defun flurgoze nil) ; ok, global internal variable
...
- (setq flurghoze t) ; ops! a typo, but semantically correct.
- ; however, the byte-compiler warns.
+ (setq flurghoze t) ; ops! a typo, but semantically correct.
+ ; however, the byte-compiler warns.
While compiling toplevel forms:
** assignment to free variable flurghoze
(setq bell-volume 0)
(setq sound-alist nil)
- That will make your XEmacs totally silent - even the default ding
+ That will make your XEmacs totally silent--even the default ding
sound (TTY beep on TTY-s) will be gone.
Starting with XEmacs-20.2 you can also change these with Customize.
expressions. It was fixed in 19.13. For earlier versions of XEmacs,
have a look at your `.emacs' file. You will probably have a line like:
- (add-hook 'postscript-mode-hook 'turn-on-font-lock)
+ (add-hook 'postscript-mode-hook 'turn-on-font-lock)
Take it out, restart XEmacs, and it won't try to fontify your
postscript files anymore.
You use something like:
(setq Info-directory-list (cons
- (expand-file-name "~/info")
- Info-default-directory-list))
+ (expand-file-name "~/info")
+ Info-default-directory-list))
David Masterson <davidm@prism.kla.com> writes:
General Info
-* Q6.0.1:: What is the status of the XEmacs port to Windows?
-* Q6.0.2:: What flavors of MS Windows are supported?
+* Q6.0.1:: What is the status of the XEmacs port to Windows?
+* Q6.0.2:: What flavors of MS Windows are supported?
* Q6.0.3:: Where are the XEmacs on MS Windows binaries?
-* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
+* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
Building XEmacs on MS Windows
-* Q6.1.1:: I decided to run with X. Where do I get an X server?
-* Q6.1.2:: What compiler do I need to compile XEmacs?
-* Q6.1.3:: How do I compile for the native port?
-* Q6.1.4:: How do I compile for the X port?
-* Q6.1.5:: How do I compile for Cygnus' Cygwin?
-* Q6.1.6:: What do I need for Cygwin?
+* Q6.1.1:: I decided to run with X. Where do I get an X server?
+* Q6.1.2:: What compiler do I need to compile XEmacs?
+* Q6.1.3:: How do I compile for the native port?
+* Q6.1.4:: How do I compile for the X port?
+* Q6.1.5:: How do I compile for Cygnus' Cygwin?
+* Q6.1.6:: What do I need for Cygwin?
Customization and User Interface
-* Q6.2.1:: How will the port cope with differences in the Windows user interface?
-* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
-* Q6.2.3:: Where do I put my `.emacs' file?
+* Q6.2.1:: How will the port cope with differences in the Windows user interface?
+* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
+* Q6.2.3:: Where do I put my `.emacs' file?
Miscellaneous
-* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
-* Q6.3.2:: What are the differences between the various MS Windows emacsen?
-* Q6.3.3:: What is the porting team doing at the moment?
+* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
+* Q6.3.2:: What are the differences between the various MS Windows emacsen?
+* Q6.3.3:: What is the porting team doing at the moment?
\1f
File: xemacs-faq.info, Node: Q6.0.1, Next: Q6.0.2, Prev: MS Windows, Up: MS Windows
Long answer: XEmacs can be built in several ways in the MS Windows
environment, some of them requiring an X server and some not.
- One is what we call the "X" port - it requires X libraries to build
+ One is what we call the "X" port--it requires X libraries to build
and an X server to run. Internally it uses the Xt event loop and makes
use of X toolkits. Its look is quite un-Windowsy, but it works
reliably and supports all of the graphical features of Unix XEmacs.
reuse much of the Unix XEmacs code base, such as processes and network
support, or internal select() mechanisms.
- Cygwin port supports all display types - TTY, X & MS gui, and can be
+ Cygwin port supports all display types--TTY, X & MS gui, and can be
built with support for all three. If you build with ms gui support
then the Cygwin version uses the majority of the msw code, which is
mostly related to display. If you want to build with X support you
Q6.2.2: How do I change fonts in XEmacs on MS Windows?
------------------------------------------------------
- You can change font manually, but not from the menubar, yet. For
-example:
+ In 21.2.*, use the font menu. In 21.1.*, you can change font
+manually. For example:
(set-face-font 'default "Lucida Console:Regular:10")
(set-face-font 'modeline "MS Sans Serif:Regular:10")
The XEmacs/Mule support has been only seriously tested in a Japanese
locale, and no doubt many problems still remain. The support for
ISO-Latin-1 and Japanese is fairly strong. MULE support comes at a
-price - about a 30% slowdown from 19.16. We're making progress on
+price--about a 30% slowdown from 19.16. We're making progress on
improving performance and XEmacs 20.3 compiled without Mule (which is
the default) is definitely faster than XEmacs 19.16.
Indirect:
xemacs.info-1: 1350
xemacs.info-2: 47935
-xemacs.info-3: 95892
-xemacs.info-4: 144418
-xemacs.info-5: 189682
-xemacs.info-6: 237752
-xemacs.info-7: 286779
-xemacs.info-8: 336120
-xemacs.info-9: 383861
-xemacs.info-10: 433167
-xemacs.info-11: 483000
-xemacs.info-12: 532860
-xemacs.info-13: 581970
-xemacs.info-14: 631330
-xemacs.info-15: 681149
-xemacs.info-16: 729643
-xemacs.info-17: 778293
-xemacs.info-18: 827922
-xemacs.info-19: 872280
-xemacs.info-20: 920951
-xemacs.info-21: 962858
+xemacs.info-3: 95913
+xemacs.info-4: 144439
+xemacs.info-5: 189703
+xemacs.info-6: 237773
+xemacs.info-7: 286800
+xemacs.info-8: 336141
+xemacs.info-9: 383895
+xemacs.info-10: 433201
+xemacs.info-11: 483034
+xemacs.info-12: 532929
+xemacs.info-13: 582109
+xemacs.info-14: 631472
+xemacs.info-15: 681291
+xemacs.info-16: 729785
+xemacs.info-17: 778484
+xemacs.info-18: 828140
+xemacs.info-19: 872498
+xemacs.info-20: 921169
+xemacs.info-21: 963076
\1f
Tag Table:
(Indirect)
Node: String Key Sequences\7f63187
Node: Meta Key\7f63570
Node: Super and Hyper Keys\7f65043
-Node: Character Representation\7f71267
-Node: Commands\7f72287
-Node: Pull-down Menus\7f75136
-Node: File Menu\7f78485
-Node: Edit Menu\7f82307
-Node: Apps Menu\7f84690
-Node: Options Menu\7f85180
-Node: Buffers Menu\7f89160
-Node: Tools Menu\7f89467
-Node: Help Menu\7f89958
-Node: Menu Customization\7f90359
-Node: Entering Emacs\7f94589
-Node: Exiting\7f95892
-Node: Command Switches\7f98983
-Node: Startup Paths\7f108170
-Node: Basic\7f115750
-Node: Blank Lines\7f125228
-Node: Continuation Lines\7f126654
-Node: Position Info\7f128086
-Node: Arguments\7f131219
-Node: Undo\7f134356
-Node: Minibuffer\7f137303
-Node: Minibuffer File\7f139913
-Node: Minibuffer Edit\7f141718
-Node: Completion\7f144418
-Node: Completion Example\7f146349
-Node: Completion Commands\7f147443
-Node: Strict Completion\7f150099
-Node: Completion Options\7f151880
-Node: Minibuffer History\7f153174
-Node: Repetition\7f156358
-Node: M-x\7f159191
-Node: Help\7f164285
-Node: Mark\7f174204
-Node: Setting Mark\7f176058
-Node: Using Region\7f179180
-Node: Marking Objects\7f179917
-Node: Mark Ring\7f181755
-Node: Mouse Selection\7f183471
-Node: Additional Mouse Operations\7f185478
-Node: Killing\7f189682
-Node: Yanking\7f195318
-Node: Kill Ring\7f196121
-Node: Appending Kills\7f197723
-Node: Earlier Kills\7f199760
-Node: Using X Selections\7f202373
-Node: X Clipboard Selection\7f203623
-Node: X Selection Commands\7f205800
-Node: X Cut Buffers\7f206886
-Node: Active Regions\7f208245
-Node: Accumulating Text\7f212825
-Node: Rectangles\7f215898
-Node: Registers\7f219417
-Node: RegPos\7f220871
-Node: RegText\7f222027
-Node: RegRect\7f223133
-Node: RegConfig\7f224012
-Node: RegNumbers\7f224952
-Node: RegFiles\7f225670
-Node: Bookmarks\7f226328
-Node: Display\7f229700
-Node: Scrolling\7f231195
-Node: Horizontal Scrolling\7f235338
-Node: Selective Display\7f236533
-Node: Display Vars\7f237752
-Node: Search\7f240430
-Node: Incremental Search\7f241623
-Node: Non-Incremental Search\7f250550
-Node: Word Search\7f251992
-Node: Regexp Search\7f253610
-Node: Regexps\7f255146
-Node: Search Case\7f265447
-Node: Replace\7f266228
-Node: Unconditional Replace\7f267176
-Node: Regexp Replace\7f268311
-Node: Replacement and Case\7f269246
-Node: Query Replace\7f270226
-Node: Other Repeating Search\7f273453
-Node: Fixit\7f274708
-Node: Kill Errors\7f275288
-Node: Transpose\7f276621
-Node: Fixing Case\7f279025
-Node: Spelling\7f279671
-Node: Files\7f281132
-Node: File Names\7f282442
-Node: Visiting\7f286779
-Node: Saving\7f293465
-Node: Backup\7f298388
-Node: Backup Names\7f299784
-Node: Backup Deletion\7f301267
-Node: Backup Copying\7f302426
-Node: Interlocking\7f304132
-Node: Reverting\7f308260
-Node: Auto Save\7f310172
-Node: Auto Save Files\7f311139
-Node: Auto Save Control\7f312980
-Node: Recover\7f314818
-Node: Version Control\7f315973
-Node: Concepts of VC\7f318011
-Node: Editing with VC\7f319621
-Node: Variables for Check-in/out\7f324877
-Node: Log Entries\7f326776
-Node: Change Logs and VC\7f327956
-Node: Old Versions\7f331223
-Node: VC Status\7f333226
-Node: Renaming and VC\7f334940
-Node: Snapshots\7f335619
-Node: Making Snapshots\7f336120
-Node: Snapshot Caveats\7f337413
-Node: Version Headers\7f339222
-Node: ListDir\7f341921
-Node: Comparing Files\7f343970
-Node: Dired\7f345503
-Node: Dired Enter\7f346174
-Node: Dired Edit\7f346999
-Node: Dired Deletion\7f348746
-Node: Dired Immed\7f351969
-Node: Misc File Ops\7f353245
-Node: Buffers\7f355733
-Node: Select Buffer\7f357891
-Node: List Buffers\7f359686
-Node: Misc Buffer\7f361431
-Node: Kill Buffer\7f363074
-Node: Several Buffers\7f364204
-Node: Windows\7f368070
-Node: Basic Window\7f368781
-Node: Split Window\7f370500
-Node: Other Window\7f372633
-Node: Pop Up Window\7f375062
-Node: Change Window\7f376567
-Node: Mule\7f379475
-Node: Mule Intro\7f380738
-Node: Language Environments\7f381754
-Node: Input Methods\7f383861
-Node: Select Input Method\7f387581
-Node: Coding Systems\7f389736
-Node: Recognize Coding\7f393922
-Node: Specify Coding\7f397248
-Node: Major Modes\7f402179
-Node: Choosing Modes\7f404398
-Node: Indentation\7f406788
-Node: Indentation Commands\7f408883
-Node: Tab Stops\7f411612
-Node: Just Spaces\7f413461
-Node: Text\7f414276
-Node: Text Mode\7f416259
-Node: Nroff Mode\7f418338
-Node: TeX Mode\7f419981
-Node: TeX Editing\7f422233
-Node: TeX Print\7f425667
-Node: Outline Mode\7f428886
-Node: Outline Format\7f430367
-Node: Outline Motion\7f433167
-Node: Outline Visibility\7f434720
-Node: Words\7f437641
-Node: Sentences\7f440588
-Node: Paragraphs\7f442784
-Node: Pages\7f445072
-Node: Filling\7f447672
-Node: Auto Fill\7f448243
-Node: Fill Commands\7f450390
-Node: Fill Prefix\7f452555
-Node: Case\7f454743
-Node: Programs\7f456771
-Node: Program Modes\7f459320
-Node: Lists\7f461552
-Node: Defuns\7f467392
-Node: Grinding\7f470045
-Node: Basic Indent\7f470673
-Node: Multi-line Indent\7f472694
-Node: Lisp Indent\7f474310
-Node: C Indent\7f477760
-Node: Matching\7f483000
-Node: Comments\7f484522
-Node: Balanced Editing\7f490974
-Node: Lisp Completion\7f491988
-Node: Documentation\7f493003
-Node: Change Log\7f494242
-Node: Tags\7f496820
-Node: Tag Syntax\7f498469
-Node: Create Tags Table\7f502413
-Node: Etags Regexps\7f506473
-Node: Select Tags Table\7f511131
-Node: Find Tag\7f514869
-Node: Tags Search\7f517833
-Node: List Tags\7f521289
-Node: Fortran\7f522318
-Node: Fortran Motion\7f523394
-Node: Fortran Indent\7f524214
-Node: ForIndent Commands\7f524899
-Node: ForIndent Num\7f526044
-Node: ForIndent Conv\7f527318
-Node: ForIndent Vars\7f528094
-Node: Fortran Comments\7f529262
-Node: Fortran Columns\7f532860
-Node: Fortran Abbrev\7f534283
-Node: Asm Mode\7f535192
-Node: Running\7f535744
-Node: Compilation\7f536714
-Node: Lisp Modes\7f541564
-Node: Lisp Libraries\7f542837
-Node: Loading\7f543391
-Node: Compiling Libraries\7f547851
-Node: Mocklisp\7f550742
-Node: Lisp Eval\7f551419
-Node: Lisp Debug\7f555059
-Node: Lisp Interaction\7f560484
-Node: External Lisp\7f561839
-Node: Packages\7f563913
-Node: Package Terminology\7f564654
-Node: Using Packages\7f566012
-Node: Building Packages\7f574801
-Node: Abbrevs\7f577323
-Node: Defining Abbrevs\7f579523
-Node: Expanding Abbrevs\7f581970
-Node: Editing Abbrevs\7f584672
-Node: Saving Abbrevs\7f586540
-Node: Dynamic Abbrevs\7f588480
-Node: Picture\7f589782
-Node: Basic Picture\7f592215
-Node: Insert in Picture\7f594500
-Node: Tabs in Picture\7f595922
-Node: Rectangles in Picture\7f597443
-Node: Sending Mail\7f599351
-Node: Mail Format\7f601062
-Node: Mail Headers\7f602412
-Node: Mail Mode\7f608822
-Node: Reading Mail\7f612435
-Node: Calendar/Diary\7f614010
-Node: Calendar Motion\7f615682
-Node: Calendar Unit Motion\7f616565
-Node: Move to Beginning or End\7f618888
-Node: Specified Dates\7f620021
-Node: Scroll Calendar\7f620909
-Node: Mark and Region\7f622700
-Node: General Calendar\7f624606
-Node: LaTeX Calendar\7f626214
-Node: Holidays\7f628228
-Node: Sunrise/Sunset\7f631330
-Node: Lunar Phases\7f634373
-Node: Other Calendars\7f635758
-Node: Calendar Systems\7f637245
-Node: To Other Calendar\7f640356
-Node: From Other Calendar\7f642347
-Node: Mayan Calendar\7f644652
-Node: Diary\7f647847
-Node: Diary Commands\7f649596
-Node: Format of Diary File\7f652902
-Node: Date Formats\7f655772
-Node: Adding to Diary\7f658346
-Node: Special Diary Entries\7f659977
-Node: Calendar Customization\7f665316
-Node: Calendar Customizing\7f666178
-Node: Holiday Customizing\7f669397
-Node: Date Display Format\7f675865
-Node: Time Display Format\7f676823
-Node: Daylight Savings\7f677961
-Node: Diary Customizing\7f681149
-Node: Hebrew/Islamic Entries\7f685770
-Node: Fancy Diary Display\7f689110
-Node: Included Diary Files\7f691007
-Node: Sexp Diary Entries\7f691988
-Node: Appt Customizing\7f697078
-Node: Sorting\7f698124
-Node: Shell\7f702930
-Node: Single Shell\7f704223
-Node: Interactive Shell\7f705822
-Node: Shell Mode\7f709587
-Node: Terminal emulator\7f712078
-Node: Term Mode\7f714387
-Node: Paging in Term\7f715301
-Node: Narrowing\7f716099
-Node: Hardcopy\7f718049
-Node: Recursive Edit\7f719021
-Node: Dissociated Press\7f722008
-Node: CONX\7f724571
-Node: Amusements\7f725595
-Node: Emulation\7f726075
-Node: Customization\7f727919
-Node: Minor Modes\7f729643
-Node: Variables\7f731275
-Node: Examining\7f733231
-Node: Easy Customization\7f734692
-Node: Customization Groups\7f735706
-Node: Changing an Option\7f738635
-Node: Face Customization\7f744891
-Node: Specific Customization\7f746655
-Node: Edit Options\7f749262
-Node: Locals\7f750846
-Node: File Variables\7f754025
-Node: Keyboard Macros\7f758551
-Node: Basic Kbd Macro\7f760722
-Node: Save Kbd Macro\7f762654
-Node: Kbd Macro Query\7f764323
-Node: Key Bindings\7f766265
-Node: Keymaps\7f767139
-Node: Rebinding\7f770989
-Node: Interactive Rebinding\7f771688
-Node: Programmatic Rebinding\7f773880
-Node: Key Bindings Using Strings\7f776687
-Node: Disabling\7f778293
-Node: Syntax\7f780065
-Node: Syntax Entry\7f780946
-Node: Syntax Change\7f785030
-Node: Init File\7f787199
-Node: Init Syntax\7f788704
-Node: Init Examples\7f791056
-Node: Terminal Init\7f795246
-Node: Audible Bell\7f796956
-Node: Faces\7f800387
-Node: X Resources\7f805224
-Node: Geometry Resources\7f806845
-Node: Iconic Resources\7f809293
-Node: Resource List\7f809765
-Node: Face Resources\7f816272
-Node: Widgets\7f819949
-Node: Menubar Resources\7f820888
-Node: Quitting\7f821821
-Node: Lossage\7f824799
-Node: Stuck Recursive\7f825443
-Node: Screen Garbled\7f826149
-Node: Text Garbled\7f827283
-Node: Unasked-for Search\7f827922
-Node: Emergency Escape\7f828707
-Node: Total Frustration\7f830486
-Node: Bugs\7f831117
-Node: Glossary\7f840651
-Node: Manifesto\7f872280
-Node: Key Index\7f895756
-Node: Command Index\7f920951
-Node: Variable Index\7f962858
-Node: Concept Index\7f978995
+Node: Character Representation\7f71288
+Node: Commands\7f72308
+Node: Pull-down Menus\7f75157
+Node: File Menu\7f78506
+Node: Edit Menu\7f82328
+Node: Apps Menu\7f84711
+Node: Options Menu\7f85201
+Node: Buffers Menu\7f89181
+Node: Tools Menu\7f89488
+Node: Help Menu\7f89979
+Node: Menu Customization\7f90380
+Node: Entering Emacs\7f94610
+Node: Exiting\7f95913
+Node: Command Switches\7f99004
+Node: Startup Paths\7f108191
+Node: Basic\7f115771
+Node: Blank Lines\7f125249
+Node: Continuation Lines\7f126675
+Node: Position Info\7f128107
+Node: Arguments\7f131240
+Node: Undo\7f134377
+Node: Minibuffer\7f137324
+Node: Minibuffer File\7f139934
+Node: Minibuffer Edit\7f141739
+Node: Completion\7f144439
+Node: Completion Example\7f146370
+Node: Completion Commands\7f147464
+Node: Strict Completion\7f150120
+Node: Completion Options\7f151901
+Node: Minibuffer History\7f153195
+Node: Repetition\7f156379
+Node: M-x\7f159212
+Node: Help\7f164306
+Node: Mark\7f174225
+Node: Setting Mark\7f176079
+Node: Using Region\7f179201
+Node: Marking Objects\7f179938
+Node: Mark Ring\7f181776
+Node: Mouse Selection\7f183492
+Node: Additional Mouse Operations\7f185499
+Node: Killing\7f189703
+Node: Yanking\7f195339
+Node: Kill Ring\7f196142
+Node: Appending Kills\7f197744
+Node: Earlier Kills\7f199781
+Node: Using X Selections\7f202394
+Node: X Clipboard Selection\7f203644
+Node: X Selection Commands\7f205821
+Node: X Cut Buffers\7f206907
+Node: Active Regions\7f208266
+Node: Accumulating Text\7f212846
+Node: Rectangles\7f215919
+Node: Registers\7f219438
+Node: RegPos\7f220892
+Node: RegText\7f222048
+Node: RegRect\7f223154
+Node: RegConfig\7f224033
+Node: RegNumbers\7f224973
+Node: RegFiles\7f225691
+Node: Bookmarks\7f226349
+Node: Display\7f229721
+Node: Scrolling\7f231216
+Node: Horizontal Scrolling\7f235359
+Node: Selective Display\7f236554
+Node: Display Vars\7f237773
+Node: Search\7f240451
+Node: Incremental Search\7f241644
+Node: Non-Incremental Search\7f250571
+Node: Word Search\7f252013
+Node: Regexp Search\7f253631
+Node: Regexps\7f255167
+Node: Search Case\7f265468
+Node: Replace\7f266249
+Node: Unconditional Replace\7f267197
+Node: Regexp Replace\7f268332
+Node: Replacement and Case\7f269267
+Node: Query Replace\7f270247
+Node: Other Repeating Search\7f273474
+Node: Fixit\7f274729
+Node: Kill Errors\7f275309
+Node: Transpose\7f276642
+Node: Fixing Case\7f279046
+Node: Spelling\7f279692
+Node: Files\7f281153
+Node: File Names\7f282463
+Node: Visiting\7f286800
+Node: Saving\7f293486
+Node: Backup\7f298409
+Node: Backup Names\7f299805
+Node: Backup Deletion\7f301288
+Node: Backup Copying\7f302447
+Node: Interlocking\7f304153
+Node: Reverting\7f308281
+Node: Auto Save\7f310193
+Node: Auto Save Files\7f311160
+Node: Auto Save Control\7f313001
+Node: Recover\7f314839
+Node: Version Control\7f315994
+Node: Concepts of VC\7f318032
+Node: Editing with VC\7f319642
+Node: Variables for Check-in/out\7f324898
+Node: Log Entries\7f326797
+Node: Change Logs and VC\7f327977
+Node: Old Versions\7f331244
+Node: VC Status\7f333247
+Node: Renaming and VC\7f334961
+Node: Snapshots\7f335640
+Node: Making Snapshots\7f336141
+Node: Snapshot Caveats\7f337434
+Node: Version Headers\7f339243
+Node: ListDir\7f341942
+Node: Comparing Files\7f343991
+Node: Dired\7f345524
+Node: Dired Enter\7f346195
+Node: Dired Edit\7f347020
+Node: Dired Deletion\7f348767
+Node: Dired Immed\7f351990
+Node: Misc File Ops\7f353266
+Node: Buffers\7f355754
+Node: Select Buffer\7f357912
+Node: List Buffers\7f359707
+Node: Misc Buffer\7f361465
+Node: Kill Buffer\7f363108
+Node: Several Buffers\7f364238
+Node: Windows\7f368104
+Node: Basic Window\7f368815
+Node: Split Window\7f370534
+Node: Other Window\7f372667
+Node: Pop Up Window\7f375096
+Node: Change Window\7f376601
+Node: Mule\7f379509
+Node: Mule Intro\7f380772
+Node: Language Environments\7f381788
+Node: Input Methods\7f383895
+Node: Select Input Method\7f387615
+Node: Coding Systems\7f389770
+Node: Recognize Coding\7f393956
+Node: Specify Coding\7f397282
+Node: Major Modes\7f402213
+Node: Choosing Modes\7f404432
+Node: Indentation\7f406822
+Node: Indentation Commands\7f408917
+Node: Tab Stops\7f411646
+Node: Just Spaces\7f413495
+Node: Text\7f414310
+Node: Text Mode\7f416293
+Node: Nroff Mode\7f418372
+Node: TeX Mode\7f420015
+Node: TeX Editing\7f422267
+Node: TeX Print\7f425701
+Node: Outline Mode\7f428920
+Node: Outline Format\7f430401
+Node: Outline Motion\7f433201
+Node: Outline Visibility\7f434754
+Node: Words\7f437675
+Node: Sentences\7f440622
+Node: Paragraphs\7f442818
+Node: Pages\7f445106
+Node: Filling\7f447706
+Node: Auto Fill\7f448277
+Node: Fill Commands\7f450424
+Node: Fill Prefix\7f452589
+Node: Case\7f454777
+Node: Programs\7f456805
+Node: Program Modes\7f459354
+Node: Lists\7f461586
+Node: Defuns\7f467426
+Node: Grinding\7f470079
+Node: Basic Indent\7f470707
+Node: Multi-line Indent\7f472728
+Node: Lisp Indent\7f474344
+Node: C Indent\7f477794
+Node: Matching\7f483034
+Node: Comments\7f484556
+Node: Balanced Editing\7f491008
+Node: Lisp Completion\7f492022
+Node: Documentation\7f493037
+Node: Change Log\7f494276
+Node: Tags\7f496854
+Node: Tag Syntax\7f498503
+Node: Create Tags Table\7f502447
+Node: Etags Regexps\7f506507
+Node: Select Tags Table\7f511165
+Node: Find Tag\7f514938
+Node: Tags Search\7f517902
+Node: List Tags\7f521358
+Node: Fortran\7f522387
+Node: Fortran Motion\7f523463
+Node: Fortran Indent\7f524283
+Node: ForIndent Commands\7f524968
+Node: ForIndent Num\7f526113
+Node: ForIndent Conv\7f527387
+Node: ForIndent Vars\7f528163
+Node: Fortran Comments\7f529331
+Node: Fortran Columns\7f532929
+Node: Fortran Abbrev\7f534352
+Node: Asm Mode\7f535261
+Node: Running\7f535813
+Node: Compilation\7f536783
+Node: Lisp Modes\7f541633
+Node: Lisp Libraries\7f542906
+Node: Loading\7f543460
+Node: Compiling Libraries\7f547920
+Node: Mocklisp\7f550811
+Node: Lisp Eval\7f551488
+Node: Lisp Debug\7f555128
+Node: Lisp Interaction\7f560553
+Node: External Lisp\7f561908
+Node: Packages\7f563982
+Node: Package Terminology\7f564723
+Node: Using Packages\7f566081
+Node: Building Packages\7f574940
+Node: Abbrevs\7f577462
+Node: Defining Abbrevs\7f579662
+Node: Expanding Abbrevs\7f582109
+Node: Editing Abbrevs\7f584811
+Node: Saving Abbrevs\7f586684
+Node: Dynamic Abbrevs\7f588624
+Node: Picture\7f589926
+Node: Basic Picture\7f592359
+Node: Insert in Picture\7f594644
+Node: Tabs in Picture\7f596066
+Node: Rectangles in Picture\7f597587
+Node: Sending Mail\7f599495
+Node: Mail Format\7f601206
+Node: Mail Headers\7f602556
+Node: Mail Mode\7f608964
+Node: Reading Mail\7f612577
+Node: Calendar/Diary\7f614152
+Node: Calendar Motion\7f615824
+Node: Calendar Unit Motion\7f616707
+Node: Move to Beginning or End\7f619030
+Node: Specified Dates\7f620163
+Node: Scroll Calendar\7f621051
+Node: Mark and Region\7f622842
+Node: General Calendar\7f624748
+Node: LaTeX Calendar\7f626356
+Node: Holidays\7f628370
+Node: Sunrise/Sunset\7f631472
+Node: Lunar Phases\7f634515
+Node: Other Calendars\7f635900
+Node: Calendar Systems\7f637387
+Node: To Other Calendar\7f640498
+Node: From Other Calendar\7f642489
+Node: Mayan Calendar\7f644794
+Node: Diary\7f647989
+Node: Diary Commands\7f649738
+Node: Format of Diary File\7f653044
+Node: Date Formats\7f655914
+Node: Adding to Diary\7f658488
+Node: Special Diary Entries\7f660119
+Node: Calendar Customization\7f665458
+Node: Calendar Customizing\7f666320
+Node: Holiday Customizing\7f669539
+Node: Date Display Format\7f676007
+Node: Time Display Format\7f676965
+Node: Daylight Savings\7f678103
+Node: Diary Customizing\7f681291
+Node: Hebrew/Islamic Entries\7f685912
+Node: Fancy Diary Display\7f689252
+Node: Included Diary Files\7f691149
+Node: Sexp Diary Entries\7f692130
+Node: Appt Customizing\7f697220
+Node: Sorting\7f698266
+Node: Shell\7f703072
+Node: Single Shell\7f704365
+Node: Interactive Shell\7f705964
+Node: Shell Mode\7f709729
+Node: Terminal emulator\7f712220
+Node: Term Mode\7f714529
+Node: Paging in Term\7f715443
+Node: Narrowing\7f716241
+Node: Hardcopy\7f718191
+Node: Recursive Edit\7f719163
+Node: Dissociated Press\7f722150
+Node: CONX\7f724713
+Node: Amusements\7f725737
+Node: Emulation\7f726217
+Node: Customization\7f728061
+Node: Minor Modes\7f729785
+Node: Variables\7f731417
+Node: Examining\7f733373
+Node: Easy Customization\7f734834
+Node: Customization Groups\7f735848
+Node: Changing an Option\7f738777
+Node: Face Customization\7f745033
+Node: Specific Customization\7f746797
+Node: Edit Options\7f749404
+Node: Locals\7f750988
+Node: File Variables\7f754167
+Node: Keyboard Macros\7f758721
+Node: Basic Kbd Macro\7f760892
+Node: Save Kbd Macro\7f762824
+Node: Kbd Macro Query\7f764493
+Node: Key Bindings\7f766435
+Node: Keymaps\7f767309
+Node: Rebinding\7f771159
+Node: Interactive Rebinding\7f771858
+Node: Programmatic Rebinding\7f774050
+Node: Key Bindings Using Strings\7f776857
+Node: Disabling\7f778484
+Node: Syntax\7f780256
+Node: Syntax Entry\7f781137
+Node: Syntax Change\7f785221
+Node: Init File\7f787390
+Node: Init Syntax\7f788895
+Node: Init Examples\7f791247
+Node: Terminal Init\7f795437
+Node: Audible Bell\7f797147
+Node: Faces\7f800578
+Node: X Resources\7f805415
+Node: Geometry Resources\7f807063
+Node: Iconic Resources\7f809511
+Node: Resource List\7f809983
+Node: Face Resources\7f816490
+Node: Widgets\7f820167
+Node: Menubar Resources\7f821106
+Node: Quitting\7f822039
+Node: Lossage\7f825017
+Node: Stuck Recursive\7f825661
+Node: Screen Garbled\7f826367
+Node: Text Garbled\7f827501
+Node: Unasked-for Search\7f828140
+Node: Emergency Escape\7f828925
+Node: Total Frustration\7f830704
+Node: Bugs\7f831335
+Node: Glossary\7f840869
+Node: Manifesto\7f872498
+Node: Key Index\7f895974
+Node: Command Index\7f921169
+Node: Variable Index\7f963076
+Node: Concept Index\7f979213
\1f
End Tag Table
For example:
(setq tag-table-alist
- '(("/usr/src/public/perl/" . "/usr/src/public/perl/perl-3.0/")
- ("\\.el$" . "/usr/local/emacs/src/")
- ("/jbw/gnu/" . "/usr15/degree/stud/jbw/gnu/")
- ("" . "/usr/local/emacs/src/")
- ))
+ '(("/usr/src/public/perl/" . "/usr/src/public/perl/perl-3.0/")
+ ("\\.el$" . "/usr/local/emacs/src/")
+ ("/jbw/gnu/" . "/usr15/degree/stud/jbw/gnu/")
+ ("" . "/usr/local/emacs/src/")
+ ))
The example defines the tags table alist in the following way:
the packages available at the time of the XEmacs release. Packages are
also listed on the `Options' menu under:
- Options->Customize->Emacs->Packages
+ Options->Customize->Emacs->Packages
However, don't select any of these menu picks unless you actually
want to install the given package (and have properly configured your
they are installed, using the visual package browser and installer.
You can access it via the menus:
- Options->Manage Packages->List & Install
+ Options->Manage Packages->List & Install
Or, you can get to it via the keyboard:
If you are installing from a temporary, one-time directory, you can
also add these directory names to `package-get-remote' using:
- M-x pui-add-install-directory
+ M-x pui-add-install-directory
Note, however, that any directories added using this function are not
saved; this information will be lost when you quit XEmacs.
The easiest way to install a package is to use the visual package
browser and installer, using the menu pick:
- Options->Manage Packages->List & Install
+ Options->Manage Packages->List & Install
or
- Options->Manage Packages->Using Custom->Select-> ...
+ Options->Manage Packages->Using Custom->Select-> ...
You can also access it using the keyboard:
For an alternative package interface, you can select packages from
the customize menus, under:
- Options->Customize->Emacs->Packages-> ...
+ Options->Customize->Emacs->Packages-> ...
or
- Options->Manage Packages->Using Custom->Select-> ...
+ Options->Manage Packages->Using Custom->Select-> ...
Set their state to on, and then do:
- Options->Manage Packages->Using Custom->Update Packages
+ Options->Manage Packages->Using Custom->Update Packages
This will automatically retrieve the packages you have selected from
the XEmacs ftp site or your local disk, and install them into XEmacs.
tarballs that you downloaded in step 1. Unix and Cygnus cygwin
users will typically do this using the commands:
- gunzip < package.tar.gz | tar xvf -
+ gunzip < package.tar.gz | tar xvf -
Above, replace `package.tar.gz' with the filename of the package
that you downloaded in step 1.
Of course, if you use GNU `tar', you could also use:
- tar xvzf package.tar.gz
+ tar xvzf package.tar.gz
5. That's it. Quit and restart XEmacs to get it to recognize any new
or changed packages.
The output from `M-x list-abbrevs' looks like this:
(lisp-mode-abbrev-table)
- "dk" 0 "define-key"
+ "dk" 0 "define-key"
(global-abbrev-table)
- "dfn" 0 "definition"
+ "dfn" 0 "definition"
(Some blank lines of no semantic significance, and some other abbrev
tables, have been omitted.)
In this version of Emacs, what you see is what you get: in contrast
to some other versions, no abbreviations are expanded after you have
sent the mail. This means you don't suffer the annoyance of having the
-system do things behind your back -- if the system rewrites an address
+system do things behind your back--if the system rewrites an address
you typed, you know it immediately, instead of after the mail has been
sent and it's too late to do anything about it. For example, you will
never again be in trouble because you forgot to delete an old alias
file.
* Audible Bell:: Changing how Emacs sounds the bell.
* Faces:: Changing the fonts and colors of a region of text.
-* X Resources:: X resources controlling various aspects of the
+* X Resources:: X resources controlling various aspects of the
behavior of XEmacs.
XEmacs uses the information between them to determine what the major
mode and variable settings should be. For example, these are all legal:
- ;;; -*- mode: emacs-lisp -*-
- ;;; -*- mode: postscript; version-control: never -*-
- ;;; -*- tags-file-name: "/foo/bar/TAGS" -*-
+ ;;; -*- mode: emacs-lisp -*-
+ ;;; -*- mode: postscript; version-control: never -*-
+ ;;; -*- tags-file-name: "/foo/bar/TAGS" -*-
For historical reasons, the syntax ``-*- modename -*-'' is allowed
as well; for example, you can use:
- ;;; -*- emacs-lisp -*-
+ ;;; -*- emacs-lisp -*-
The variable `enable-local-variables' controls the use of local
variables lists in files you visit. The value can be `t', `nil', or
After binding a command to two key sequences with a form like:
- (define-key global-map "\^X\^I" 'command-1)
+ (define-key global-map "\^X\^I" 'command-1)
it is possible to redefine only one of those sequences like so:
- (define-key global-map [(control x) (control i)] 'command-2)
- (define-key global-map [(control x) tab] 'command-3)
+ (define-key global-map [(control x) (control i)] 'command-2)
+ (define-key global-map [(control x) tab] 'command-3)
This applies only when running under a window system. If you are
talking to Emacs through an ASCII-only channel, you do not get any of
Starting with XEmacs 21, XEmacs uses the class `XEmacs' if it finds
any XEmacs resources in the resource database when the X connection is
initialized. Otherwise, it will use the class `Emacs' for backwards
-compatability. The variable X-EMACS-APPLICATION-CLASS may be consulted
+compatibility. The variable X-EMACS-APPLICATION-CLASS may be consulted
to determine the application class being used.
The examples in this section assume the application class is `Emacs'.
* Menu:
* Geometry Resources:: Controlling the size and position of frames.
-* Iconic Resources:: Controlling whether frames come up iconic.
-* Resource List:: List of resources settable on a frame or device.
-* Face Resources:: Controlling faces using resources.
-* Widgets:: The widget hierarchy for XEmacs.
-* Menubar Resources:: Specifying resources for the menubar.
+* Iconic Resources:: Controlling whether frames come up iconic.
+* Resource List:: List of resources settable on a frame or device.
+* Face Resources:: Controlling faces using resources.
+* Widgets:: The widget hierarchy for XEmacs.
+* Menubar Resources:: Specifying resources for the menubar.
\1f
File: xemacs.info, Node: Geometry Resources, Next: Iconic Resources, Up: X Resources
Create a file called `~/.xmodmap'. In this file, place the lines
- remove Lock = Caps_Lock
- keysym Caps_Lock = Super_L
- add Mod2 = Super_L
+ remove Lock = Caps_Lock
+ keysym Caps_Lock = Super_L
+ add Mod2 = Super_L
The first line says that the key that is currently called `Caps_Lock'
should no longer behave as a "lock" key. The second line says that
*Help* 1287 Fundamental
files.el 23076 Emacs-Lisp /u2/emacs/lisp/files.el
% RMAIL 64042 RMAIL /u/rms/RMAIL
- *% man 747 Dired /u2/emacs/man/
+ *% man 747 Dired /u2/emacs/man/
net.emacs 343885 Fundamental /u/rms/net.emacs
fileio.c 27691 C /u2/emacs/src/fileio.c
NEWS 67340 Text /u2/emacs/etc/NEWS
- *scratch* 0 Lisp Interaction
+ *scratch* 0 Lisp Interaction
Note that the buffer `*Help*' was made by a help request; it is not
visiting any file. The buffer `man' was made by Dired on the directory
* update-elc.sh (ignore_dirs): Ignore lisp/utf-2000 subdirectory.
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-02-06 Martin Buchholz <martin@xemacs.org>
+
+ * getopt.h:
+ * fakemail.c:
+ * gnuslib.c:
+ * sorted-doc.c:
+ * yow.c:
+ * cvtmail.c:
+ * movemail.c:
+ * gnuclient.c:
+ ANSIfy. Use coding standards for function definitions.
+ Make C++-compilable. Modified from patch by Zack Weinberg.
+
+2000-01-26 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * hexl.c: Removed MSDOS code; set binary I/O flags for NT.
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
#include <string.h>
#include <stdlib.h>
-static void *xmalloc (unsigned int);
-static void *xrealloc (char *ptr, unsigned int);
+static void *xmalloc (size_t);
+static void *xrealloc (void *, size_t);
static void skip_to_lf (FILE *stream);
static void fatal (CONST char *s1, CONST char *s2);
static void error (CONST char *s1, CONST char *s2);
}
static void
-skip_to_lf (stream)
- FILE *stream;
+skip_to_lf (FILE *stream)
{
register int c;
while ((c = getc(stream)) != '\n')
}
static void *
-xmalloc (size)
- unsigned size;
+xmalloc (size_t size)
{
- char *result = (char *) malloc (size);
+ void *result = malloc (size);
if (!result)
fatal ("virtual memory exhausted", 0);
return result;
}
static void *
-xrealloc (ptr, size)
- char *ptr;
- unsigned size;
+xrealloc (void *ptr, size_t size)
{
- char *result = (char *) realloc (ptr, size);
+ void *result = realloc (ptr, size);
if (!result)
fatal ("virtual memory exhausted", 0);
return result;
switch (sm)
{
case 0: /* Start of case - string leading whitespace */
- if (isspace (*str))
+ if (isspace ((unsigned char) *str))
str++;
else
{
break;
case 1: /* Non-whitespace character. Mark the start */
- if (isspace (*str))
+ if (isspace ((unsigned char) *str))
{
/* Reached the end of the argument. Add it. */
int l = str-s;
struct linebuffer
{
- long size;
+ size_t size;
char *buffer;
};
/* Like malloc but get fatal error if memory is exhausted. */
-static char *
+static void *
xmalloc (size_t size)
{
- char *result = (char *) malloc (size);
- if (result == ((char *) NULL))
+ void *result = malloc (size);
+ if (result == NULL)
fatal ("virtual memory exhausted", (char *) 0);
return result;
}
-static char *
-xrealloc (char *ptr, size_t size)
+static void *
+xrealloc (void *ptr, size_t size)
{
- char *result = realloc (ptr, ((unsigned) size));
- if (result == ((char *) NULL))
+ void *result = realloc (ptr, size);
+ if (result == NULL)
fatal ("virtual memory exhausted", (char *) 0);
return result;
}
init_linebuffer (struct linebuffer *linebuffer)
{
linebuffer->size = INITIAL_LINE_SIZE;
- linebuffer->buffer = ((char *) xmalloc (INITIAL_LINE_SIZE));
+ linebuffer->buffer = (char *) xmalloc (INITIAL_LINE_SIZE);
}
/* Read a line of text from `stream' into `linebuffer'.
if (p == end)
{
linebuffer->size *= 2;
- buffer = ((char *) xrealloc ((char *) buffer,
- (size_t) (linebuffer->size)));
+ buffer = (char *) xrealloc (buffer, linebuffer->size);
p = buffer + (p - linebuffer->buffer);
end = buffer + linebuffer->size;
linebuffer->buffer = buffer;
has_keyword (char *field)
{
char *ignored;
- return (get_keyword (field, &ignored) != ((char *) NULL));
+ return (get_keyword (field, &ignored) != (char *) NULL);
}
static char *
if (the_stream != ((FILE *) NULL))
{
add_a_stream (the_stream, my_fclose);
- if (the_user == ((char *) NULL))
+ if (the_user == (char *) NULL)
file_preface = make_file_preface ();
write_line_list (file_preface, the_stream);
return true;
my_name = MY_NAME;
the_streams = ((stream_list) NULL);
- the_date = ((char *) NULL);
- the_user = ((char *) NULL);
+ the_date = (char *) NULL;
+ the_user = (char *) NULL;
the_header = read_header ();
command_line = alloc_string ((size_t) (name_length +
the_pipe = popen (command_line, "w");
if (the_pipe == ((FILE *) NULL))
- fatal ("cannot open pipe to real mailer", (char *) 0);
+ fatal ("cannot open pipe to real mailer", (char *) NULL);
add_a_stream (the_pipe, pclose);
#define required_argument 1
#define optional_argument 2
-#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
+#if defined (__GNU_LIBRARY__) || defined (__cplusplus)
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
+#else /* not __GNU_LIBRARY__ || C++ */
extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
+#endif /* __GNU_LIBRARY__ || C++ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
extern int getopt_long_only (int argc, char *const *argv,
const char *shortopts,
const struct option *longopts, int *longind,
int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* __STDC__ */
#ifdef __cplusplus
}
over = 1; \
} while (0)
-/* A strdup immitation. */
+/* A strdup imitation. */
static char *
my_strdup (CONST char *s)
{
- char *new = malloc (strlen (s) + 1);
- if (new)
- strcpy (new, s);
- return new;
+ char *new_s = (char *) malloc (strlen (s) + 1);
+ if (new_s)
+ strcpy (new_s, s);
+ return new_s;
}
int
}
filename_expand (fullpath, argv[i]);
#ifdef INTERNET_DOMAIN_SOCKETS
- path = malloc (strlen (remotepath) + strlen (fullpath) + 1);
+ path = (char *) malloc (strlen (remotepath) + strlen (fullpath) + 1);
sprintf (path, "%s%s", remotepath, fullpath);
#else
path = my_strdup (fullpath);
memset((char *)&peer,0,sizeof(struct sockaddr_in));
- if ((s = accept(ls,(struct sockaddr *)&peer, (void *) &addrlen)) == -1)
+ if ((s = accept(ls,(struct sockaddr *)&peer, &addrlen)) == -1)
{
perror(progname);
fprintf(stderr,"%s: unable to accept\n",progname);
server.sun_family = AF_UNIX;
- if ((s = accept(ls,(struct sockaddr *)&server, (void *)&len)) < 0)
+ if ((s = accept(ls,(struct sockaddr *)&server, &len)) < 0)
{
perror(progname);
fprintf(stderr,"%s: unable to accept\n",progname);
char *progname = NULL;
-int make_connection(hostarg, portarg, s)
- char *hostarg;
- int portarg;
- int *s;
+int
+make_connection (char *hostarg, int portarg, int *s)
{
#ifdef INTERNET_DOMAIN_SOCKETS
char *ptr;
connect_to_ipc_server -- establish connection with server process via SYSV IPC
Returns msqid for server if successful.
*/
-static int connect_to_ipc_server (void)
+static int
+connect_to_ipc_server (void)
{
int s; /* connected msqid */
key_t key; /* message key */
disconnect_from_ipc_server -- inform the server that sending has finished,
and wait for its reply.
*/
-void disconnect_from_ipc_server(s,msgp,echo)
- int s;
- struct msgbuf *msgp;
- int echo;
+void
+disconnect_from_ipc_server (int s, struct msgbuf *msgp, int echo)
{
int len; /* length of received message */
/*
send_string -- send string to socket.
*/
-void send_string(s,msg)
- int s;
- CONST char *msg;
+void
+send_string (int s, CONST char *msg)
{
#if 0
if (send(s,msg,strlen(msg),0) < 0) {
/*
read_line -- read a \n terminated line from a socket
*/
-int read_line(int s, char *dest)
+int
+read_line (int s, char *dest)
{
int length;
int offset=0;
domain socket. Returns socket descriptor for server
if successful.
*/
-static int connect_to_unix_server (void)
+static int
+connect_to_unix_server (void)
{
int s; /* connected socket descriptor */
struct sockaddr_un server; /* for unix connections */
internet_addr -- return the internet addr of the hostname or
internet address passed. Return -1 on error.
*/
-int internet_addr(host)
- char *host;
+int
+internet_addr (char *host)
{
struct hostent *hp; /* pointer to host info for remote host */
IN_ADDR numeric_addr; /* host address */
an internet domain socket. Returns socket
descriptor for server if successful.
*/
-static int connect_to_internet_server (char *serverhost, u_short port)
+static int
+connect_to_internet_server (char *serverhost, u_short port)
{
int s; /* connected socket descriptor */
struct servent *sp; /* pointer to service information */
disconnect_from_server -- inform the server that sending has finished, and wait for
its reply.
*/
-void disconnect_from_server(s,echo)
- int s;
- int echo;
+void
+disconnect_from_server (int s, int echo)
{
#if 0
char buffer[REPLYSIZ+1];
#include <stdio.h>
#include <ctype.h>
-#ifdef MSDOS
+#ifdef WINDOWSNT
+#include <io.h>
#include <fcntl.h>
#endif
{
char buf[18];
-#ifdef MSDOS
- (stdout)->_flag &= ~_IOTEXT; /* print binary */
- _setmode (fileno (stdout), O_BINARY);
+#ifdef WINDOWSNT
+ _setmode (_fileno (stdout), O_BINARY);
#endif
for (;;)
{
}
else
{
-#ifdef MSDOS
- (fp)->_flag &= ~_IOTEXT; /* read binary */
- _setmode (fileno (fp), O_BINARY);
+#ifdef WINDOWSNT
+ _setmode (_fileno (fp), O_BINARY);
#endif
address = 0;
string[0] = ' ';
/* Skip until the first newline; remember the two previous chars. */
while (c != '\n' && c >= 0)
{
- /* ### Kludge -- Ignore any ESC x x ISO2022 sequences */
+ /* #### Kludge -- Ignore any ESC x x ISO2022 sequences */
if (c == 27)
{
getc (infile);
"string" ... ;###translate
where the magic token ";###translate" on a line means that the string
- constant on this line should go into the message catalog. This is analagous
+ constant on this line should go into the message catalog. This is analogous
to the magic ";###autoload" comments, and to the magic comments used in the
EPSF structuring conventions.
#ifdef MAIL_USE_POP
static int popmail (char *, char *, char *);
static int pop_retr (popserver server, int msgno,
- int (*action)(char *, FILE *), void *arg);
+ int (*action)(char *, FILE *), FILE *arg);
static int mbx_write (char *, FILE *);
static int mbx_delimit_begin (FILE *);
static int mbx_delimit_end (FILE *);
return (1);
}
#if !defined(__CYGWIN32__) && !defined(WINDOWSNT)
- fchown (mbfi, getuid (), -1);
+ fchown (mbfi, getuid (), (gid_t) -1);
#endif
if ((mbf = fdopen (mbfi, "wb")) == NULL)
}
static int
-pop_retr (popserver server, int msgno, int (*action)(char *, FILE *), void *arg)
+pop_retr (popserver server, int msgno, int (*action)(char *, FILE *), FILE *arg)
{
char *line;
int ret;
#include <stdio.h>
#include <ctype.h>
-#if __STDC__ || defined(STDC_HEADERS)
-# include <stdlib.h> /* for qsort() and malloc() */
-# include <string.h>
-static void *xmalloc (int);
-# ifndef CONST
-# define CONST const
-# endif
-#else
-extern char *malloc ();
-static void *xmalloc ();
-# ifndef CONST
-# define CONST
-# endif
+#include <stdlib.h> /* for qsort() and malloc() */
+#include <string.h>
+static void *xmalloc (size_t);
+#ifndef CONST
+# define CONST const
#endif
#define NUL '\0'
#define DEBUG 0
-typedef struct line LINE;
+typedef struct LINE LINE;
-struct line
+struct LINE
{
LINE *next; /* ptr to next or NULL */
char *line; /* text of the line */
/* Like malloc but get fatal error if memory is exhausted. */
static void *
-xmalloc (int size)
+xmalloc (size_t size)
{
- char *result = malloc ((unsigned)size);
+ void *result = malloc (size);
if (result == NULL)
fatal ("%s", "virtual memory exhausted");
return result;
static char *
strsav (char *str)
{
- char *buf = xmalloc (strlen (str) + 1);
- (void) strcpy (buf, str);
- return (buf);
+ char *buf = (char *) xmalloc (strlen (str) + 1);
+ strcpy (buf, str);
+ return buf;
}
/* Comparison function for qsort to call. */
/* Sets len and header_len */
void
-setup_yow(fp)
- FILE *fp;
+setup_yow (FILE *fp)
{
int c;
/* go to a random place in the file and print the quotation there */
void
-yow (fp)
- FILE *fp;
+yow (FILE *fp)
{
long offset;
int c, i = 0;
* files.el (insert-file-contents-literally): Treat file as binary;
call file-name-handlers. [sync with Emacs 20.3.10]
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * cl-extra.el (getf): Just call `get', never `get*'.
+ Make arglist match docstring.
+ Fix bug: (getf nil t t) ==> Lisp nesting exceeds `max-lisp-eval-depth'
+ * cl-macs.el (get* compiler macro): Simply replace `get*' by `get'.
+ * byte-optimize.el: remove references to `get*'.
+
+2000-02-06 Martin Buchholz <martin@xemacs.org>
+
+ * mule/european.el: Add syntax information for Latin3 and Latin4.
+
+2000-02-02 Martin Buchholz <martin@xemacs.org>
+
+ * byte-optimize.el: Byte-optimize (length "foo")
+
+2000-02-03 Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+
+ * window.el (shrink-window-if-larger-than-buffer): Rewrite full
+ width check using `window-leftmost-p' and `window-rightmost-p'.
+
+2000-02-02 Per Abrahamsen <abraham@dina.kvl.dk>
+
+ * wid-edit.el (widget-match-inline): An atom never matches a
+ list.
+
+2000-01-29 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * modeline.el: Consolidated 'x and 'mswindows specification under
+ 'win tag.
+
+2000-01-29 Andy Piper <andy@xemacs.org>
+
+ * gutter-items.el: (format-buffers-tab-line): Try and be
+ intelligent about buffer naming when we have duplicates.
+
+2000-01-29 Andy Piper <andy@xemacs.org>
+
+ * gutter-items.el (gutter-visible-p): Make sure the gutter gets
+ updated when it becomes visible.
+
+2000-01-26 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * bytecomp.el (byte-compile-insert-header): Properly set coding
+ system under MULE and file-coding.
+
+2000-01-28 Martin Buchholz <martin@xemacs.org>
+
+ * coding.el (dontusethis-set-value-file-name-coding-system-handler):
+ (dontusethis-set-value-terminal-coding-system-handler):
+ (dontusethis-set-value-keyboard-coding-system-handler):
+ Never undefine coding system aliases. Emergency fix for gnus.
+
+2000-01-26 Hrvoje Niksic <hniksic@iskon.hr>
+
+ * files.el (abbreviate-file-name): Use directory-sep-char instead
+ of hard-coded "/".
+
+2000-01-27 Hrvoje Niksic <hniksic@iskon.hr>
+
+ * startup.el (user-init-file-base-list): New variable, replacing
+ user-init-file-base.
+ (find-user-init-file): New function.
+ (command-line-early): Use it.
+ (load-user-init-file): Ditto.
+
+2000-01-26 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * gutter-items.el (update-tab-in-gutter): Use proper locale when
+ calling valid-image-instantiator-format-p
+
+2000-01-26 Hrvoje Niksic <hniksic@iskon.hr>
+
+ * isearch-mode.el (isearch-mode): The variable is
+ isearch-unhidden-extents, not isearch-opened-extents.
+
+2000-01-26 Hrvoje Niksic <hniksic@iskon.hr>
+
+ * minibuf.el (next-history-element): Modify error message if a
+ default value is available.
+
+2000-01-26 Martin Buchholz <martin@xemacs.org>
+
+ * bytecomp.el (byte-compile-file): Don't unconditionally write
+ .elc files in binary - might contain non-Latin1.
+
+2000-01-24 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * process.el (shell-quote-argument): Use (nt-quote-process-args)
+ for windows-nt.
+
+ * version.el:
+ * startup.el (user-init-file-base):
+ * process.el (call-process-region):
+ * files.el (make-backup-file-name):
+ (backup-file-name-p):
+ (file-relative-name):
+ (abbreviate-file-name):
+ (set-auto-mode):
+ * code-process.el (call-process-region): Removed unnecessary
+ branching on 'windows-nt and 'ms-dos system types. Phased 'ms-dos
+ support out of the universe.
+
+ * process.el:
+ * code-process.el:
+ * bytecomp.el (byte-compile-file): Removed reference to
+ buffer-file-type, and commented usage of binary-process-output
+ NTEmacs variables.
+
+2000-01-24 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * help.el (function-arglist): Add case for macro.
+
+2000-01-22 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * cus-edit.el (custom-display): Removed "MS-DOS" and added Windows
+ printers.
+ (custom-display): Added a menu for printer/display tags.
+
+ * frame.el (frame-type):
+ * device.el (device-type): Added 'msprinter to the doc string, and
+ removed 'pc -- it is not going to be implemented ever.
+ (call-device-method): Fixed docstring typo.
+ Defined specifier tags 'printer and 'display.
+
+2000-01-22 Kyle Jones <kyle_jones@wonderworks.com>
+
+ * lisp/itimer.el (itimer-run-expired-timers): (consp
+ last-command-event-time) instead of (consp
+ 'last-command-event-time).
+
+2000-01-21 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * msw-glyphs.el: Removed obsolete commentary.
+
+2000-01-21 Hrvoje Niksic <hniksic@iskon.hr>
+
+ * minibuf.el (read-file-name): Use abbreviate-file-name to produce
+ better default value.
+
+2000-01-21 Hrvoje Niksic <hniksic@iskon.hr>
+
+ * minibuf.el (read-expression): Add a DEFAULT-VALUE argument.
+ (read-string): Ditto.
+ (eval-minibuffer): Ditto.
+ (read-command): Ditto.
+ (read-function): Ditto.
+ (read-variable): Ditto.
+ (read-number): Ditto.
+ (read-shell-command): Ditto.
+ (read-number): Record history.
+
+2000-01-20 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * etags.el (find-tag-tag): Use DEFAULT of completing-read.
+
+2000-01-20 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * faces.el (startup-initialize-custom-faces): New function.
+ Reset all faces created during auto-autoloads loading time
+ by defface.
+ * startup.el (command-line): Call it.
+
+2000-01-19 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * about.el (about-hackers): Add myself to contributors list.
+
+2000-01-12 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * menubar-items.el (maybe-add-init-button): Removed an argument in
+ a call to load-user-init-file, as the function managed to lose its
+ formal parameter a few betas ago.
+
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
* frame.el (get-frame-for-buffer-default-instance-limit):
defcustom it for options menu handling.
- * font-lock.el (font-lock-mode): defcustom and autolaod the variable
+ * font-lock.el (font-lock-mode): defcustom and autoload the variable
font-lock-mode for options menu handling.
* cus-start.el: added Custom properties to overwrite-mode for
(print-short "ChangGil Han" "cghan@phys401.phys.pusan.ac.kr")
(print-short "Derek Harding" "dharding@lssec.bt.co.uk")
(print-short "Michael Harnois" "mharnois@sbt.net")
+ (print-short "Yoshiki Hayashi" "yoshiki@xemacs.org")
(print-short "John Haxby" "J.Haxby@isode.com")
(print-short "Karl M. Hegbloom" "karlheg@inetarena.com")
(print-short "Benedikt Heinen" "beh@icemark.thenet.ch")
;; save file in the same directory as FILENAME. But if this
;; directory is not writable, use auto-save-directory-fallback.
;; FILENAME is assumed to be in non-directory form (no trailing slash).
- ;; It may be a name without a directory part (pesumably it really
+ ;; It may be a name without a directory part (presumably it really
;; comes from a buffer name then), the fallback is used then.
;; Optional PREFIX is string to use instead of "#" to prefix name.
(let ((directory (file-name-directory filename)))
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
+;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;; You can, however, make a faster pig."
;;
;; Or, to put it another way, the emacs byte compiler is a VW Bug. This code
-;; makes it be a VW Bug with fuel injection and a turbocharger... You're
+;; makes it be a VW Bug with fuel injection and a turbocharger... You're
;; still not going to make it go faster than 70 mph, but it might be easier
;; to get it there.
;;
;; Simple defsubsts often produce forms like
;; (let ((v1 (f1)) (v2 (f2)) ...)
;; (FN v1 v2 ...))
-;; It would be nice if we could optimize this to
+;; It would be nice if we could optimize this to
;; (FN (f1) (f2) ...)
;; but we can't unless FN is dynamically-safe (it might be dynamically
;; referring to the bindings that the lambda arglist established.)
;; One of the uncountable lossages introduced by dynamic scope...
;;
-;; Maybe there should be a control-structure that says "turn on
+;; Maybe there should be a control-structure that says "turn on
;; fast-and-loose type-assumptive optimizations here." Then when
;; we see a form like (car foo) we can from then on assume that
;; the variable foo is of type cons, and optimize based on that.
-;; But, this won't win much because of (you guessed it) dynamic
+;; But, this won't win much because of (you guessed it) dynamic
;; scope. Anything down the stack could change the value.
;; (Another reason it doesn't work is that it is perfectly valid
;; to call car with a null argument.) A better approach might
;;
;; However, if there was even a single let-binding around the COND,
;; it could not be byte-compiled, because there would be an "unbind"
-;; byte-op between the final "call" and "return." Adding a
+;; byte-op between the final "call" and "return." Adding a
;; Bunbind_all byteop would fix this.
;;
;; (defun foo (x y z) ... (foo a b c))
;;
;; Wouldn't it be nice if Emacs Lisp had lexical scope.
;;
-;; Idea: the form (lexical-scope) in a file means that the file may be
-;; compiled lexically. This proclamation is file-local. Then, within
+;; Idea: the form (lexical-scope) in a file means that the file may be
+;; compiled lexically. This proclamation is file-local. Then, within
;; that file, "let" would establish lexical bindings, and "let-dynamic"
;; would do things the old way. (Or we could use CL "declare" forms.)
;; We'd have to notice defvars and defconsts, since those variables should
;; in the file being compiled (doing a boundp check isn't good enough.)
;; Fdefvar() would have to be modified to add something to the plist.
;;
-;; A major disadvantage of this scheme is that the interpreter and compiler
-;; would have different semantics for files compiled with (dynamic-scope).
+;; A major disadvantage of this scheme is that the interpreter and compiler
+;; would have different semantics for files compiled with (dynamic-scope).
;; Since this would be a file-local optimization, there would be no way to
-;; modify the interpreter to obey this (unless the loader was hacked
+;; modify the interpreter to obey this (unless the loader was hacked
;; in some grody way, but that's a really bad idea.)
;;
;; HA! RMS removed the following paragraph from his version of
;; byte-optimize.el.
;;
;; Really the Right Thing is to make lexical scope the default across
-;; the board, in the interpreter and compiler, and just FIX all of
+;; the board, in the interpreter and compiler, and just FIX all of
;; the code that relies on dynamic scope of non-defvarred variables.
;; Other things to consider:
;; error free also they may act as true-constants.
;;(disassemble #'(lambda (x) (and (point) (foo))))
-;; When
+;; When
;; - all but one arguments to a function are constant
;; - the non-constant argument is an if-expression (cond-expression?)
;; then the outer function can be distributed. If the guarding
(cons fn (cdr form)))))))
;;; ((lambda ...) ...)
-;;;
+;;;
(defun byte-compile-unfold-lambda (form &optional name)
(or name (setq name "anonymous lambda"))
(let ((lambda (car form))
(byte-compile-warn
"attempt to open-code %s with too many arguments" name))
form)
- (let ((newform
+ (let ((newform
(if bindings
(cons 'let (cons (nreverse bindings) body))
(cons 'progn body))))
(cons (byte-optimize-form (nth 1 form) t)
(cons (byte-optimize-form (nth 2 form) for-effect)
(byte-optimize-body (cdr (cdr (cdr form))) t)))))
-
+
((memq fn '(save-excursion save-restriction save-current-buffer))
;; those subrs which have an implicit progn; it's not quite good
;; enough to treat these like normal function calls.
;; This can turn (save-excursion ...) into (save-excursion) which
;; will be optimized away in the lap-optimize pass.
(cons fn (byte-optimize-body (cdr form) for-effect)))
-
+
((eq fn 'with-output-to-temp-buffer)
;; this is just like the above, except for the first argument.
(cons fn
(cons
(byte-optimize-form (nth 1 form) nil)
(byte-optimize-body (cdr (cdr form)) for-effect))))
-
+
((eq fn 'if)
(cons fn
(cons (byte-optimize-form (nth 1 form) nil)
(cons
(byte-optimize-form (nth 2 form) for-effect)
(byte-optimize-body (nthcdr 3 form) for-effect)))))
-
+
((memq fn '(and or)) ; remember, and/or are control structures.
;; take forms off the back until we can't any more.
;; In the future it could conceivably be a problem that the
(byte-compile-warn "misplaced interactive spec: %s"
(prin1-to-string form))
nil)
-
+
((memq fn '(defun defmacro function
condition-case save-window-excursion))
;; These forms are compiled as constants or by breaking out
(cons fn
(cons (byte-optimize-form (nth 1 form) for-effect)
(cdr (cdr form)))))
-
+
((eq fn 'catch)
;; the body of a catch is compiled (and thus optimized) as a
;; top-level form, so don't do it here. The tag is never
(setq form (macroexpand form
byte-compile-macro-environment))))
(byte-optimize-form form for-effect))
-
+
((not (symbolp fn))
(or (eq 'mocklisp (car-safe fn)) ; ha!
(byte-compile-warn "%s is a malformed function"
;; appending a nil here might not be necessary, but it can't hurt.
(byte-optimize-form
(cons 'progn (append (cdr form) '(nil))) t))
-
+
(t
;; Otherwise, no args can be considered to be for-effect,
;; even if the called function is for-effect, because we
((keywordp ,form))))
;; If the function is being called with constant numeric args,
-;; evaluate as much as possible at compile-time. This optimizer
+;; evaluate as much as possible at compile-time. This optimizer
;; assumes that the function is associative, like + or *.
(defun byte-optimize-associative-math (form)
(let ((args nil)
(cons (/ (nth 1 form) last)
(butlast (cdr (cdr form)))))
last nil))))
- (cond
+ (cond
;;; ((null (cdr (cdr form)))
;;; (nth 1 form))
((eq (nth 1 form) 0)
(put 'stringp 'byte-optimizer 'byte-optimize-predicate)
(put 'string< 'byte-optimizer 'byte-optimize-predicate)
(put 'string-lessp 'byte-optimizer 'byte-optimize-predicate)
+(put 'length 'byte-optimizer 'byte-optimize-predicate)
(put 'logand 'byte-optimizer 'byte-optimize-logmumble)
(put 'logior 'byte-optimizer 'byte-optimize-logmumble)
(put 'cdr-safe 'byte-optimizer 'byte-optimize-predicate)
-;; I'm not convinced that this is necessary. Doesn't the optimizer loop
+;; I'm not convinced that this is necessary. Doesn't the optimizer loop
;; take care of this? - Jamie
;; I think this may some times be necessary to reduce eg. (quote 5) to 5,
;; so arithmetic optimizers recognize the numeric constant. - Hallvard
;; Remove any reason for avoiding `char-before'.
(defun byte-optimize-char-before (form)
`(char-after (1- ,(or (nth 1 form) '(point))) ,@(cdr (cdr form))))
-
+
(put 'char-before 'byte-optimizer 'byte-optimize-char-before)
;; byte-compile-negation-optimizer lives in bytecomp.el
(setq form (list 'cdr form)))
form)))
\f
-;;; enumerating those functions which need not be called if the returned
+;;; enumerating those functions which need not be called if the returned
;;; value is not used. That is, something like
;;; (progn (list (something-with-side-effects) (yow))
;;; (foo))
length log log10 logand logb logior lognot logxor lsh
marker-buffer max member memq min mod
next-window nth nthcdr number-to-string
- parse-colon-path previous-window
+ parse-colon-path plist-get previous-window
radians-to-degrees rassq regexp-quote reverse round
sin sqrt string< string= string-equal string-lessp string-to-char
string-to-int string-to-number substring symbol-plist
abs expt signum last butlast ldiff
pairlis gcd lcm
isqrt floor* ceiling* truncate* round* mod* rem* subseq
- list-length get* getf
+ list-length getf
))
(side-effect-and-error-free-fns
'(arrayp atom
byte-current-buffer byte-interactive-p))
(defconst byte-compile-side-effect-free-ops
- (nconc
+ (nconc
'(byte-varref byte-nth byte-memq byte-car byte-cdr byte-length byte-aref
byte-symbol-value byte-get byte-concat2 byte-concat3 byte-sub1 byte-add1
byte-eqlsign byte-gtr byte-lss byte-leq byte-geq byte-diff byte-negate
;;; varbind pop-up-windows
;;; not
;;;
-;;; we break the program, because it will appear that pop-up-windows and
+;;; we break the program, because it will appear that pop-up-windows and
;;; old-pop-ups are not EQ when really they are. So we have to know what
;;; the BOOL variables are, and not perform this optimization on them.
;;;
;; goto-X-if-non-nil goto-Y X: --> goto-Y-if-nil X:
;;
;; it is wrong to do the same thing for the -else-pop variants.
- ;;
+ ;;
((and (or (eq 'byte-goto-if-nil (car lap0))
(eq 'byte-goto-if-not-nil (car lap0))) ; gotoX
(eq 'byte-goto (car lap1)) ; gotoY
str (concat str " %s")
i (1+ i))))
(if opt-p
- (let ((tagstr
+ (let ((tagstr
(if (eq 'TAG (car (car tmp)))
(format "%d:" (car (cdr (car tmp))))
(or (car tmp) ""))))
(byte-goto-if-not-nil-else-pop .
byte-goto-if-nil-else-pop))))
newtag)
-
+
(nth 1 newtag)
)
(setcdr tmp (cons (setcdr lap0 newtag) (cdr tmp)))
(unless byte-compile-overwrite-file
(ignore-file-errors (delete-file target-file)))
(if (file-writable-p target-file)
- (progn
- (when (memq system-type '(ms-dos windows-nt))
- (defvar buffer-file-type)
- (setq buffer-file-type t))
- (write-region 1 (point-max) target-file))
+ (write-region 1 (point-max) target-file)
;; This is just to give a better error message than write-region
(signal 'file-error
(list "Opening output file"
;; extended characters are output properly and distinguished properly.
;; Otherwise, use `binary' for maximum portability with non-Mule
;; Emacsen.
- (when (featurep 'mule)
+ (when (featurep '(or mule file-coding))
(defvar buffer-file-coding-system)
(let (ces)
- (save-excursion
- (set-buffer byte-compile-inbuffer)
- (goto-char (point-min))
- ;; mrb- There must be a better way than skip-chars-forward
- (skip-chars-forward (concat (char-to-string 0) "-"
- (char-to-string 255)))
- (if (eq (point) (point-max))
- (setq ces 'binary)
- (goto-char (point-min))
- (while (< (point)(point-max))
- (cond ((eq (char-after) ?\;)
- (delete-region (point)(point-at-eol))
- (if (eq (char-after) ?\n)
- (delete-char 1)
- (forward-char))
- )
- ((eq (char-after) ?\?)
- (forward-char 2)
- )
- ((eq (char-after) ?\n)
- (forward-char)
- )
- ((eq (char-after) ?\")
- (forward-char)
- (while (and (< (point)(point-max))
- (not (when (eq (char-after) ?\")
- (forward-char)
- t)))
- (if (eq (char-after) ?\\)
- (forward-char 2)
- (forward-char)))
- )
- (t
- (forward-char))))
- (goto-char (point-min))
- (skip-chars-forward (concat (char-to-string 0) "-"
- (char-to-string 255))))
- (setq ces
- (if (eq (point) (point-max))
- (if (and (featurep 'utf-2000)
- (re-search-backward "\\\\u[0-9A-Fa-f]+" nil t))
- 'utf-8-unix
- 'binary))))
+ (if (featurep 'mule)
+ (save-excursion
+ (set-buffer byte-compile-inbuffer)
+ (goto-char (point-min))
+ ;; mrb- There must be a better way than skip-chars-forward
+ (skip-chars-forward (concat (char-to-string 0) "-"
+ (char-to-string 255)))
+ (if (eq (point) (point-max))
+ (setq ces 'binary)
+ (goto-char (point-min))
+ (while (< (point)(point-max))
+ (cond ((eq (char-after) ?\;)
+ (delete-region (point)(point-at-eol))
+ (if (eq (char-after) ?\n)
+ (delete-char 1)
+ (forward-char))
+ )
+ ((eq (char-after) ?\?)
+ (forward-char 2)
+ )
+ ((eq (char-after) ?\n)
+ (forward-char)
+ )
+ ((eq (char-after) ?\")
+ (forward-char)
+ (while (and (< (point)(point-max))
+ (not (when (eq (char-after) ?\")
+ (forward-char)
+ t)))
+ (if (eq (char-after) ?\\)
+ (forward-char 2)
+ (forward-char)))
+ )
+ (t
+ (forward-char))))
+ (goto-char (point-min))
+ (skip-chars-forward (concat (char-to-string 0) "-"
+ (char-to-string 255))))
+ (setq ces
+ (if (eq (point) (point-max))
+ (if (and (featurep 'utf-2000)
+ (re-search-backward "\\\\u[0-9A-Fa-f]+" nil t))
+ 'utf-8-unix
+ 'binary))))
+ (setq ces 'binary))
(if (eq ces 'binary)
(setq buffer-file-coding-system 'binary)
(cond ((eq ces 'utf-8-unix)
(while (if (setq form (cdr form))
(byte-compile-constp (car form))))
(null form)))
- ;; eval the macro autoload into the compilation enviroment
+ ;; eval the macro autoload into the compilation environment
(eval form))
(if name
;; XEmacs: our `get' groks DEFAULT.
(defalias 'get* 'get)
-(defun getf (plist tag &optional def)
- "Search PROPLIST for property PROPNAME; return its value or DEFAULT.
-PROPLIST is a list of the sort returned by `symbol-plist'."
+(defun getf (plist property &optional default)
+ "Search PLIST for property PROPERTY; return its value or DEFAULT.
+PLIST is a list of the sort returned by `symbol-plist'."
(setplist '--cl-getf-symbol-- plist)
- (or (get '--cl-getf-symbol-- tag)
- (and def (get* '--cl-getf-symbol-- tag def))))
+ (get '--cl-getf-symbol-- property default))
(defun cl-set-getf (plist tag val)
(let ((p plist))
(setq form (list 'cons (car args) form)))
form))
-(define-compiler-macro get* (sym prop &optional def)
- (if def
- (list 'getf (list 'symbol-plist sym) prop def)
- (list 'get sym prop)))
+(define-compiler-macro get* (sym prop &optional default)
+ (list 'get sym prop default))
(define-compiler-macro typep (&whole form val type)
(if (cl-const-expr-p type)
; abs expt signum last butlast ldiff
; pairlis gcd lcm
; isqrt floor* ceiling* truncate* round* mod* rem* subseq
-; list-length get* getf))
+; list-length getf))
; (put fun 'side-effect-free t))
;;; Things that are side-effect-and-error-free. Moved to byte-optimize.el
;;; Code:
-(eval-when-compile
- (defvar buffer-file-type)
- (defvar binary-process-output))
-
(defvar process-coding-system-alist nil
"Alist to decide a coding system to use for a process I/O operation.
The format is ((PATTERN . VAL) ...),
you quit again before the process exits."
(let ((temp
(make-temp-name
- (concat (file-name-as-directory (temp-directory))
- (if (memq system-type '(ms-dos windows-nt)) "em" "emacs")))))
+ (concat (file-name-as-directory (temp-directory)) "emacs"))))
(unwind-protect
(let (cs-r cs-w)
(let (ret)
(or coding-system-for-read cs-r))
(coding-system-for-write
(or coding-system-for-write cs-w)))
- (if (memq system-type '(ms-dos windows-nt))
- (let ((buffer-file-type binary-process-output))
- (write-region start end temp nil 'silent))
- (write-region start end temp nil 'silent))
+ (write-region start end temp nil 'silent)
(if deletep (delete-region start end))
(apply #'call-process program temp buffer displayp args)))
(ignore-file-errors (delete-file temp)))))
(or coding-system-for-write cs-w)))
(open-network-stream-internal name buffer host service protocol))))
-;;; mule-process.el ends here
+;;; code-process.el ends here
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
+;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
"Return the base coding system of CODING-SYSTEM."
(if (not (coding-system-eol-type coding-system))
coding-system
- (find-coding-system
+ (find-coding-system
(intern
- (substring
+ (substring
(symbol-name (coding-system-name coding-system))
0
(string-match "-unix$\\|-dos$\\|-mac$"
"Automatic conversion."
'(mnemonic "Auto"))
-;; these are so that gnus and friends work when not mule
-(or (featurep 'mule)
- (progn
- (copy-coding-system 'undecided 'iso-8859-1)
- (copy-coding-system 'undecided 'iso-8859-2)))
+;;; Make certain variables equivalent to coding-system aliases
+(defun dontusethis-set-value-file-name-coding-system-handler (sym args fun harg handlers)
+ (define-coding-system-alias 'file-name (or (car args) 'binary)))
+
+(dontusethis-set-symbol-value-handler
+ 'file-name-coding-system
+ 'set-value
+ 'dontusethis-set-value-file-name-coding-system-handler)
+
+(defun dontusethis-set-value-terminal-coding-system-handler (sym args fun harg handlers)
+ (define-coding-system-alias 'terminal (or (car args) 'binary)))
+
+(dontusethis-set-symbol-value-handler
+ 'terminal-coding-system
+ 'set-value
+ 'dontusethis-set-value-terminal-coding-system-handler)
+
+(defun dontusethis-set-value-keyboard-coding-system-handler (sym args fun harg handlers)
+ (define-coding-system-alias 'keyboard (or (car args) 'binary)))
+
+(dontusethis-set-symbol-value-handler
+ 'keyboard-coding-system
+ 'set-value
+ 'dontusethis-set-value-keyboard-coding-system-handler)
+
+(unless (boundp 'file-name-coding-system)
+ (setq file-name-coding-system nil))
+
+(when (not (featurep 'mule))
+ ;; these are so that gnus and friends work when not mule
+ (copy-coding-system 'undecided 'iso-8859-1)
+ (copy-coding-system 'undecided 'iso-8859-2)
+
+ (define-coding-system-alias 'ctext 'binary))
+
;; compatibility for old XEmacsen (don't use it)
(copy-coding-system 'undecided 'automatic-conversion)
(custom-unlispify-menu-entry symbol t)))
(defun custom-prefix-add (symbol prefixes)
- ;; Addd SYMBOL to list of ignored PREFIXES.
+ ;; Add SYMBOL to list of ignored PREFIXES.
(cons (or (get symbol 'custom-prefix)
(concat (symbol-name symbol) "-"))
prefixes))
(defun custom-browse-insert-prefix (prefix)
"Insert PREFIX. On XEmacs convert it to line graphics."
- ;; ### Unfinished.
+ ;; #### Unfinished.
(if nil ; (string-match "XEmacs" emacs-version)
(progn
(insert "*")
(widget-put widget :custom-magic magic)
(push magic buttons))
;; Insert documentation.
- ;; ### NOTE: this is ugly!!!! I need to do update the :buttons property
+ ;; #### NOTE: this is ugly!!!! I need to do update the :buttons property
;; before the call to `widget-default-format-handler'. Otherwise, I
;; loose my current `buttons'. This function shouldn't be called like
;; this anyway. The doc string widget should be added like the others.
pm)
(const :format "MSWindows "
:sibling-args (:help-echo "\
-Windows NT/95/97")
+Microsoft Windows, displays")
mswindows)
- (const :format "DOS "
+ (const :format "MSPrinter "
:sibling-args (:help-echo "\
-Plain MS-DOS")
- pc)
+Microsoft Windows, printers")
+ msprinter)
(const :format "TTY%n"
:sibling-args (:help-echo "\
Plain text terminals")
tty)))
(group :sibling-args (:help-echo "\
+Only match display or printer devices")
+ (const :format "Output: "
+ class)
+ (checklist :inline t
+ :offset 0
+ (const :format "Display "
+ :sibling-args (:help-echo "\
+Match display devices")
+ display)
+ (const :format "Printer%n"
+ :sibling-args (:help-echo "\
+Match printer devices")
+ printer)))
+ (group :sibling-args (:help-echo "\
Only match the frames with the specified color support")
- (const :format "Class: "
+ (const :format "Color support: "
class)
(checklist :inline t
:offset 0
(princ "\n '(")
(prin1 symbol)
(princ " ")
- ;; This comment stuf is in the way ####
+ ;; This comment stuff is in the way ####
;; Is (eq (third spec) (car saved-value)) ????
;; (prin1 (third spec))
(prin1 (car (get symbol 'saved-value)))
(defun custom-theme-value (theme theme-spec-list)
"Determine the value for THEME defined by THEME-SPEC-LIST.
Returns (list value) if found. Nil otherwise."
- ;; Note we do _NOT_ singal an error if the theme is unkown
+ ;; Note we do _NOT_ signal an error if the theme is unknown
;; it might have gone away without the user knowing.
(let ((theme-or-lower (memq theme (cons 'user custom-loaded-themes)))
value)
;;; Code:
+;;; Initialization
+
+; Specifier tag 'printer which matches printers
+(define-specifier-tag 'printer (function device-printer-p))
+
+; Specifier tag 'display which matches displays
+(define-specifier-tag 'display (function
+ (lambda (device)
+ (not (device-printer-p device)))))
+
+;;; Functions
+
(defun device-list ()
"Return a list of all devices."
(apply 'nconc (mapcar 'console-device-list (console-list))))
Value is `tty' for a tty device (a character-only terminal),
`x' for a device that is a screen on an X display,
`ns' for a device that is a NeXTstep connection (not yet implemented),
-`mswindows' for a device that is a Windows or Windows NT connection,
-`pc' for a device that is a direct-write MS-DOS screen (not yet implemented),
+`mswindows' for a device that is a MS Windows workstation,
+`msprinter' for a device that is a MS Windows printer connection,
`stream' for a stream device (which acts like a stdio stream), and
`dead' for a deleted device."
(or device (setq device (selected-device)))
(defun call-device-method (name device &rest args)
"Call a DEVICE-specific function with the generic name NAME.
-If DEVICE is not provide the selected device is used."
+If DEVICE is not provided then the selected device is used."
(or device (setq device (selected-device)))
(or (symbolp name) (error "function name must be a symbol"))
(let ((devmeth (intern (concat (symbol-name
"events"
"text-props"
"process" ;; This is bad. network-streams may not be defined.
- (when-feature multicast "multicast") ; #+network-streams implicitely true
+ (when-feature multicast "multicast") ; #+network-streams implicitly true
"frame" ; move up here cause some stuff needs it here
"map-ynp"
"simple"
;; 02111-1307, USA.
;;; Synched up with: Not synched with FSF but coordinated with the FSF
-;;; easymenu maintor for compatability with FSF 20.4.
+;;; easymenu maintor for compatibility with FSF 20.4.
;;; Please: Coordinate changes with Inge Frick <inge@nada.kth.se>
;; Commentary:
(format "%s(default %s) " prompt default)
prompt)
tag-completion-table 'tag-completion-predicate nil nil
- 'find-tag-history))
- (if (string-equal tag-name "")
- ;; #### - This is a really LAME way of doing it! --Stig
- default ;indicate exact symbol match
- tag-name)))
+ 'find-tag-history default))
+ tag-name))
(defvar last-tag-data nil
"Information for continuing a tag search.
(get-custom-frame-properties frame))
(initialize-custom-faces frame)))
+(defun startup-initialize-custom-faces ()
+ "Reset faces created by defface. Only called at startup.
+Don't use this function in your program."
+ (when default-custom-frame-properties
+ ;; Reset default value to the actual frame, not stream.
+ (setq default-custom-frame-properties
+ (extract-custom-frame-properties (selected-frame)))
+ ;; like initialize-custom-faces but removes property first.
+ (mapc (lambda (symbol)
+ (let ((spec (or (get symbol 'saved-face)
+ (get symbol 'face-defface-spec))))
+ (when spec
+ ;; Reset faces created during auto-autoloads loading.
+ (reset-face symbol)
+ ;; And set it according to the spec.
+ (face-display-set symbol spec nil))))
+ (face-list))))
+
\f
(defun make-empty-face (name &optional doc-string temporary)
"Like `make-face', but doesn't query the resource database."
;; It's unreasonable to expect to be able to make a font italic all
;; the time. For many languages, italic is an alien concept.
;; Basically, because italic is not a globally meaningful concept,
- ;; the use of the italic face should really be oboleted.
+ ;; the use of the italic face should really be obsoleted.
;; I disagree with above. In many languages, the concept of capital
;; letters is just as alien, and yet we use them. Italic is here to
(setq tail (cdr tail))))
(when hack-homedir
;; Compute and save the abbreviated homedir name.
- ;; We defer computing this until the first time it's needed, to
- ;; give time for directory-abbrev-alist to be set properly.
- ;; We include a slash at the end, to avoid spurious matches
- ;; such as `/usr/foobar' when the home dir is `/usr/foo'.
+ ;; We defer computing this until the first time it's needed,
+ ;; to give time for directory-abbrev-alist to be set properly.
+ ;; We include the separator at the end, to avoid spurious
+ ;; matches such as `/usr/foobar' when the home dir is
+ ;; `/usr/foo'.
(or abbreviated-home-dir
(setq abbreviated-home-dir
(let ((abbreviated-home-dir "$foo"))
- (concat "\\`" (regexp-quote (abbreviate-file-name
- (expand-file-name "~")))
- "\\(/\\|\\'\\)"))))
+ (concat "\\`"
+ (regexp-quote
+ (abbreviate-file-name (expand-file-name "~")))
+ "\\("
+ (regexp-quote (string directory-sep-char))
+ "\\|\\'\\)"))))
;; If FILENAME starts with the abbreviated homedir,
;; make it start with `~' instead.
(if (and (string-match abbreviated-home-dir filename)
;; If the home dir is just /, don't change it.
- (not (and (= (match-end 0) 1) ;#### unix-specific
- (= (aref filename 0) ?/)))
- (not (and (memq system-type '(ms-dos windows-nt))
+ (not (and (= (match-end 0) 1)
+ (= (aref filename 0) directory-sep-char)))
+ (not (and (eq system-type 'windows-nt)
(save-match-data
- (string-match "^[a-zA-Z]:/$" filename)))))
+ (string-match (concat "\\`[a-zA-Z]:"
+ (regexp-quote
+ (string directory-sep-char))
+ "\\'")
+ filename)))))
(setq filename
(concat "~"
- (substring filename
- (match-beginning 1) (match-end 1))
+ (match-string 1 filename)
(substring filename (match-end 0))))))
filename)))
(setq keep-going nil)
(let ((alist auto-mode-alist)
(mode nil))
+
;; Find first matching alist entry.
+
+ ;; #### This is incorrect. In NT, case sensitivity is a volume
+ ;; property. For instance, NFS mounts *are* case sensitive.
+ ;; Need internal function (file-name-case-sensitive f), F
+ ;; being file or directory name. - kkm
(let ((case-fold-search
- (memq system-type '(windows-nt))))
+ (eq system-type 'windows-nt)))
(while (and (not mode) alist)
(if (string-match (car (car alist)) name)
(if (and (consp (cdr (car alist)))
(let ((delete-old-versions
;; If have old versions to maybe delete,
;; ask the user to confirm now, before doing anything.
- ;; But don't actually delete til later.
+ ;; But don't actually delete till later.
(and targets
(or (eq delete-old-versions t)
(eq delete-old-versions nil))
(defun make-backup-file-name (file)
"Create the non-numeric backup file name for FILE.
This is a separate function so you can redefine it for customization."
- (if (eq system-type 'ms-dos)
- (let ((fn (file-name-nondirectory file)))
- (concat (file-name-directory file)
- (if (string-match "\\([^.]*\\)\\(\\..*\\)?" fn)
- (substring fn 0 (match-end 1)))
- ".bak"))
- (concat file "~")))
+ (concat file "~"))
(defun backup-file-name-p (file)
"Return non-nil if FILE is a backup file name (numeric or not).
This is a separate function so you can redefine it for customization.
You may need to redefine `file-name-sans-versions' as well."
- (if (eq system-type 'ms-dos)
- (string-match "\\.bak\\'" file)
- (string-match "~\\'" file)))
+ (string-match "~\\'" file))
;; This is used in various files.
;; The usage of bv-length is not very clean,
(expand-file-name (or directory default-directory))))
;; On Microsoft OSes, if FILENAME and DIRECTORY have different
;; drive names, they can't be relative, so return the absolute name.
- (if (and (memq system-type '(ms-dos windows-nt))
+ (if (and (eq system-type 'windows-nt)
(not (string-equal (substring fname 0 2)
(substring directory 0 2))))
filename
file-name)))
(run-hooks 'before-revert-hook)
;; If file was backed up but has changed since,
- ;; we shd make another backup.
+ ;; we should make another backup.
(and (not auto-save-p)
(not (verify-visited-file-modtime (current-buffer)))
(setq buffer-backed-up nil))
(funcall handler 'insert-directory file switches
wildcard full-directory-p)
(cond
+ ;; #### mswindows-insert-directory should be called
+ ;; nt-insert-directory - kkm.
((and (fboundp 'mswindows-insert-directory)
(eq system-type 'windows-nt))
(mswindows-insert-directory file switches wildcard full-directory-p))
(skip-chars-forward " \t")
;; Then change all newlines to spaces.
;;; 97/3/14 jhod: Kinsoku change
- ;; Spacing is not necessary for charcters of no word-separater.
+ ;; Spacing is not necessary for characters of no word-separator.
;; The regexp word-across-newline is used for this check.
(defvar word-across-newline)
(if (not (and (featurep 'mule)
;;; were always selectable, and selecting them would set the size to be the
;;; closest size to the current font's size.
;;;
-;;; This attempts to change all other faces in an analagous way to the change
+;;; This attempts to change all other faces in an analogous way to the change
;;; that was made to the default face; if it can't, it will skip over the face.
;;; However, this could leave incongruous font sizes around, which may cause
;;; some nonreversibility problems if further changes are made. Perhaps it
Value is `tty' for a tty frame (a character-only terminal),
`x' for a frame that is an X window,
`ns' for a frame that is a NeXTstep window (not yet implemented),
-`mswindows' for a frame that is a Windows NT or Windows 95/97 window,
-`pc' for a frame that is a direct-write MS-DOS frame (not yet implemented),
+`mswindows' for a frame that is a MS Windows desktop window,
+`msprinter' for a frame that is a MS Windows print job,
`stream' for a stream frame (which acts like a stdio stream), and
`dead' for a deleted frame."
(or frame (setq frame (selected-frame)))
"Input from the gutters."
:group 'environment)
+(defvar gutter-buffers-tab nil
+ "A tab widget in the gutter for displaying buffers.
+Do not set this. Use `glyph-image-instance' and
+`set-image-instance-property' to change the properties of the tab.")
+
(defcustom gutter-visible-p
(specifier-instance default-gutter-visible-p)
"Whether the default gutter is globally visible. This option can be
:type 'boolean
:set #'(lambda (var val)
(set-specifier default-gutter-visible-p val)
- (setq gutter-visible-p val)))
-
-(defvar gutter-buffers-tab nil
- "A tab widget in the gutter for displaying buffers.
-Do not set this. Use `glyph-image-instance' and
-`set-image-instance-property' to change the properties of the tab.")
+ (setq gutter-visible-p val)
+ (when gutter-buffers-tab (update-tab-in-gutter))))
(defcustom default-gutter-position
(default-gutter-position)
(let ((len (specifier-instance buffers-tab-default-buffer-line-length)))
(if (and (> len 0)
(> (length (buffer-name buffer)) len))
- (concat (substring (buffer-name buffer)
- 0 (- len 3)) "...")
+ (if (string-match ".*<.>$" (buffer-name buffer))
+ (concat (substring (buffer-name buffer)
+ 0 (- len 6)) "..."
+ (substring (buffer-name buffer) -3))
+ (concat (substring (buffer-name buffer)
+ 0 (- len 3)) "..."))
(buffer-name buffer))))
(defsubst build-buffers-tab-internal (buffers)
(eq (default-gutter-position)
gutter-buffers-tab-orientation))
(add-tab-to-gutter))
- (when (valid-image-instantiator-format-p 'tab-control)
+ (when (valid-image-instantiator-format-p 'tab-control locale)
(let ((inst (glyph-image-instance
gutter-buffers-tab
(when (framep frame-or-buffer)
(make-glyph
(vector 'progress-gauge
:pixel-height (- progress-glyph-height 8)
- :pixel-width 250
+ :pixel-width 50
:descriptor "Progress")))
(defvar progress-text-glyph
This function is used by `describe-function-1' to list function
arguments in the standard Lisp style."
- (let* ((fndef (indirect-function function))
+ (let* ((fnc (indirect-function function))
+ (fndef (if (eq (car-safe fnc) 'macro)
+ (cdr fnc)
+ fnc))
(arglist
- (cond ((compiled-function-p fndef)
- (compiled-function-arglist fndef))
- ((eq (car-safe fndef) 'lambda)
- (nth 1 fndef))
- ((subrp fndef)
- (let* ((doc (documentation function))
- (args (and (string-match
- "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'"
- doc)
- (match-string 1 doc))))
- ;; If there are no arguments documented for the
- ;; subr, rather don't print anything.
- (cond ((null args) t)
- ((equal args "") nil)
- (args))))
- (t t))))
+ (cond ((compiled-function-p fndef)
+ (compiled-function-arglist fndef))
+ ((eq (car-safe fndef) 'lambda)
+ (nth 1 fndef))
+ ((subrp fndef)
+ (let* ((doc (documentation function))
+ (args (and (string-match
+ "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'"
+ doc)
+ (match-string 1 doc))))
+ ;; If there are no arguments documented for the
+ ;; subr, rather don't print anything.
+ (cond ((null args) t)
+ ((equal args "") nil)
+ (args))))
+ (t t))))
(cond ((listp arglist)
(prin1-to-string
(cons function (mapcar (lambda (arg)
(if cmd (princ " ")))))
(terpri))))))
-;; Stop gap for 21.0 untill we do help-char etc properly.
+;; Stop gap for 21.0 until we do help-char etc properly.
(defun help-keymap-with-help-key (keymap form)
"Return a copy of KEYMAP with an help-key binding according to help-char
invoking FORM like help-form. An existing binding is not overridden.
;; Massive changes by Christoph Wedler <wedler@fmi.uni-passau.de>
;; Some changes for XEmacs 20.3 by hniksic
-;; ### The maintainer is supposed to be stig, but I haven't seen him
+;; #### The maintainer is supposed to be stig, but I haven't seen him
;; around for ages. The real maintainer for the moment is Hrvoje
;; Niksic <hniksic@xemacs.org>.
;; Return the node name in the buffer following point.
;; ALLOWEDCHARS, if non-nil, goes within [...] to make a regexp
-;; saying which chas may appear in the node name.
+;; saying which chars may appear in the node name.
(defun Info-following-node-name (&optional allowedchars)
(skip-chars-forward " \t")
(buffer-substring
isearch-opoint (point)
search-ring-yank-pointer nil
regexp-search-ring-yank-pointer nil
- isearch-opened-extents nil
+ isearch-unhidden-extents nil
isearch-window-configuration (current-window-configuration)
;; #### What we really need is a buffer-local
(defun isearch-top-state ()
(let ((cmd (car isearch-cmds)))
;; #### Grr, this is so error-prone. If you add something to
- ;; isearch-push-state, don't forget to update this. I thout I'd
+ ;; isearch-push-state, don't forget to update this. I thought I'd
;; make a list of variables, and just do (mapcar* #'set vars
;; values), but the (point) thing would spoil it, leaving to more
;; complication.
(defun isearch-make-extent (begin end)
(let ((x (make-extent begin end (current-buffer))))
- ;; make the isearch extent always take prescedence over any mouse-
+ ;; make the isearch extent always take precedence over any mouse-
;; highlighted extents we may be passing through, since isearch, being
;; modal, is more interesting (there's nothing they could do with a
;; mouse-highlighted extent while in the midst of a search anyway).
;; It would be nice if we didn't have to do this; however,
;; window-start doesn't support a GUARANTEE flag, so we must
- ;; force redisplay to get the correct valye for start and end
+ ;; force redisplay to get the correct value for start and end
;; of window.
(sit-for 0)
;;
;; See the doc strings of these functions for more information.
\f
-(defvar itimer-version "1.08"
+(defvar itimer-version "1.09"
"Version number of the itimer package.")
(defvar itimer-list nil
(inhibit-quit t))
(setq next-wakeup 600)
(cond ((and (boundp 'last-command-event-time)
- (consp 'last-command-event-time))
+ (consp last-command-event-time))
(setq last-event-time last-command-event-time
idle-time (itimer-time-difference (current-time)
last-event-time)))
(call-with-condition-handler 'really-early-error-handler
#'(lambda ()
- ;; Initializa Installation-string. We do it before loading
+ ;; Initialize Installation-string. We do it before loading
;; anything so that dumped code can make use of its value.
(setq Installation-string
(save-current-buffer
["Update Package Index" package-get-update-base]
["List & Install" pui-list-packages]
["Update Installed Packages" package-get-update-all]
- ;; hack-o-matic, we can't force a laod of package-base here
+ ;; hack-o-matic, we can't force a load of package-base here
;; since it triggers dialog box interactions which we can't
- ;; deal while using a menu
+ ;; deal with while using a menu
("Using Custom"
:filter (lambda (&rest junk)
(if package-get-base
["Color Printing"
(cond (ps-print-color-p
(customize-set-variable 'ps-print-color-p nil)
- ;; I'm wondering whether all this muck is usefull.
+ ;; I'm wondering whether all this muck is useful.
(and (boundp 'original-face-background)
original-face-background
(set-face-background 'default original-face-background)))
(add-menu-button nil
["Load .emacs"
(progn (delete-menu-item '("Load .emacs"))
- (load-user-init-file (user-login-name)))
+ (load-user-init-file))
]
"Help"))
(t nil)))
(list 'buffer-menu-write-file name) t)
(vector "Delete Buffer" (list 'kill-buffer name)
t)))
- ;; ### We don't want buffer names to be translated,
- ;; ### so we put the buffer name in the suffix.
- ;; ### Also, avoid losing with non-ASCII buffer names.
- ;; ### We still lose, however, if complex-buffers-menu-p. --mrb
+ ;; #### We don't want buffer names to be translated,
+ ;; #### so we put the buffer name in the suffix.
+ ;; #### Also, avoid losing with non-ASCII buffer names.
+ ;; #### We still lose, however, if complex-buffers-menu-p. --mrb
(vector ""
(list buffers-menu-switch-to-buffer-function
(buffer-name buffer))
(make-variable-buffer-local 'mode-popup-menu)
;; In an effort to avoid massive menu clutter, this mostly worthless menu is
-;; superceded by any local popup menu...
+;; superseded by any local popup menu...
(setq-default mode-popup-menu default-popup-menu)
(defvar activate-popup-menu-hook nil
(let ((narg (- minibuffer-history-position n))
(minimum (if minibuffer-default -1 0)))
(cond ((< narg minimum)
- (error "No following item in %s" minibuffer-history-variable))
+ (error (if minibuffer-default
+ "No following item in %s"
+ "No following item in %s; no default available")
+ minibuffer-history-variable))
((> narg (length (symbol-value minibuffer-history-variable)))
(error "No preceding item in %s" minibuffer-history-variable)))
(erase-buffer)
;;;; reading various things from a minibuffer ;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun read-expression (prompt &optional initial-contents history)
- "Return a Lisp object read using the minibuffer.
-Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS
-is a string to insert in the minibuffer before reading.
-Third arg HISTORY, if non-nil, specifies a history list."
+(defun read-expression (prompt &optional initial-contents history default-value)
+ "Return a Lisp object read using the minibuffer, prompting with PROMPT.
+If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
+ in the minibuffer before reading.
+Third arg HISTORY, if non-nil, specifies a history list.
+Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
+ for history command, and as the value to return if the user enters the
+ empty string."
(let ((minibuffer-history-sexp-flag t)
;; Semi-kludge to get around M-x C-x o M-ESC trying to do completion.
(minibuffer-completion-table nil))
read-expression-map
t
(or history 'read-expression-history)
- lisp-mode-abbrev-table)))
+ lisp-mode-abbrev-table
+ default-value)))
-(defun read-string (prompt &optional initial-contents history)
+(defun read-string (prompt &optional initial-contents history default-value)
"Return a string from the minibuffer, prompting with string PROMPT.
If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
-in the minibuffer before reading.
-Third arg HISTORY, if non-nil, specifies a history list."
+ in the minibuffer before reading.
+Third arg HISTORY, if non-nil, specifies a history list.
+Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
+ for history command, and as the value to return if the user enters the
+ empty string."
(let ((minibuffer-completion-table nil))
(read-from-minibuffer prompt
initial-contents
minibuffer-local-map
- nil history)))
+ nil history nil default-value)))
-(defun eval-minibuffer (prompt &optional initial-contents history)
+(defun eval-minibuffer (prompt &optional initial-contents history default-value)
"Return value of Lisp expression read using the minibuffer.
Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS
is a string to insert in the minibuffer before reading.
-Third arg HISTORY, if non-nil, specifies a history list."
- (eval (read-expression prompt initial-contents history)))
+Third arg HISTORY, if non-nil, specifies a history list.
+Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
+ for history command, and as the value to return if the user enters the
+ empty string."
+ (eval (read-expression prompt initial-contents history default-value)))
;; The name `command-history' is already taken
(defvar read-command-history '())
-(defun read-command (prompt)
+(defun read-command (prompt &optional default-value)
"Read the name of a command and return as a symbol.
-Prompts with PROMPT."
+Prompts with PROMPT. By default, return DEFAULT-VALUE."
(intern (completing-read prompt obarray 'commandp t nil
;; 'command-history is not right here: that's a
;; list of evalable forms, not a history list.
'read-command-history
- )))
+ default-value)))
-(defun read-function (prompt)
+(defun read-function (prompt &optional default-value)
"Read the name of a function and return as a symbol.
-Prompts with PROMPT."
+Prompts with PROMPT. By default, return DEFAULT-VALUE."
(intern (completing-read prompt obarray 'fboundp t nil
- 'function-history)))
+ 'function-history default-value)))
-(defun read-variable (prompt)
+(defun read-variable (prompt &optional default-value)
"Read the name of a user variable and return it as a symbol.
-Prompts with PROMPT.
+Prompts with PROMPT. By default, return DEFAULT-VALUE.
A user variable is one whose documentation starts with a `*' character."
(intern (completing-read prompt obarray 'user-variable-p t nil
- 'variable-history)))
+ 'variable-history default-value)))
(defun read-buffer (prompt &optional default require-match)
"Read the name of a buffer and return as a string.
(buffer-name result)
result)))
-(defun read-number (prompt &optional integers-only)
- "Read a number from the minibuffer."
+(defun read-number (prompt &optional integers-only default-value)
+ "Read a number from the minibuffer, prompting with PROMPT.
+If optional second argument INTEGERS-ONLY is non-nil, accept
+ only integer input.
+If DEFAULT-VALUE is non-nil, return that if user enters an empty
+ line."
(let ((pred (if integers-only 'integerp 'numberp))
num)
(while (not (funcall pred num))
(let ((minibuffer-completion-table nil))
(read-from-minibuffer
prompt (if num (prin1-to-string num)) nil t
- t)) ;no history
+ nil nil default-value))
(input-error nil)
(invalid-read-syntax nil)
(end-of-file nil)))
(or (funcall pred num) (beep)))
num))
-(defun read-shell-command (prompt &optional initial-input history)
+(defun read-shell-command (prompt &optional initial-input history default-value)
"Just like read-string, but uses read-shell-command-map:
\\{read-shell-command-map}"
(let ((minibuffer-completion-table nil))
(read-from-minibuffer prompt initial-input read-shell-command-map
- nil (or history 'shell-command-history))))
+ nil (or history 'shell-command-history)
+ nil default-value)))
\f
;;; This read-file-name stuff probably belongs in files.el
used.)
Fourth arg MUST-MATCH non-nil means require existing file's name.
Non-nil and non-t means also require confirmation after completion.
-Fifth arg INITIAL-CONTENTS specifies text to start with.
+Fifth arg INITIAL-CONTENTS specifies text to start with. If this is not
+ specified, and `insert-default-directory' is non-nil, DIR or the current
+ directory will be used.
Sixth arg HISTORY specifies the history list to use. Default is
`file-name-history'.
DIR defaults to current buffer's directory default."
(read-file-name-1
(or history 'file-name-history)
prompt dir (or default
- (if initial-contents (expand-file-name initial-contents dir)
- buffer-file-name))
+ (and initial-contents
+ (abbreviate-file-name (expand-file-name
+ initial-contents dir) t))
+ (and buffer-file-truename
+ (abbreviate-file-name buffer-file-name t)))
must-match initial-contents
;; A separate function (not an anonymous lambda-expression)
;; and passed as a symbol because of disgusting kludges in various
(make-face 'modeline-mousable "Face for mousable portions of the modeline.")
(set-face-parent 'modeline-mousable 'modeline nil '(default))
(when (featurep 'window-system)
- (set-face-foreground 'modeline-mousable
- '(((default color x) . "firebrick")
- ((default color mswindows) . "firebrick"))
- 'global))
-(when (featurep 'x)
- (set-face-font 'modeline-mousable [bold] nil '(default mono x))
- (set-face-font 'modeline-mousable [bold] nil '(default grayscale x)))
+ (set-face-foreground 'modeline-mousable "firebrick" nil '(default color win))
+ (set-face-font 'modeline-mousable [bold] nil '(default mono win))
+ (set-face-font 'modeline-mousable [bold] nil '(default grayscale win)))
(defmacro make-modeline-command-wrapper (command)
`#'(lambda (event)
(set-face-parent 'modeline-mousable-minor-mode 'modeline-mousable nil
'(default))
(when (featurep 'window-system)
- (set-face-foreground 'modeline-mousable-minor-mode
- '(((default color x) . "green4")
- ((default color x) . "forestgreen")
- ((default color mswindows) . "green4")
- ((default color mswindows) . "forestgreen"))
- 'global))
+ (set-face-foreground 'modeline-mousable-minor-mode '("green4" "forestgreen")
+ nil '(default color win)))
(defvar modeline-mousable-minor-mode-extent (make-extent nil nil)
;; alliteration at its finest.
"Face for the buffer ID string in the modeline.")
(set-face-parent 'modeline-buffer-id 'modeline nil '(default))
(when (featurep 'window-system)
- (set-face-foreground 'modeline-buffer-id
- '(((default color x) . "blue4")
- ((default color mswindows) . "blue4"))
- 'global))
-(when (featurep 'x)
- (set-face-font 'modeline-buffer-id [bold-italic] nil '(default mono x))
- (set-face-font 'modeline-buffer-id [bold-italic] nil '(default grayscale x)))
+ (set-face-foreground 'modeline-buffer-id "blue4" nil '(default color win))
+ (set-face-font 'modeline-buffer-id [bold-italic] nil '(default mono win))
+ (set-face-font 'modeline-buffer-id [bold-italic] nil '(default grayscale win)))
(when (featurep 'tty)
(set-face-font 'modeline-buffer-id [bold-italic] nil '(default tty)))
;; vars is a list of glyph variables to check for a pointer
;; value.
(vars (cond
- ;; Checking if button is non-nil is not sufficent
+ ;; Checking if button is non-nil is not sufficient
;; since the pointer could be over a blank portion
;; of the toolbar.
((event-over-toolbar-p event)
(setq last-timestamp (event-timestamp event))
;; Enlarge the window, calculating change in characters
;; of default font. Do not let the window to become
- ;; less than alolwed minimum (not because that's critical
+ ;; less than allowed minimum (not because that's critical
;; for the code performance, just the visual effect is
;; better: when cursor goes to the left of the next left
- ;; divider, the vindow being resized shrinks to minimal
+ ;; divider, the window being resized shrinks to minimal
;; size.
(enlarge-window (max (- window-min-width (window-width window))
(/ (- (event-x-pixel event) old-right)
;; if the change caused more than two windows to resize
;; (shifting the whole stack right is ugly), or if the
;; left window side has slipped (right side cannot be
- ;; moved any funrther to the right, so enlarge-window
+ ;; moved any further to the right, so enlarge-window
;; plays bad games with the left edge.
(if (or (/= (count-windows) (length old-edges-all-windows))
(/= old-left (car (window-pixel-edges window)))
;;; Commentary:
-;; This file contains temporary definitions for 'mswindows glyphs.
-;; Since there currently is no image support, the glyps are defined
-;; TTY-style. This file has to be removed or reworked completely
-;; when we have images.
+;; Initialization code for MS Windows glyphs.
-;; This file is dumped with XEmacs.
+;; This file is dumped with XEmacs (when MS Windows support is
+;; compiled in).
;;; Code:
;; We need nothing special to support English on Emacs. Selecting
;; English as a language environment is one of the ways to reset
-;; various multilingual environment to the original settting.
+;; various multilingual environment to the original setting.
;;; Code
;; For Europeans, five character sets ISO8859-1,2,3,4,9 are supported.
+;; #### latin.el would be a better name for this file.
+
;;; Code:
;; For syntax of Latin-1 characters.
(modify-syntax-entry ?\e,BW\e(B ".")
(modify-syntax-entry ?\e,Bw\e(B ".")
+;; For syntax of Latin-3
+(loop for c in '(?\e,C!\e(B ?\e,C&\e(B ?\e,C)\e(B ?\e,C*\e(B ?\e,C+\e(B ?\e,C,\e(B ?\e,C/\e(B ?\e,C1\e(B ?\e,C5\e(B ?\e,C6\e(B ?\e,C:\e(B ?\e,C;\e(B ?\e,C<\e(B ?\e,C?\e(B)
+ do (modify-syntax-entry c "w"))
+
+(loop for c from 64 to 126
+ do (modify-syntax-entry (make-char 'latin-iso8859-3 c) "w"))
+
+(modify-syntax-entry (make-char 'latin-iso8859-3 32) "w") ; no-break space
+(modify-syntax-entry ?\e,CW\e(B ".")
+(modify-syntax-entry ?\e,Cw\e(B ".")
+
+;; For syntax of Latin-4
+(loop for c in '(?\e,D!\e(B ?\e,D"\e(B ?\e,D#\e(B ?\e,D%\e(B ?\e,D&\e(B ?\e,D)\e(B ?\e,D*\e(B ?\e,D+\e(B ?\e,D,\e(B ?\e,D.\e(B ?\e,D1\e(B ?\e,D3\e(B ?\e,D5\e(B ?\e,D6\e(B ?\e,D9\e(B ?\e,D:\e(B ?\e,D;\e(B ?\e,D<\e(B ?\e,D=\e(B ?\e,D>\e(B ?\e,D?\e(B)
+ do (modify-syntax-entry c "w"))
+
+(loop for c from 64 to 126
+ do (modify-syntax-entry (make-char 'latin-iso8859-4 c) "w"))
+
+(modify-syntax-entry (make-char 'latin-iso8859-4 32) "w") ; no-break space
+(modify-syntax-entry ?\e,DW\e(B ".")
+(modify-syntax-entry ?\e,Dw\e(B ".")
+
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; EUROPEANS
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq a (1+ a)))
(nreverse list)))))
-;; implimented in c, file chartab.c (97/3/14 jhod@po.iijnet.or.jp)
+;; implemented in c, file chartab.c (97/3/14 jhod@po.iijnet.or.jp)
;(defun char-in-category-p (char category &optional table)
; "Return non-nil if CHAR is in CATEGORY.
;TABLE defaults to the current buffer's category table.
;; (memq (char-charset char) safe-charsets))
;; ;; We must find the encoded string of CHAR. But, just encoding
;; ;; CHAR will put extra control sequences (usually to designate
-;; ;; ASCII charaset) at the tail if type of CODING is ISO 2022.
+;; ;; ASCII charset) at the tail if type of CODING is ISO 2022.
;; ;; To exclude such tailing bytes, we at first encode one-char
;; ;; string and two-char string, then check how many bytes at the
;; ;; tail of both encoded strings are the same.
(setenv "LC_MESSAGES" "C")
(setenv "LC_TIME" "C"))))
- ;; Register avairable input methods by loading LEIM list file.
+ ;; Register available input methods by loading LEIM list file.
(load "leim-list.el" 'noerror 'nomessage 'nosuffix)
)
(features viet-util)
(sample-text . "Vietnamese (Ti\e,1*\e(Bng Vi\e,1.\e(Bt) Ch\e,A`\e(Bo b\e,1U\e(Bn")
(documentation . "\
-For Vietnamese, Emacs uses special charasets internally.
+For Vietnamese, Emacs uses special charsets internally.
They can be decoded from and encoded to VISCC, VSCII, and VIQR.
Current setting put higher priority to the coding system VISCII than VSCII.
If you prefer VSCII, please do: (prefer-coding-system 'vietnamese-vscii)")
(setq idx (1+ idx) i (1+ i)))
string))
-;; ### This function is not compatible with FSF in some cases. Hard
+;; #### This function is not compatible with FSF in some cases. Hard
;; to fix, because it is hard to trace the logic of the FSF function.
;; In case we need the exact behavior, we can always copy the FSF
;; version, which is very long and does lots of unnecessary stuff.
(setq autoload-dir (feature-file package-feature))
(setq autoload-dir (file-name-directory autoload-dir))
(member autoload-dir late-package-load-path))
- ;; Find the corresonding entry in late-package
+ ;; Find the corresponding entry in late-package
(setq pkg-dir
(car-safe (member-if (lambda (h)
(string-match (concat "^" (regexp-quote h))
;; Retrieve a package and any other required packages from an archive
;;
;;
-;; Note (JV): Most of this no longer aplies!
+;; Note (JV): Most of this no longer applies!
;;
;; The idea:
;; A new XEmacs lisp-only release is generated with the following steps:
"package-get DB verification? ")))))
(t nil)))))
(error "Package-get PGP signature failed to verify"))
- ;; ToDo: We shoud call package-get-maybe-save-index on the region
+ ;; ToDo: We should call package-get-maybe-save-index on the region
(package-get-update-base-entries content-beg content-end)
(message "Updated package-get database"))))
(set-buffer (event-buffer event))
(goto-char (event-point event))
(popup-menu pui-menu event)
- ;; I agreee with dired.el this is seriously bogus.
+ ;; I agree with dired.el - this is seriously bogus.
(while (popup-menu-up-p)
(dispatch-event (next-event)))))
;;; Code:
\f
-(defvar binary-process-output)
-(defvar buffer-file-type)
-
(defgroup processes nil
"Process, subshell, compilation, and job control support."
:group 'external
you quit again before the process exits."
(let ((temp
(make-temp-name
- (concat (file-name-as-directory (temp-directory))
- (if (memq system-type '(ms-dos windows-nt)) "em" "emacs")))))
+ (concat (file-name-as-directory (temp-directory)) "emacs"))))
(unwind-protect
(progn
- (if (memq system-type '(ms-dos windows-nt))
- (let ((buffer-file-type binary-process-output))
- (write-region start end temp nil 'silent))
- (write-region start end temp nil 'silent))
+ (write-region start end temp nil 'silent)
(if deletep (delete-region start end))
(apply #'call-process program temp buffer displayp args))
(ignore-file-errors (delete-file temp)))))
(defun shell-quote-argument (argument)
"Quote an argument for passing as argument to an inferior shell."
- (if (eq system-type 'ms-dos)
- ;; MS-DOS shells don't have quoting, so don't do any.
- argument
- (if (eq system-type 'windows-nt)
- (concat "\"" argument "\"")
- ;; Quote everything except POSIX filename characters.
- ;; This should be safe enough even for really weird shells.
- (let ((result "") (start 0) end)
- (while (string-match "[^-0-9a-zA-Z_./]" argument start)
- (setq end (match-beginning 0)
- result (concat result (substring argument start end)
- "\\" (substring argument end (1+ end)))
- start (1+ end)))
- (concat result (substring argument start))))))
+ (if (eq system-type 'windows-nt)
+ (nt-quote-process-args (list shell-file-name argument))
+ ;; Quote everything except POSIX filename characters.
+ ;; This should be safe enough even for really weird shells.
+ (let ((result "") (start 0) end)
+ (while (string-match "[^-0-9a-zA-Z_./]" argument start)
+ (setq end (match-beginning 0)
+ result (concat result (substring argument start end)
+ "\\" (substring argument end (1+ end)))
+ start (1+ end)))
+ (concat result (substring argument start)))))
(defun shell-command-to-string (command)
"Execute shell command COMMAND and return its output as a string."
;; This package provides the operations on rectangles that are documented
;; in the XEmacs Reference Manual.
-;; ### NOTE: this file has been almost completely rewritten by Didier Verna
+;; #### NOTE: this file has been almost completely rewritten by Didier Verna
;; <verna@inf.enst.fr>, Jul 99. The purpose of this rewrite is to be less
;; intrusive and fill lines with whitespaces only when needed. A few functions
;; are untouched though, as noted above their definition.
;;; Code:
-;; ### NOTE: this function is untouched, but not used anymore.
+;; #### NOTE: this function is untouched, but not used anymore.
;; `apply-on-rectangle' is used instead. It's still there because it's
;; documented so people might use it in their code, so I've decided not to
;; touch it. --dv
(apply-on-rectangle 'extract-rectangle-line start end lines)
(nreverse (cdr lines))))
-;; ### NOTE: this is actually the only function that needs to do complicated
+;; #### NOTE: this is actually the only function that needs to do complicated
;; stuff like what's happening in `operate-on-rectangle', because the buffer
;; might be read-only. --dv
(defun extract-rectangle-line (startcol endcol lines)
;; vertical scrollbar functions
;;
-;;; ### Move functions from C into Lisp here!
+;;; #### Move functions from C into Lisp here!
;;
;; horizontal scrollbar functions
;; --hniksic
(defcustom log-message-ignore-regexps
'(;; Note: adding entries to this list slows down messaging
- ;; significantly. Wherever possible, use message lables.
+ ;; significantly. Wherever possible, use message labels.
;; Often-seen messages
"\\`\\'" ; empty message
(defvar user-init-directory-base ".xemacs"
"Base of directory where user-installed init files may go.")
-(defvar user-init-file-base (cond
- ((eq system-type 'ms-dos) "_emacs")
- (t ".emacs"))
- "Base of init file.")
+(defvar user-init-file-base-list (append
+ '(".emacs.elc" ".emacs.el" ".emacs")
+ (and (eq system-type 'windows-nt)
+ '("_emacs.elc" "_emacs.el" "_emacs")))
+ "List of allowed init files. The first one found takes precedence.")
(defvar user-init-directory
(file-name-as-directory
(string= arg "-user"))
(let* ((user (pop args))
(home-user (concat "~" user)))
- (setq user-init-file
- (paths-construct-path (list home-user user-init-file-base)))
- (setq user-init-directory
- (file-name-as-directory
- (paths-construct-path (list home-user user-init-directory-base))))))
+ (setq user-init-file (find-user-init-file home-user)
+ user-init-directory (file-name-as-directory
+ (paths-construct-path
+ (list home-user user-init-directory-base))))))
((string= arg "-debug-init")
(setq init-file-debug t))
((string= arg "-unmapped")
;; and deletes the stdio device.
(frame-initialize))
+ ;; Reinitialize faces if necessary. This function changes face if
+ ;; it is created during auto-autoloads loading. Otherwise, it
+ ;; does nothing.
+ (startup-initialize-custom-faces)
+
;;
;; We have normality, I repeat, we have normality. Anything you still
;; can't cope with is therefore your own problem. (And we don't need
(setq term (substring term 0 hyphend))
(setq term nil))))))
+(defun find-user-init-file (&optional directory)
+ "Determine the user's init file."
+ (unless directory
+ (setq directory "~"))
+ (dolist (file user-init-file-base-list)
+ (let ((expanded (paths-construct-path (list directory file))))
+ (when (file-exists-p expanded)
+ (return expanded)))))
+
(defun load-user-init-file ()
"This function actually reads the init file, .emacs."
(if (not user-init-file)
- (setq user-init-file
- (paths-construct-path (list "~" user-init-file-base))))
+ (setq user-init-file (find-user-init-file)))
(load user-init-file t t t)
(unless inhibit-default-init
(let ((inhibit-startup-message nil))
(1+ indice )))
)))
-;; ### This function now returns the (possibly nil) timeout circulating the
+;; #### This function now returns the (possibly nil) timeout circulating the
;; splash-frame elements
(defun display-splash-frame ()
(let ((logo xemacs-logo)
;; We have only one font, so...
(add-hook 'before-init-hook 'msdos-face-setup)
;; ---------------------------------------------------------------------------
-;; More or less useful immitations of certain X-functions. A lot of the
+;; More or less useful imitations of certain X-functions. A lot of the
;; values returned are questionable, but usually only the form of the
;; returned value matters. Also, by the way, recall that `ignore' is
;; a useful function for returning 'nil regardless of argument.
;; HISTORY
;; jkj - Jan 18, 1993: Created.
-;; jkj - Nov 18, 1993: Mdified to work with Emacs 19.21
+;; jkj - Nov 18, 1993: Modified to work with Emacs 19.21
;;
;; First of all, the normal cursor movement keys. Some of these, if not
;; `what(1)' can extract from the executable or a core file. We don't
;; actually need this to be pointed to from lisp; pure objects can't
;; be GCed.
-(or (memq system-type '(windows-nt ms-dos))
- (purecopy (concat "\n@" "(#)" (emacs-version)
- "\n@" "(#)" "Configuration: "
- system-configuration "\n")))
+(purecopy (concat "\n@" "(#)" (emacs-version)
+ "\n@" "(#)" "Configuration: "
+ system-configuration "\n"))
;;Local variables:
;;version-control: never
;;; wid-edit.el --- Functions for creating and using widgets.
;;
-;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org>
;; In WIDGET, match the start of VALS.
(cond ((widget-get widget :inline)
(widget-apply widget :match-inline vals))
- ((and vals
+ ((and (listp vals)
(widget-apply widget :match (car vals)))
(cons (list (car vals)) (cdr vals)))
(t nil)))
found))
(defun widget-checklist-match-up (args vals)
- ;; Rerturn the first type from ARGS that matches VALS.
+ ;; Return the first type from ARGS that matches VALS.
(let (current found)
(while (and args (null found))
(setq current (car args)
result))
(defun widget-checklist-validate (widget)
- ;; Ticked chilren must be valid.
+ ;; Ticked children must be valid.
(let ((children (widget-get widget :children))
child button found)
(while (and children (not found))
(select-frame frame))))
;; check to make sure that the window is the full width
;; of the frame
- (eq (nth 2 edges)
- (frame-pixel-width))
+ (window-leftmost-p window)
+ (window-rightmost-p window)
(zerop (nth 0 edges))
;; The whole buffer must be visible.
(pos-visible-in-window-p (point-min) window)
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-01-25 Andy Piper <andy@xemacs.org>
+
+ * xlwtabs.c (TabsChangeManaged): Make sure we unmanage the hilight
+ widget as well.
+
+2000-01-28 Martin Buchholz <martin@xemacs.org>
+
+ * xlwgauge.c (GaugeConvert): bcopy ==> memcpy
+
+2000-01-24 Andy Piper <andy@xemacs.org>
+
+ * xlwtabs.c (XawTabsSetTop): Unhighlight before changing the
+ stacking order.
+ (XawTabsSetHighlight): Don't unhighlight here.
+
+2000-01-22 Martin Buchholz <martin@xemacs.org>
+
+ * *.h: Use consistent C-standards-approved guard macro names.
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
-#ifndef LWLIB_XAW_H
-#define LWLIB_XAW_H
+#ifndef INCLUDED_lwlib_Xaw_h_
+#define INCLUDED_lwlib_Xaw_h_
#include "lwlib-internal.h"
void
xaw_pop_instance (widget_instance* instance, Boolean up);
-#endif /* LWLIB_XAW_H */
+#endif /* INCLUDED_lwlib_Xaw_h_ */
-#ifndef LWLIB_XM_H
-#define LWLIB_XM_H
+#ifndef INCLUDED_lwlib_Xm_h_
+#define INCLUDED_lwlib_Xm_h_
#include "lwlib-internal.h"
extern Widget first_child (Widget); /* garbage */
-#endif /* LWLIB_XM_H */
+#endif /* INCLUDED_lwlib_Xm_h_ */
-#ifndef LWLIB_INTERNAL_H
-#define LWLIB_INTERNAL_H
+#ifndef INCLUDED_lwlib_internal_h_
+#define INCLUDED_lwlib_internal_h_
#include "lwlib.h"
widget_info *lw_get_widget_info (LWLIB_ID id);
-#endif /* LWLIB_INTERNAL_H */
-
+#endif /* INCLUDED_lwlib_internal_h_ */
-#ifndef _LWLIB_UTILS_H_
-#define _LWLIB_UTILS_H_
+#ifndef INCLUDED_lwlib_utils_h_
+#define INCLUDED_lwlib_utils_h_
void destroy_all_children (Widget widget);
void XtNoClearRefreshWidget (Widget);
#ifdef USE_DEBUG_MALLOC
#include <dmalloc.h>
#endif
-#endif /* _LWLIB_UTILS_H_ */
+
+#endif /* INCLUDED_lwlib_utils_h_ */
-#ifndef LWLIB_H
-#define LWLIB_H
+#ifndef INCLUDED_lwlib_h_
+#define INCLUDED_lwlib_h_
#undef CONST
/* Silly Energize hack to invert the "sheet" button */
void lw_show_busy (Widget w, Boolean busy);
-#endif /* LWLIB_H */
+#endif /* INCLUDED_lwlib_h_ */
*rval++ = XA_INTEGER ;
*rval++ = XA_STRING ;
*rval++ = XA_TEXT(XtDisplay(w)) ;
- bcopy((char *)stdTargets, (char *)rval, stdLength*sizeof(Atom)) ;
+ memcpy((char *)rval, (char *)stdTargets, stdLength*sizeof(Atom)) ;
XtFree((char*) stdTargets) ;
*format = 8*sizeof(Atom) ; /* TODO: needed? */
return True ;
-#ifndef _XlwMenu_h
-#define _XlwMenu_h
+#ifndef INCLUDED_xlwmenu_h_
+#define INCLUDED_xlwmenu_h_
/***********************************************************************
*
widget_value *xlw_get_entries (int allp);
int xlw_menu_level (void);
-#endif /* _XlwMenu_h */
+#endif /* INCLUDED_xlwmenu_h_ */
-#ifndef _XlwMenuP_h
-#define _XlwMenuP_h
+#ifndef INCLUDED_xlwmenuP_h_
+#define INCLUDED_xlwmenuP_h_
#include "xlwmenu.h"
#include <X11/CoreP.h>
/* Class pointer. */
extern XlwMenuClassRec xlwMenuClassRec;
-#endif /* _XlwMenuP_h */
+#endif /* INCLUDED_xlwmenuP_h_ */
/* Created by Douglas Keller <dkeller@vnet.ibm.com> */
-#ifndef _XlwScrollbar_h
-#define _XlwScrollbar_h
+#ifndef INCLUDED_xlwscrollbar_h_
+#define INCLUDED_xlwscrollbar_h_
#include <X11/Core.h>
void XlwScrollBarSetValues(Widget widget, int value, int sliderSize,
int increment, int pageIncrement, Boolean notify);
-#endif
+#endif /* INCLUDED_xlwscrollbar_h_ */
tw->tabs.topWidget->core.being_destroyed ) )
tw->tabs.topWidget = NULL ;
+ /* Check whether the highlight tab is still valid. */
+ if( tw->tabs.hilight != NULL &&
+ ( !XtIsManaged(tw->tabs.hilight) ||
+ tw->tabs.hilight->core.being_destroyed ) )
+ tw->tabs.hilight = NULL ;
+
GetPreferredSizes(tw) ;
MakeSizeRequest(tw) ;
if( !XtIsRealized(w) ) {
tw->tabs.topWidget = w ;
tw->tabs.needs_layout = True ;
+ tw->tabs.hilight = NULL; /* The highlight tab might disappear. */
return ;
}
#endif
tab = (TabsConstraints) w->core.constraints ;
+
+ /* Unhighlight before we start messing with the stacking order. */
+ if( tw->tabs.hilight != NULL )
+ {
+ DrawHighlight(tw, tw->tabs.hilight, True) ;
+ tw->tabs.hilight = NULL;
+ }
+
if( tab->tabs.row == 0 )
{
/* Easy case; undraw current top, undraw new top, assign new
if( XtIsRealized(t) && w != tw->tabs.hilight )
{
- if( tw->tabs.hilight != NULL )
- DrawHighlight(tw, tw->tabs.hilight, True) ;
if( w != NULL )
DrawHighlight(tw, w, False) ;
}
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * cl.texi: Remove (or replace by `get') references to `get*'.
+
+2000-01-25 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * widget.texi:
+ * internals/internals.texi:
+ * lispref/commands.texi:
+ * lispref/consoles-devices.texi:
+ * lispref/customize.texi:
+ * lispref/dialog.texi:
+ * lispref/extents.texi:
+ * lispref/faces.texi:
+ * lispref/glyphs.texi:
+ * lispref/keymaps.texi:
+ * lispref/lists.texi:
+ * lispref/markers.texi:
+ * lispref/menus.texi:
+ * lispref/mule.texi:
+ * lispref/objects.texi:
+ * lispref/specifiers.texi:
+ * lispref/toolbar.texi:
+ * lispref/tooltalk.texi:
+ * lispref/x-windows.texi:
+ * new-users-guide/custom2.texi:
+ * new-users-guide/help.texi:
+ * new-users-guide/modes.texi:
+ * xemacs/abbrevs.texi:
+ * xemacs/buffers.texi:
+ * xemacs/custom.texi:
+ * xemacs/help.texi:
+ * xemacs/keystrokes.texi:
+ * xemacs/mini.texi:
+ * xemacs/new.texi:
+ * xemacs/packages.texi:
+ * xemacs/programs.texi:
+ * xemacs/sending.texi:
+ Change ' -- ' to '---' since Texinfo formats --- to --.
+ Untabify. TeX doesn't like TAB.
+
+2000-01-27 Sandra Wambold <wambold@xemacs.org>
+
+ * xemacs-faq.texi (Q6.2.2): updated font instructions to include
+ 21.2.*
+
+2000-01-25 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * xemacs-faq.texi: Untabify.
+
+2000-01-22 Martin Buchholz <martin@xemacs.org>
+
+ * internals/internals.texi (General Coding Rules): Document why we
+ #include <config.h>
+
+2000-01-21 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * xemacs-faq.texi: Change ' -- ' to '---'.
+
+2000-01-19 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * lispref/faces.texi (Face Properties): Document
+ remove-face-property.
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
@example
defun* defsubst* defmacro* function*
-member* assoc* rassoc* get*
-remove* delete* mapcar* sort*
-floor* ceiling* truncate* round*
-mod* rem* random*
+member* assoc* rassoc* remove*
+delete* mapcar* sort* floor*
+ceiling* truncate* round* mod*
+rem* random*
@end example
Internal function and variable names in the package are prefixed
nth rest first .. tenth
aref elt nthcdr
symbol-function symbol-value symbol-plist
-get get* getf
-gethash subseq
+get getf gethash
+subseq
@end smallexample
@noindent
missing from Emacs Lisp.
@menu
-* Property Lists:: `get*', `remprop', `getf', `remf'
+* Property Lists:: `remprop', `getf', `remf'
* Creating Symbols:: `gensym', `gentemp'
@end menu
There are also functions for working with property lists as
first-class data structures not attached to particular symbols.
-@defun get* symbol property &optional default
-This function is like @code{get}, except that if the property is
-not found, the @var{default} argument provides the return value.
-(The Emacs Lisp @code{get} function always uses @code{nil} as
-the default; this package's @code{get*} is equivalent to Common
-Lisp's @code{get}.)
-
-The @code{get*} function is @code{setf}-able; when used in this
-fashion, the @var{default} argument is allowed but ignored.
-@end defun
-
@defun remprop symbol property
This function removes the entry for @var{property} from the property
list of @var{symbol}. It returns a true value if the property was
(put sym prop val) @equiv{} (setf (getf (symbol-plist sym) prop) val)
@end example
-The @code{get} and @code{get*} functions are also @code{setf}-able.
-The fact that @code{default} is ignored can sometimes be useful:
+The @code{get} function is also @code{setf}-able. The fact that
+@code{default} is ignored can sometimes be useful:
@example
-(incf (get* 'foo 'usage-count 0))
+(incf (get 'foo 'usage-count 0))
@end example
Here, symbol @code{foo}'s @code{usage-count} property is incremented
does not already exist, a new entry is added to the table and the
table is reallocated to a larger size if necessary. The @var{default}
argument is allowed but ignored in this case. The situation is
-exactly analogous to that of @code{get*}; @pxref{Property Lists}.
+exactly analogous to that of @code{get}; @pxref{Property Lists}.
@end defun
@defun remhash key table
Firstly, Elisp is an interpreted language, and this has serious speed
implications. Like all other interpreted languages (like Java), Elisp
is often suitable only for certain types of application or extension.
-So although Elisp is a general purpose language, and very ligh level,
+So although Elisp is a general purpose language, and very high level,
there are times when it is desirable to descend to a lower level compiled
language for speed purposes.
@ifinfo
@dircategory XEmacs Editor
@direntry
-* Internals: (internals). XEmacs Internals Manual.
+* Internals: (internals). XEmacs Internals Manual.
@end direntry
Copyright @copyright{} 1992 - 1996 Ben Wing.
displayable representations, and XEmacs provides a function
@code{redisplay()} that ensures that the display of all such objects
matches their internal state. Most of the time, a standard Lisp
-environment is in a @dfn{read-eval-print} loop -- i.e. ``read some Lisp
+environment is in a @dfn{read-eval-print} loop---i.e. ``read some Lisp
code, execute it, and print the results''. XEmacs has a similar loop:
@itemize @bullet
executed; this prints out the error and continues.) Routines can also
specify cleanup code (called an @dfn{unwind-protect}) that will be
called when control exits from a block of code, no matter how that exit
-occurs -- i.e. even if a function deeply nested below it causes a
+occurs---i.e. even if a function deeply nested below it causes a
non-local exit back to the top level.
Note that this facility has appeared in some recent vintages of C, in
you declared. This is actually considered a bug in Emacs Lisp and in
all other early dialects of Lisp, and was corrected in Common Lisp. (In
Common Lisp, you can still declare dynamically scoped variables if you
-want to -- they are sometimes useful -- but variables by default are
+want to---they are sometimes useful---but variables by default are
@dfn{lexically scoped} as in C.)
@end enumerate
An object representing a single character of text; chars behave like
integers in many ways but are logically considered text rather than
numbers and have a different read syntax. (the read syntax for a char
-contains the char itself or some textual encoding of it -- for example,
+contains the char itself or some textual encoding of it---for example,
a Japanese Kanji character might be encoded as @samp{^[$(B#&^[(B} using the
-ISO-2022 encoding standard -- rather than the numerical representation
+ISO-2022 encoding standard---rather than the numerical representation
of the char; this way, if the mapping between chars and integers
changes, which is quite possible for Kanji characters and other extended
characters, the same character will still be created. Note that some
others, the lower 28 bits contain a pointer. The mark bit is used
during garbage-collection, and is always 0 when garbage collection is
not happening. (The way that garbage collection works, basically, is that it
-loops over all places where Lisp objects could exist -- this includes
+loops over all places where Lisp objects could exist---this includes
all global variables in C that contain Lisp objects [including
@code{Vobarray}, the C equivalent of @code{obarray}; through this, all
-Lisp variables will get marked], plus various other places -- and
+Lisp variables will get marked], plus various other places---and
recursively scans through the Lisp objects, marking each object it finds
by setting the mark bit. Then it goes through the lists of all objects
allocated, freeing the ones that are not marked and turning off the mark
@code{EXPLICIT_SIGN_EXTEND}.
Note that when @code{ERROR_CHECK_TYPECHECK} is defined, the extractor
-macros become more complicated -- they check the tag bits and/or the
+macros become more complicated---they check the tag bits and/or the
type field in the first four bytes of a record type to ensure that the
object is really of the correct type. This is great for catching places
-where an incorrect type is being dereferenced -- this typically results
+where an incorrect type is being dereferenced---this typically results
in a pointer being dereferenced as the wrong type of structure, with
unpredictable (and sometimes not easily traceable) results.
system header files) to ensure that certain tricks played by various
@file{s/} and @file{m/} files work out correctly.
+When including header files, always use angle brackets, not double
+quotes, except when the file to be included is in the same directory as
+the including file. If either file is a generated file, then that is
+not likely to be the case. In order to understand why we have this
+rule, imagine what happens when you do a build in the source directory
+using @samp{./configure} and another build in another directory using
+@samp{../work/configure}. There will be two different @file{config.h}
+files. Which one will be used if you @samp{#include "config.h"}?
+
@strong{All global and static variables that are to be modifiable must
be declared uninitialized.} This means that you may not use the
``declare with initializer'' form for these variables, such as @code{int
segment in the dumped executable. This allows this memory to be shared
among multiple running XEmacs processes. XEmacs is careful to place as
much constant data as possible into initialized variables (in
-particular, into what's called the @dfn{pure space} -- see below) during
+particular, into what's called the @dfn{pure space}---see below) during
the @file{temacs} phase.
@cindex copy-on-write
macro style is:
@example
-#define FOO(var, value) do @{ \
- Lisp_Object FOO_value = (value); \
- ... /* compute using FOO_value */ \
- (var) = bar; \
+#define FOO(var, value) do @{ \
+ Lisp_Object FOO_value = (value); \
+ ... /* compute using FOO_value */ \
+ (var) = bar; \
@} while (0)
@end example
typedefs section as necessary.
@file{lrecord.h} contains the basic structures and macros that implement
-all record-type Lisp objects -- i.e. all objects whose type is a field
+all record-type Lisp objects---i.e. all objects whose type is a field
in their C structure, which includes all objects except the few most
basic ones.
type-specific methods. This scheme is a fundamental principle of
object-oriented programming and is heavily used throughout XEmacs. The
great advantage of this is that it allows for a clean separation of
-functionality into different modules -- new classes of Lisp objects, new
+functionality into different modules---new classes of Lisp objects, new
event interfaces, new device types, new stream interfaces, etc. can be
added transparently without affecting code anywhere else in XEmacs.
Because the different subsystems are divided into general and specific
@file{symbols.c} implements the handling of symbols, obarrays, and
retrieving the values of symbols. Much of the code is devoted to
handling the special @dfn{symbol-value-magic} objects that define
-special types of variables -- this includes buffer-local variables,
+special types of variables---this includes buffer-local variables,
variable aliases, variables that forward into C variables, etc. This
module is initialized extremely early (right after @file{alloc.c}),
because it is here that the basic symbols @code{t} and @code{nil} are
@end example
@file{keyboard.c} contains functions that implement the actual editor
-command loop -- i.e. the event loop that cyclically retrieves and
+command loop---i.e. the event loop that cyclically retrieves and
dispatches events. This code is also rather tricky, just like
@file{event-stream.c}.
font-lock.c
@end example
-This file provides C support for syntax highlighting -- i.e.
+This file provides C support for syntax highlighting---i.e.
highlighting different syntactic constructs of a source file in
different colors, for easy reading. The C support is provided so that
this is fast.
with them, in case the block of memory contains other Lisp objects that
need to be marked for garbage-collection purposes. (If you need other
object methods, such as a finalize method, you should just go ahead and
-create a new Lisp object type -- it's not hard.)
+create a new Lisp object type---it's not hard.)
@dfn{frob blocks}, i.e. large blocks of memory that are subdivided into
individual objects. This saves a lot on malloc overhead, since there
are typically quite a lot of these objects around, and the objects are
-small. (A cons, for example, occupies 8 bytes on 32-bit machines -- 4
+small. (A cons, for example, occupies 8 bytes on 32-bit machines---4
bytes for each of the two objects it contains.) Vectors are individually
@code{malloc()}ed since they are of variable size. (It would be
possible, and desirable, to allocate vectors of certain small sizes out
in the next enclosing stack frame. Each @code{GCPRO}ed thing is an
lvalue, and the @code{struct gcpro} local variable contains a pointer to
this lvalue. This is why things will mess up badly if you don't pair up
-the @code{GCPRO}s and @code{UNGCPRO}s -- you will end up with
+the @code{GCPRO}s and @code{UNGCPRO}s---you will end up with
@code{gcprolist}s containing pointers to @code{struct gcpro}s or local
@code{Lisp_Object} variables in no-longer-active stack frames.
strings}, are all @code{malloc()}ed as their own block. (#### Although it
would make more sense for the threshold for big strings to be somewhat
lower, e.g. 1/2 or 1/4 the size of a string-chars block. It seems that
-this was indeed the case formerly -- indeed, the threshold was set at
-1/8 -- but Mly forgot about this when rewriting things for 19.8.)
+this was indeed the case formerly---indeed, the threshold was set at
+1/8---but Mly forgot about this when rewriting things for 19.8.)
Note also that the string data in string-chars blocks is padded as
necessary so that proper alignment constraints on the @code{struct
nature of the most basic events that are received. Part of the
complex nature of the XEmacs event collection process involves
converting from the operating-system events into the proper
-Emacs events -- there may not be a one-to-one correspondence.
+Emacs events---there may not be a one-to-one correspondence.
Emacs events are documented in @file{events.h}; I'll discuss them
later.
This is documented elsewhere.
The guts of the command loop are in @code{command_loop_1()}. This
-function doesn't catch errors, though -- that's the job of
+function doesn't catch errors, though---that's the job of
@code{command_loop_2()}, which is a condition-case (i.e. error-trapping)
wrapper around @code{command_loop_1()}. @code{command_loop_1()} never
returns, but may get thrown out of.
@deftypefn Macro void Lstream_ungetc (Lstream *@var{stream}, int @var{c})
Push one byte back onto the input queue. This will be the next byte
read from the stream. Any number of bytes can be pushed back and will
-be read in the reverse order they were pushed back -- most recent
-first. (This is necessary for consistency -- if there are a number of
+be read in the reverse order they were pushed back---most recent
+first. (This is necessary for consistency---if there are a number of
bytes that have been unread and I read and unread a byte, it needs to be
the first to be read again.) This is a macro and so it is very
efficient. The @var{c} argument is only evaluated once but the @var{stream}
@deftypefun void Lstream_reopen (Lstream *@var{stream})
Reopen a closed stream. This enables I/O on it again. This is not
meant to be called except from a wrapper routine that reinitializes
-variables and such -- the close routine may well have freed some
+variables and such---the close routine may well have freed some
necessary storage structures, for example.
@end deftypefun
@end deftypefn
@deftypefn {Lstream Method} int seekable_p (Lstream *@var{stream})
-Indicate whether this stream is seekable -- i.e. it can be rewound.
+Indicate whether this stream is seekable---i.e. it can be rewound.
This method is ignored if the stream does not have a rewind method. If
this method is not present, the result is determined by whether a rewind
method is present.
@item
Leaf windows also have markers in their @code{start} (the
first buffer position displayed in the window) and @code{pointm}
-(the window's stashed value of @code{point} -- see above) fields,
+(the window's stashed value of @code{point}---see above) fields,
while combination windows have nil in these fields.
@item
GC purposes.
@item
-Most frames actually have two top-level windows -- one for the
+Most frames actually have two top-level windows---one for the
minibuffer and one (the @dfn{root}) for everything else. The modeline
(if present) separates these two. The @code{next} field of the root
points to the minibuffer, and the @code{prev} field of the minibuffer
is sufficient to always provide the needed information. The second
thing we can do is be smart about invalidating the cache.
- TODO -- Be smart about invalidating the cache. Potential places:
+ TODO---Be smart about invalidating the cache. Potential places:
@itemize @bullet
@item
An extent-info structure consists of a list of the buffer or string's
extents and a @dfn{stack of extents} that lists all of the extents over
a particular position. The stack-of-extents info is used for
-optimization purposes -- it basically caches some info that might
+optimization purposes---it basically caches some info that might
be expensive to compute. Certain otherwise hard computations are easy
given the stack of extents over a particular position, and if the
stack of extents over a nearby position is known (because it was
An extent fragment is a structure that holds data about the run that
contains a particular buffer position (if the buffer position is at the
-junction of two runs, the run after the position is used) -- the
+junction of two runs, the run after the position is used)---the
beginning and end of the run, a list of all of the extents in that run,
the @dfn{merged face} that results from merging all of the faces
corresponding to those extents, the begin and end glyphs at the
Any action on a glyph first consults the cache before actually
instantiating a widget.
-@section Widget-Glyphs in the MS-WIndows Environment
+@section Widget-Glyphs in the MS-Windows Environment
To Do
This function converts a numeric @sc{ascii} value to an event structure,
replete with modifier bits. @var{ch} is the character to convert, and
@var{event} is the event object to fill in. This function contains
-knowledge about what the codes ``mean'' -- for example, the number 9 is
+knowledge about what the codes ``mean''---for example, the number 9 is
converted to the character @key{Tab}, not the distinct character
@key{Control-I}.
@lisp
@group
- (while (progn
- (next-event event)
- (not (or (key-press-event-p event)
- (button-press-event-p event)
- (button-release-event-p event)
- (menu-event-p event))))
- (dispatch-event event))
+ (while (progn
+ (next-event event)
+ (not (or (key-press-event-p event)
+ (button-press-event-p event)
+ (button-release-event-p event)
+ (menu-event-p event))))
+ (dispatch-event event))
@end group
@end lisp
A @dfn{console} is an object representing a single input connection
to XEmacs, such as an X display or a TTY connection. It is possible
for XEmacs to have frames on multiple consoles at once (even on
-heterogeneous types -- you can simultaneously have a frame on an
+heterogeneous types---you can simultaneously have a frame on an
X display and a TTY connection). Normally, there is only one
console in existence.
(defcustom show-paren-mode nil
"Toggle Show Paren mode@enddots{}"
:set (lambda (symbol value)
- (show-paren-mode (or value 0)))
+ (show-paren-mode (or value 0)))
:initialize 'custom-initialize-default
:type 'boolean
:group 'paren-showing
The syntax, more precisely:
@example
- form := <something to pass to `eval'>
- command := <a symbol or string, to pass to `call-interactively'>
- callback := command | form
- active-p := <t, nil, or a form to evaluate to decide whether this
- button should be selectable>
- name := <string>
- partition := 'nil'
- button := '[' name callback active-p ']'
- dialog := '(' name [ button ]+ [ partition [ button ]+ ] ')'
+ form := <something to pass to `eval'>
+ command := <a symbol or string, to pass to `call-interactively'>
+ callback := command | form
+ active-p := <t, nil, or a form to evaluate to decide whether this
+ button should be selectable>
+ name := <string>
+ partition := 'nil'
+ button := '[' name callback active-p ']'
+ dialog := '(' name [ button ]+ [ partition [ button ]+ ] ')'
@end example
@node Dialog Box Functions
The following low-level functions are provided for explicitly
traversing the extents in a buffer according to the display order.
-These functions are mostly intended for debugging -- in normal
+These functions are mostly intended for debugging---in normal
operation, you should probably use @code{mapcar-extents} or
@code{map-extents}, or loop using the @var{before} argument to
@code{extent-at}, rather than creating a loop using @code{next-extent}.
It is possible for an extent's parent to itself have a parent,
and so on. Through this, a whole tree of extents can be created,
all deriving their properties from one root extent. Note, however,
-that you cannot create an inheritance loop -- this is explicitly
+that you cannot create an inheritance loop---this is explicitly
disallowed.
Parent extents are used to implement the extents over the modeline.
specifier.
@end defun
+@defun remove-face-property face property &optional local tag-set exact-p
+This function removes a property of a @var{face}.
+
+For built-in properties, this is analogous to @code{remove-specifier}.
+For more information, @xref{Other Specification Functions}.
+
+When @var{property} is not a built-in property, this function will just
+remove its value if @var{locale} is @code{nil} or @code{all}. However,
+if @var{locale} is other than that, this function will attempt to remove
+@var{value} as the instantiator for the given @var{locale} with
+@code{remove-specifier}. If the value of the property is not a
+specifier, it will be converted into a @code{generic} specifier
+automatically.
+@end defun
+
@defun face-property face property &optional locale
This function returns @var{face}'s value of the given @var{property}.
Image instantiators come in many formats: @code{xbm}, @code{xpm},
@code{gif}, @code{jpeg}, etc. This describes the format of the data
describing the image. The resulting image instances also come in many
-types -- @code{mono-pixmap}, @code{color-pixmap}, @code{text},
+types---@code{mono-pixmap}, @code{color-pixmap}, @code{text},
@code{pointer}, etc. This refers to the behavior of the image and the
sorts of places it can appear. (For example, a color-pixmap image has
fixed colors specified for it, while a mono-pixmap image comes in two
That is, the @kbd{A} keystroke is represented by all of these forms:
@example
- A ?A 65 (A) (?A) (65)
- [A] [?A] [65] [(A)] [(?A)] [(65)]
+ A ?A 65 (A) (?A) (65)
+ [A] [?A] [65] [(A)] [(?A)] [(65)]
@end example
-
+
the @kbd{control-a} keystroke is represented by these forms:
@example
- (control A) (control ?A) (control 65)
- [(control A)] [(control ?A)] [(control 65)]
+ (control A) (control ?A) (control 65)
+ [(control A)] [(control ?A)] [(control 65)]
@end example
the key sequence @kbd{control-c control-a} is represented by these
forms:
@example
- [(control c) (control a)] [(control ?c) (control ?a)]
- [(control 99) (control 65)] etc.
+ [(control c) (control a)] [(control ?c) (control ?a)]
+ [(control 99) (control 65)] etc.
@end example
Mouse button clicks work just like keypresses: @code{(control
pairs:
@example
- control h backspace
- control i tab
- control m return
- control j linefeed
- control [ escape
- control @@ control space
+ control h backspace
+ control i tab
+ control m return
+ control j linefeed
+ control [ escape
+ control @@ control space
@end example
After binding a command to two key sequences with a form like
@example
- (define-key global-map "\^X\^I" 'command-1)
+ (define-key global-map "\^X\^I" 'command-1)
@end example
@noindent
it is possible to redefine only one of those sequences like so:
@example
- (define-key global-map [(control x) (control i)] 'command-2)
- (define-key global-map [(control x) tab] 'command-3)
+ (define-key global-map [(control x) (control i)] 'command-2)
+ (define-key global-map [(control x) tab] 'command-3)
@end example
Of course, all of this applies only when running under a window
@result{} #<keymap lisp-interaction-mode-map 5 entries 0x558>
(describe-bindings-internal (current-local-map))
@result{} ; @r{Inserted into the buffer:}
-backspace backward-delete-char-untabify
-linefeed eval-print-last-sexp
-delete delete-char
-C-j eval-print-last-sexp
-C-x << Prefix Command >>
-M-tab lisp-complete-symbol
-M-; lisp-indent-for-comment
-M-C-i lisp-complete-symbol
-M-C-q indent-sexp
-M-C-x eval-defun
-Alt-backspace backward-kill-sexp
-Alt-delete kill-sexp
+backspace backward-delete-char-untabify
+linefeed eval-print-last-sexp
+delete delete-char
+C-j eval-print-last-sexp
+C-x << Prefix Command >>
+M-tab lisp-complete-symbol
+M-; lisp-indent-for-comment
+M-C-i lisp-complete-symbol
+M-C-q indent-sexp
+M-C-x eval-defun
+Alt-backspace backward-kill-sexp
+Alt-delete kill-sexp
@end group
@group
-C-x x edebug-defun
+C-x x edebug-defun
@end group
@end example
@end defun
* Buffer Type:: The basic object of editing.
* Window Type:: What makes buffers visible.
-* Window Configuration Type::Save what the screen looks like.
+* Window Configuration Type:: Save what the screen looks like.
* Marker Type:: A position in a buffer.
* Process Type:: A process running on the underlying OS.
* Stream Type:: Receive or send characters.
Strings and Characters
-* Basics: String Basics. Basic properties of strings and characters.
+* String Basics:: Basic properties of strings and characters.
* Predicates for Strings:: Testing whether an object is a string or char.
* Creating Strings:: Functions to allocate new strings.
* Predicates for Characters:: Testing whether an object is a character.
@defun remassoc key alist
This function deletes by side effect any associations with key @var{key}
-in @var{alist} -- i.e. it removes any elements from @var{alist} whose
+in @var{alist}---i.e. it removes any elements from @var{alist} whose
@code{car} is @code{equal} to @var{key}. The modified @var{alist} is
returned.
@defun remassq key alist
This function deletes by side effect any associations with key @var{key}
-in @var{alist} -- i.e. it removes any elements from @var{alist} whose
+in @var{alist}---i.e. it removes any elements from @var{alist} whose
@code{car} is @code{eq} to @var{key}. The modified @var{alist} is
returned.
@defun remrassoc value alist
This function deletes by side effect any associations with value @var{value}
-in @var{alist} -- i.e. it removes any elements from @var{alist} whose
+in @var{alist}---i.e. it removes any elements from @var{alist} whose
@code{cdr} is @code{equal} to @var{value}. The modified @var{alist} is
returned.
@defun remrassq value alist
This function deletes by side effect any associations with value @var{value}
-in @var{alist} -- i.e. it removes any elements from @var{alist} whose
+in @var{alist}---i.e. it removes any elements from @var{alist} whose
@code{cdr} is @code{eq} to @var{value}. The modified @var{alist} is
returned.
done with the elements, they will automatically disappear from the list.
Weak lists are used internally, for example, to manage the list holding
-the children of an extent -- an extent that is unused but has a parent
+the children of an extent---an extent that is unused but has a parent
will still be reclaimed, and will automatically be removed from its
parent's list of children.
When @code{zmacs-regions} is non-@code{nil} (this is the default), the
concept of an @dfn{active region} exists. The region is active when the
corresponding mark is active. Note that only one active region at a
-time can exist -- i.e. only one buffer's region is active at a time.
+time can exist---i.e. only one buffer's region is active at a time.
@xref{The Mark}, for more information about active regions.
@defopt zmacs-regions
@cindex menu
@menu
-* Menu Format:: Format of a menu description.
-* Menubar Format:: How to specify a menubar.
-* Menubar:: Functions for controlling the menubar.
-* Modifying Menus:: Modifying a menu description.
-* Pop-Up Menus:: Functions for specifying pop-up menus.
-* Menu Filters:: Filter functions for the default menubar.
-* Menu Accelerators:: Using and controlling menu accelerator keys
-* Buffers Menu:: The menu that displays the list of buffers.
+* Menu Format:: Format of a menu description.
+* Menubar Format:: How to specify a menubar.
+* Menubar:: Functions for controlling the menubar.
+* Modifying Menus:: Modifying a menu description.
+* Pop-Up Menus:: Functions for specifying pop-up menus.
+* Menu Filters:: Filter functions for the default menubar.
+* Menu Accelerators:: Using and controlling menu accelerator keys
+* Buffers Menu:: The menu that displays the list of buffers.
@end menu
@node Menu Format
@example
("File"
- :filter file-menu-filter ; file-menu-filter is a function that takes
- ; one argument (a list of menu items) and
- ; returns a list of menu items
+ :filter file-menu-filter ; file-menu-filter is a function that takes
+ ; one argument (a list of menu items) and
+ ; returns a list of menu items
[ "Save As..." write-file]
[ "Revert Buffer" revert-buffer :active (buffer-modified-p) ]
[ "Read Only" toggle-read-only :style toggle :selected buffer-read-only ]
activate that item.
@menu
-* Creating Menu Accelerators:: How to add accelerator keys to a menu.
-* Keyboard Menu Traversal:: How to use and modify the keys which are used
- to traverse the menu structure.
-* Menu Accelerator Functions:: Functions for working with menu accelerators.
+* Creating Menu Accelerators:: How to add accelerator keys to a menu.
+* Keyboard Menu Traversal:: How to use and modify the keys which are used
+ to traverse the menu structure.
+* Menu Accelerator Functions:: Functions for working with menu accelerators.
@end menu
@node Creating Menu Accelerators
@example
(add-submenu nil '("%_Test"
- ["One" (insert "1") :accelerator ?1 :active t]
- ["%_Two" (insert "2")]
- ["%_3" (insert "3")]))
+ ["One" (insert "1") :accelerator ?1 :active t]
+ ["%_Two" (insert "2")]
+ ["%_3" (insert "3")]))
@end example
will add a new menu to the top level menubar. The new menu can be reached
(setq menu-accelerator-modifiers '(meta control))
(setq menu-accelerator-enabled 'menu-force)
(add-submenu nil '("%_Test"
- ["One" (insert "1") :accelerator ?1 :active t]
- ["%_Two" (insert "2")]
- ["%_3" (insert "3")]))
+ ["One" (insert "1") :accelerator ?1 :active t]
+ ["%_Two" (insert "2")]
+ ["%_3" (insert "3")]))
@end example
will add the menu "Test" to the top level menubar. Pressing C-x followed by
In some cases, the differences will be significant enough that it is
actually possible to identify two or more distinct shapes that both
represent the same character. For example, the lowercase letters
-@samp{a} and @samp{g} each have two distinct possible shapes -- the
+@samp{a} and @samp{g} each have two distinct possible shapes---the
@samp{a} can optionally have a curved tail projecting off the top, and
the @samp{g} can be formed either of two loops, or of one loop and a
tail hanging off the bottom. Such distinct possible shapes of a
glyphs making up the same character is that the choice between one or
the other is purely stylistic and has no linguistic effect on a word
(this is the reason why a capital @samp{A} and lowercase @samp{a}
-are different characters rather than different glyphs -- e.g.
+are different characters rather than different glyphs---e.g.
@samp{Aspen} is a city while @samp{aspen} is a kind of tree).
Note that @dfn{character} and @dfn{glyph} are used differently
numbers before letters, etc. Note that for many of the Asian character
sets, there is no natural ordering of the characters. The actual
orderings are based on one or more salient characteristic, of which
-there are many to choose from -- e.g. number of strokes, common
+there are many to choose from---e.g. number of strokes, common
radicals, phonetic ordering, etc.
The set of numbers assigned to any particular character are called
not understand the difference between a character set and an encoding.)
This is not possible, however, if more than one character set is to be
used in the encoding. For example, printed Japanese text typically
-requires characters from multiple character sets -- ASCII, JISX0208, and
+requires characters from multiple character sets---ASCII, JISX0208, and
JISX0212, to be specific. Each of these is indexed using one or more
position codes in the range 33 through 126, so the position codes could
not be used directly or there would be no way to tell which character
-was meant. Different Japanese encodings handle this differently -- JIS
+was meant. Different Japanese encodings handle this differently---JIS
uses special escape characters to denote different character sets; EUC
sets the high bit of the position codes for JISX0208 and JISX0212, and
puts a special extra byte before each JISX0212 character; etc. (JIS,
@end defun
@defun charset-direction charset
-This function returns the display direction of @var{charset} -- either
+This function returns the display direction of @var{charset}---either
@code{l2r} or @code{r2l}.
@end defun
@example
@group
- C0: 0x00 - 0x1F
- GL: 0x20 - 0x7F
- C1: 0x80 - 0x9F
- GR: 0xA0 - 0xFF
+ C0: 0x00 - 0x1F
+ GL: 0x20 - 0x7F
+ C1: 0x80 - 0x9F
+ GR: 0xA0 - 0xFF
@end group
@end example
Charset designation is done by escape sequences of the form:
@example
- ESC [@var{I}] @var{I} @var{F}
+ ESC [@var{I}] @var{I} @var{F}
@end example
where @var{I} is an intermediate character in the range 0x20 - 0x2F, and
@example
@group
- $ [0x24]: indicate charset of dimension 2 (94x94 or 96x96).
- ( [0x28]: designate to G0 a 94-charset whose final byte is @var{F}.
- ) [0x29]: designate to G1 a 94-charset whose final byte is @var{F}.
- * [0x2A]: designate to G2 a 94-charset whose final byte is @var{F}.
- + [0x2B]: designate to G3 a 94-charset whose final byte is @var{F}.
- - [0x2D]: designate to G1 a 96-charset whose final byte is @var{F}.
- . [0x2E]: designate to G2 a 96-charset whose final byte is @var{F}.
- / [0x2F]: designate to G3 a 96-charset whose final byte is @var{F}.
+ $ [0x24]: indicate charset of dimension 2 (94x94 or 96x96).
+ ( [0x28]: designate to G0 a 94-charset whose final byte is @var{F}.
+ ) [0x29]: designate to G1 a 94-charset whose final byte is @var{F}.
+ * [0x2A]: designate to G2 a 94-charset whose final byte is @var{F}.
+ + [0x2B]: designate to G3 a 94-charset whose final byte is @var{F}.
+ - [0x2D]: designate to G1 a 96-charset whose final byte is @var{F}.
+ . [0x2E]: designate to G2 a 96-charset whose final byte is @var{F}.
+ / [0x2F]: designate to G3 a 96-charset whose final byte is @var{F}.
@end group
@end example
The following rule is not allowed in ISO 2022 but can be used in Mule.
@example
- , [0x2C]: designate to G0 a 96-charset whose final byte is @var{F}.
+ , [0x2C]: designate to G0 a 96-charset whose final byte is @var{F}.
@end example
Here are examples of designations:
@example
@group
- ESC ( B : designate to G0 ASCII
- ESC - A : designate to G1 Latin-1
- ESC $ ( A or ESC $ A : designate to G0 GB2312
- ESC $ ( B or ESC $ B : designate to G0 JISX0208
- ESC $ ) C : designate to G1 KSC5601
+ ESC ( B : designate to G0 ASCII
+ ESC - A : designate to G1 Latin-1
+ ESC $ ( A or ESC $ A : designate to G0 GB2312
+ ESC $ ( B or ESC $ B : designate to G0 JISX0208
+ ESC $ ) C : designate to G1 KSC5601
@end group
@end example
Locking Shift is done as follows:
@example
- LS0 or SI (0x0F): invoke G0 into GL
- LS1 or SO (0x0E): invoke G1 into GL
- LS2: invoke G2 into GL
- LS3: invoke G3 into GL
- LS1R: invoke G1 into GR
- LS2R: invoke G2 into GR
- LS3R: invoke G3 into GR
+ LS0 or SI (0x0F): invoke G0 into GL
+ LS1 or SO (0x0E): invoke G1 into GL
+ LS2: invoke G2 into GL
+ LS3: invoke G3 into GL
+ LS1R: invoke G1 into GR
+ LS2R: invoke G2 into GR
+ LS3R: invoke G3 into GR
@end example
Single Shift is done as follows:
@example
@group
- SS2 or ESC N: invoke G2 into GL
- SS3 or ESC O: invoke G3 into GL
+ SS2 or ESC N: invoke G2 into GL
+ SS3 or ESC O: invoke G3 into GL
@end group
@end example
@example
@group
junet -- Coding system used in JUNET.
- 1. G0 <- ASCII, G1..3 <- never used
- 2. Yes.
- 3. Yes.
- 4. Yes.
- 5. 7-bit environment
- 6. No.
- 7. Use ASCII
- 8. Use JISX0208-1983
+ 1. G0 <- ASCII, G1..3 <- never used
+ 2. Yes.
+ 3. Yes.
+ 4. Yes.
+ 5. 7-bit environment
+ 6. No.
+ 7. Use ASCII
+ 8. Use JISX0208-1983
@end group
@group
ctext -- Compound Text
- 1. G0 <- ASCII, G1 <- Latin-1, G2,3 <- never used
- 2. No.
- 3. No.
- 4. Yes.
- 5. 8-bit environment
- 6. No.
- 7. Use ASCII
- 8. Use JISX0208-1983
+ 1. G0 <- ASCII, G1 <- Latin-1, G2,3 <- never used
+ 2. No.
+ 3. No.
+ 4. Yes.
+ 5. 8-bit environment
+ 6. No.
+ 7. Use ASCII
+ 8. Use JISX0208-1983
@end group
@group
euc-china -- Chinese EUC. Although many people call this
as "GB encoding", the name may cause misunderstanding.
- 1. G0 <- ASCII, G1 <- GB2312, G2,3 <- never used
- 2. No.
- 3. Yes.
- 4. Yes.
- 5. 8-bit environment
- 6. No.
- 7. Use ASCII
- 8. Use JISX0208-1983
+ 1. G0 <- ASCII, G1 <- GB2312, G2,3 <- never used
+ 2. No.
+ 3. Yes.
+ 4. Yes.
+ 5. 8-bit environment
+ 6. No.
+ 7. Use ASCII
+ 8. Use JISX0208-1983
@end group
@group
korean-mail -- Coding system used in Korean network.
- 1. G0 <- ASCII, G1 <- KSC5601, G2,3 <- never used
- 2. No.
- 3. Yes.
- 4. Yes.
- 5. 7-bit environment
- 6. Yes.
- 7. No.
- 8. No.
+ 1. G0 <- ASCII, G1 <- KSC5601, G2,3 <- never used
+ 2. No.
+ 3. Yes.
+ 4. Yes.
+ 5. 7-bit environment
+ 6. Yes.
+ 7. No.
+ 8. No.
@end group
@end example
For example, many ISO-2022-compliant coding systems (such as Compound
Text, which is used for inter-client data under the X Window System) use
-escape sequences to switch between different charsets -- Japanese Kanji,
+escape sequences to switch between different charsets---Japanese Kanji,
for example, is invoked with @samp{ESC $ ( B}; ASCII is invoked with
@samp{ESC ( B}; and Cyrillic is invoked with @samp{ESC - L}. See
@code{make-coding-system} for more information.
A category table is a type of char table used for keeping track of
categories. Categories are used for classifying characters for use in
-regexps -- you can refer to a category rather than having to use a
+regexps---you can refer to a category rather than having to use a
complicated [] expression (and category lookups are significantly
faster).
are integers are the same. Byte code compiled under any version 19
Emacs will have all such functions mapped to their @code{old-} equivalents
when the byte code is read into XEmacs 20. This is to preserve
-compatibility -- Emacs 19 converts all constant characters to the equivalent
+compatibility---Emacs 19 converts all constant characters to the equivalent
integer during byte-compilation, and thus there is no other way to preserve
byte-code compatibility even if the code has specifically been written
with the distinction between characters and integers in mind.
code}. For example, the character @kbd{A} is represented as the
@w{integer 65}, following the standard @sc{ascii} representation of
characters. If XEmacs was not compiled with @sc{mule} support, the
-range of this integer will always be 0 to 255 -- eight bits, or one
+range of this integer will always be 0 to 255---eight bits, or one
byte. (Integers outside this range are accepted but silently truncated;
however, you should most decidedly @emph{not} rely on this, because it
will not work under XEmacs with @sc{mule} support.) When @sc{mule}
@end defun
@menu
-* Introduction to Specifiers:: Specifiers provide a clean way for
- display and other properties to vary
- (under user control) in a wide variety
- of contexts.
-* Specifiers In-Depth:: Gory details about specifier innards.
-* Specifier Instancing:: Instancing means obtaining the ``value'' of
- a specifier in a particular context.
-* Specifier Types:: Specifiers come in different flavors.
-* Adding Specifications:: Specifications control a specifier's ``value''
- by giving conditions under which a
- particular value is valid.
-* Retrieving Specifications:: Querying a specifier's specifications.
-* Specifier Tag Functions:: Working with specifier tags.
+* Introduction to Specifiers:: Specifiers provide a clean way for
+ display and other properties to vary
+ (under user control) in a wide variety
+ of contexts.
+* Specifiers In-Depth:: Gory details about specifier innards.
+* Specifier Instancing:: Instancing means obtaining the ``value'' of
+ a specifier in a particular context.
+* Specifier Types:: Specifiers come in different flavors.
+* Adding Specifications:: Specifications control a specifier's ``value''
+ by giving conditions under which a
+ particular value is valid.
+* Retrieving Specifications:: Querying a specifier's specifications.
+* Specifier Tag Functions:: Working with specifier tags.
* Specifier Instancing Functions::
- Functions to instance a specifier.
-* Specifier Example:: Making all this stuff clearer.
-* Creating Specifiers:: Creating specifiers for your own use.
+ Functions to instance a specifier.
+* Specifier Example:: Making all this stuff clearer.
+* Creating Specifiers:: Creating specifiers for your own use.
* Specifier Validation Functions::
- Validating the components of a specifier.
+ Validating the components of a specifier.
* Other Specification Functions::
- Other ways of working with specifications.
+ Other ways of working with specifications.
@end menu
@node Introduction to Specifiers
User-defined tags may be defined, with an optional predicate specified.
An application can create its own tag, use it to mark all its
instantiators, and be fairly confident that it will not interfere with
-other applications that modify the same specifier -- Functions that add
+other applications that modify the same specifier---Functions that add
a specification to a specifier usually only overwrite existing
inst-pairs with the same tag set as was given, and a particular tag or
tag set can be specified when removing instantiators.
different font names, with possibly different foundries, widths, etc.,
on different devices), the extra properties of that font on that
device, etc. Furthermore, this conversion (called @dfn{instantiation})
-might fail -- a font or color might not exist on a particular device,
+might fail---a font or color might not exist on a particular device,
for example.
@node Specifier Instancing
@result{} ((#<buffer "device.c"> (nil . "forest green"))
(#<window on "Makefile" 0x8a2b> (nil . "hot pink"))
(#<x-frame "emacs" 0x4ac> (nil . "puke orange")
- (nil . "moccasin"))
+ (nil . "moccasin"))
(#<x-frame "VM" 0x4ac> (nil . "magenta"))
- (global ((tty) . "cyan") (nil . "white"))
+ (global ((tty) . "cyan") (nil . "white"))
)
@end example
@enumerate
@item
First, we look for a specification matching the buffer displayed in the
-window, i.e. @samp{*scratch}. There are none, so we proceed.
+window, i.e. @samp{*scratch*}. There are none, so we proceed.
@item
Then, we look for a specification matching the window itself. Again, there
are none.
Lisp programs use strings more often than individual characters.
@menu
-* Basics: String Basics. Basic properties of strings and characters.
+* String Basics:: Basic properties of strings and characters.
* Predicates for Strings:: Testing whether an object is a string or char.
* Creating Strings:: Functions to allocate new strings.
* Predicates for Characters:: Testing whether an object is a character.
@section Toolbar Intro
A @dfn{toolbar} is a bar of icons displayed along one edge of a frame.
-You can view a toolbar as a series of menu shortcuts -- the most
+You can view a toolbar as a series of menu shortcuts---the most
common menu options can be accessed with a single click rather than
a series of clicks and/or drags to select the option from a menu.
Consistent with this, a help string (called the @dfn{help-echo})
buffer does not specify a left toolbar or has a nil value specified for
@code{left-toolbar-visible-p}), you will find that, when that buffer is
displayed in the selected window, the window will have a width of 86 or
-87 characters -- the frame is sized for a 68-pixel left toolbar but the
+87 characters---the frame is sized for a 68-pixel left toolbar but the
selected window specifies that the left toolbar is not visible, so it is
expanded to take up the slack.
Send a reply to this message. The second argument can be @code{reply},
@code{reject} or @code{fail}; the default is @code{reply}. Before
sending a reply, all message arguments whose mode is @code{TT_INOUT} or
-@code{TT_OUT} should have been filled in -- see
+@code{TT_OUT} should have been filled in---see
@code{set-tooltalk-message-attribute}.
@refill
@end defun
generalize well, and they are covered specially here.
@menu
-* X Selections:: Transferring text to and from other X clients.
-* X Server:: Information about the X server connected to
- a particular device.
+* X Selections:: Transferring text to and from other X clients.
+* X Server:: Information about the X server connected to
+ a particular device.
* X Miscellaneous:: Other X-specific functions and variables.
@end menu
the X server XEmacs is using.
@menu
-* Resources:: Getting resource values from the server.
-* Server Data:: Getting info about the X server.
-* Grabs:: Restricting access to the server by other apps.
+* Resources:: Getting resource values from the server.
+* Server Data:: Getting info about the X server.
+* Grabs:: Restricting access to the server by other apps.
@end menu
@node Resources
@example
@code{XrmGetResource (db, "xemacs.buffer.@var{buffer-name}.foreground",
- "Emacs.EmacsLocaleType.EmacsBuffer.Foreground",
- "String");}
+ "Emacs.EmacsLocaleType.EmacsBuffer.Foreground",
+ "String");}
@end example
@item
@example
@code{XrmGetResource (db, "xemacs.frame.@var{frame-name}.foreground",
- "Emacs.EmacsLocaleType.EmacsFrame.Foreground",
- "String");}
+ "Emacs.EmacsLocaleType.EmacsFrame.Foreground",
+ "String");}
@end example
@item
@example
@code{XrmGetResource (db, "xemacs.device.@var{device-name}.foreground",
- "Emacs.EmacsLocaleType.EmacsDevice.Foreground",
- "String");}
+ "Emacs.EmacsLocaleType.EmacsDevice.Foreground",
+ "String");}
@end example
@item
@example
@code{XrmGetResource (db, "xemacs.foreground",
- "Emacs.Foreground",
- "String");}
+ "Emacs.Foreground",
+ "String");}
@end example
@end enumerate
@defun x-grab-keyboard &optional device
This function grabs the keyboard on the given device (defaulting to the
selected one). So long as the keyboard is grabbed, all keyboard events
-will be delivered to XEmacs -- it is not possible for other X clients to
+will be delivered to XEmacs---it is not possible for other X clients to
eavesdrop on them. Ungrab the keyboard with @code{x-ungrab-keyboard}
(use an @code{unwind-protect}). Returns @code{t} if the grab was
successful; @code{nil} otherwise.
(add-hook 'texinfo-mode-hook 'turn-on-font-lock)
;;; enables the font-lock mode in C Mode
-(add-hook 'c-mode-hook 'turn-on-font-lock)
+(add-hook 'c-mode-hook 'turn-on-font-lock)
@end example
To turn on the font-lock mode in other Major Modes like emacs-lisp, just
of your list will contain:
@example
-C-c C-c n texinfo-insert-@@node
-C-c C-c o texinfo-insert-@@noindent
-C-c C-c s texinfo-insert-@@samp
-C-c C-c t texinfo-insert-@@table
-C-c C-c v texinfo-insert-@@var
-C-c C-c x texinfo-insert-@@example
-C-c C-c @{ texinfo-insert-braces
+C-c C-c n texinfo-insert-@@node
+C-c C-c o texinfo-insert-@@noindent
+C-c C-c s texinfo-insert-@@samp
+C-c C-c t texinfo-insert-@@table
+C-c C-c v texinfo-insert-@@var
+C-c C-c x texinfo-insert-@@example
+C-c C-c @{ texinfo-insert-braces
@end example
@noindent
These keybindings apply only to "Texinfo" mode. @xref{Modes}, for more
the major mode is c-mode.
@example
-(add-hook 'c-mode-hook 'turn-on-font-lock)
+(add-hook 'c-mode-hook 'turn-on-font-lock)
@end example
@noindent
@ifinfo
@dircategory XEmacs Editor
@direntry
-* Widgets: (widget). The Emacs Widget Library.
+* Widgets: (widget). The Emacs Widget Library.
@end direntry
@end ifinfo
(make-local-variable 'widget-example-repeat)
(widget-insert "Here is some documentation.\n\nName: ")
(widget-create 'editable-field
- :size 13
- "My Name")
+ :size 13
+ "My Name")
(widget-create 'menu-choice
- :tag "Choose"
- :value "This"
- :help-echo "Choose me, please!"
- :notify (lambda (widget &rest ignore)
- (message "%s is a good choice!"
- (widget-value widget)))
- '(item :tag "This option" :value "This")
- '(choice-item "That option")
- '(editable-field :menu-tag "No option" "Thus option"))
+ :tag "Choose"
+ :value "This"
+ :help-echo "Choose me, please!"
+ :notify (lambda (widget &rest ignore)
+ (message "%s is a good choice!"
+ (widget-value widget)))
+ '(item :tag "This option" :value "This")
+ '(choice-item "That option")
+ '(editable-field :menu-tag "No option" "Thus option"))
(widget-insert "Address: ")
(widget-create 'editable-field
- "Some Place\nIn some City\nSome country.")
+ "Some Place\nIn some City\nSome country.")
(widget-insert "\nSee also ")
(widget-create 'link
- :notify (lambda (&rest ignore)
- (widget-value-set widget-example-repeat
- '("En" "To" "Tre"))
- (widget-setup))
- "other work")
+ :notify (lambda (&rest ignore)
+ (widget-value-set widget-example-repeat
+ '("En" "To" "Tre"))
+ (widget-setup))
+ "other work")
(widget-insert " for more information.\n\nNumbers: count to three below\n")
(setq widget-example-repeat
- (widget-create 'editable-list
- :entry-format "%i %d %v"
- :notify (lambda (widget &rest ignore)
- (let ((old (widget-get widget
- ':example-length))
- (new (length (widget-value widget))))
- (unless (eq old new)
- (widget-put widget ':example-length new)
- (message "You can count to %d." new))))
- :value '("One" "Eh, two?" "Five!")
- '(editable-field :value "three")))
+ (widget-create 'editable-list
+ :entry-format "%i %d %v"
+ :notify (lambda (widget &rest ignore)
+ (let ((old (widget-get widget
+ ':example-length))
+ (new (length (widget-value widget))))
+ (unless (eq old new)
+ (widget-put widget ':example-length new)
+ (message "You can count to %d." new))))
+ :value '("One" "Eh, two?" "Five!")
+ '(editable-field :value "three")))
(widget-insert "\n\nSelect multiple:\n\n")
(widget-create 'checkbox t)
(widget-insert " This\n")
(widget-create 'checkbox nil)
(widget-insert " That\n")
(widget-create 'checkbox
- :notify (lambda (&rest ignore) (message "Tickle"))
- t)
+ :notify (lambda (&rest ignore) (message "Tickle"))
+ t)
(widget-insert " Thus\n\nSelect one:\n\n")
(widget-create 'radio-button-choice
- :value "One"
- :notify (lambda (widget &rest ignore)
- (message "You selected %s"
- (widget-value widget)))
- '(item "One") '(item "Another One.") '(item "A Final One."))
+ :value "One"
+ :notify (lambda (widget &rest ignore)
+ (message "You selected %s"
+ (widget-value widget)))
+ '(item "One") '(item "Another One.") '(item "A Final One."))
(widget-insert "\n")
(widget-create 'push-button
- :notify (lambda (&rest ignore)
- (if (= (length (widget-value widget-example-repeat))
- 3)
- (message "Congratulation!")
- (error "Three was the count!")))
- "Apply Form")
+ :notify (lambda (&rest ignore)
+ (if (= (length (widget-value widget-example-repeat))
+ 3)
+ (message "Congratulation!")
+ (error "Three was the count!")))
+ "Apply Form")
(widget-insert " ")
(widget-create 'push-button
- :notify (lambda (&rest ignore)
- (widget-example))
- "Reset Form")
+ :notify (lambda (&rest ignore)
+ (widget-example))
+ "Reset Form")
(widget-insert "\n")
(use-local-map widget-keymap)
(widget-setup))
@finalout
@titlepage
@title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2000/01/16 13:41:45 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2000/01/27 17:11:28 $
@sp 1
@author Tony Rossini <rossini@@biostat.washington.edu>
@author Ben Wing <ben@@xemacs.org>
@ifinfo
@dircategory XEmacs Editor
@direntry
-* FAQ: (xemacs-faq). XEmacs FAQ.
+* FAQ: (xemacs-faq). XEmacs FAQ.
@end direntry
@end ifinfo
XEmacs on MS Windows
General Info:
-* Q6.0.1:: What is the status of the XEmacs port to Windows?
-* Q6.0.2:: What flavors of MS Windows are supported?
-* Q6.0.3:: Are binary kits available?
-* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
+* Q6.0.1:: What is the status of the XEmacs port to Windows?
+* Q6.0.2:: What flavors of MS Windows are supported?
+* Q6.0.3:: Are binary kits available?
+* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
Building XEmacs on MS Windows:
-* Q6.1.1:: I decided to run with X. Where do I get an X server?
-* Q6.1.2:: What compiler do I need to compile XEmacs?
-* Q6.1.3:: How do I compile for the native port?
-* Q6.1.4:: How do I compile for the X port?
-* Q6.1.5:: How do I compile for Cygnus' Cygwin?
-* Q6.1.6:: What do I need for Cygwin?
+* Q6.1.1:: I decided to run with X. Where do I get an X server?
+* Q6.1.2:: What compiler do I need to compile XEmacs?
+* Q6.1.3:: How do I compile for the native port?
+* Q6.1.4:: How do I compile for the X port?
+* Q6.1.5:: How do I compile for Cygnus' Cygwin?
+* Q6.1.6:: What do I need for Cygwin?
Customization and User Interface:
-* Q6.2.1:: How will the port cope with differences in the Windows user interface?
-* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
-* Q6.2.3:: Where do I put my @file{.emacs} file?
+* Q6.2.1:: How will the port cope with differences in the Windows user interface?
+* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
+* Q6.2.3:: Where do I put my @file{.emacs} file?
Miscellaneous:
-* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
-* Q6.3.2:: What are the differences between the various MS Windows emacsen?
-* Q6.3.3:: What is the porting team doing at the moment?
+* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
+* Q6.3.2:: What are the differences between the various MS Windows emacsen?
+* Q6.3.3:: What is the porting team doing at the moment?
Current Events:
are integers are the same. Byte code compiled under any version 19
Emacs will have all such functions mapped to their @code{old-} equivalents
when the byte code is read into XEmacs 20. This is to preserve
-compatibility -- Emacs 19 converts all constant characters to the equivalent
+compatibility---Emacs 19 converts all constant characters to the equivalent
integer during byte-compilation, and thus there is no other way to preserve
byte-code compatibility even if the code has specifically been written
with the distinction between characters and integers in mind.
code}. For example, the character @kbd{A} is represented as the
@w{integer 65}, following the standard @sc{ascii} representation of
characters. If XEmacs was not compiled with @sc{mule} support, the
-range of this integer will always be 0 to 255 -- eight bits, or one
+range of this integer will always be 0 to 255---eight bits, or one
byte. (Integers outside this range are accepted but silently truncated;
however, you should most decidedly @emph{not} rely on this, because it
will not work under XEmacs with @sc{mule} support.) When @sc{mule}
enable it, add to your @file{Emacs} file entries like this:
@example
-Emacs*XlwMenu.resourceLabels: True
-Emacs*XlwMenu.file.labelString: Fichier
-Emacs*XlwMenu.openInOtherWindow.labelString: In anderem Fenster offnen
+Emacs*XlwMenu.resourceLabels: True
+Emacs*XlwMenu.file.labelString: Fichier
+Emacs*XlwMenu.openInOtherWindow.labelString: In anderem Fenster offnen
@end example
The name of the resource is derived from the non-localized entry by
(cond ((boundp 'MULE)
;; for original Mule
)
- ((string-match "XEmacs" emacs-version)
- ;; for XEmacs with Mule
- )
- (t
- ;; for next version of Emacs
- ))
+ ((string-match "XEmacs" emacs-version)
+ ;; for XEmacs with Mule
+ )
+ (t
+ ;; for next version of Emacs
+ ))
;; for old emacs variants
)
@end lisp
Now examine the space used by directory:
@format
-0 /usr/local/bin/xemacs
-2048 /usr/local/bin/xemacs-19.13
+0 /usr/local/bin/xemacs
+2048 /usr/local/bin/xemacs-19.13
-1546 /usr/local/lib/xemacs-19.13/i486-miranova-sco3.2v4.2
-1158 /usr/local/lib/xemacs-19.13/i486-unknown-linux1.2.13
+1546 /usr/local/lib/xemacs-19.13/i486-miranova-sco3.2v4.2
+1158 /usr/local/lib/xemacs-19.13/i486-unknown-linux1.2.13
@end format
You need to keep these. XEmacs isn't stripped by default in
5MB right there.
@format
-207 /usr/local/lib/xemacs-19.13/etc/w3
-122 /usr/local/lib/xemacs-19.13/etc/sounds
-18 /usr/local/lib/xemacs-19.13/etc/sparcworks
-159 /usr/local/lib/xemacs-19.13/etc/vm
-6 /usr/local/lib/xemacs-19.13/etc/e
-21 /usr/local/lib/xemacs-19.13/etc/eos
-172 /usr/local/lib/xemacs-19.13/etc/toolbar
-61 /usr/local/lib/xemacs-19.13/etc/ns
-43 /usr/local/lib/xemacs-19.13/etc/gnus
+207 /usr/local/lib/xemacs-19.13/etc/w3
+122 /usr/local/lib/xemacs-19.13/etc/sounds
+18 /usr/local/lib/xemacs-19.13/etc/sparcworks
+159 /usr/local/lib/xemacs-19.13/etc/vm
+6 /usr/local/lib/xemacs-19.13/etc/e
+21 /usr/local/lib/xemacs-19.13/etc/eos
+172 /usr/local/lib/xemacs-19.13/etc/toolbar
+61 /usr/local/lib/xemacs-19.13/etc/ns
+43 /usr/local/lib/xemacs-19.13/etc/gnus
@end format
These are support directories for various packages. In general they
do not require the package, you may delete or gzip the support too.
@format
-1959 /usr/local/lib/xemacs-19.13/etc
-175 /usr/local/lib/xemacs-19.13/lisp/bytecomp
-340 /usr/local/lib/xemacs-19.13/lisp/calendar
-342 /usr/local/lib/xemacs-19.13/lisp/comint
-517 /usr/local/lib/xemacs-19.13/lisp/dired
-42 /usr/local/lib/xemacs-19.13/lisp/electric
-212 /usr/local/lib/xemacs-19.13/lisp/emulators
-238 /usr/local/lib/xemacs-19.13/lisp/energize
-289 /usr/local/lib/xemacs-19.13/lisp/gnus
-457 /usr/local/lib/xemacs-19.13/lisp/ilisp
-1439 /usr/local/lib/xemacs-19.13/lisp/modes
-2276 /usr/local/lib/xemacs-19.13/lisp/packages
-1040 /usr/local/lib/xemacs-19.13/lisp/prim
-176 /usr/local/lib/xemacs-19.13/lisp/pcl-cvs
-154 /usr/local/lib/xemacs-19.13/lisp/rmail
-3 /usr/local/lib/xemacs-19.13/lisp/epoch
-45 /usr/local/lib/xemacs-19.13/lisp/term
-860 /usr/local/lib/xemacs-19.13/lisp/utils
-851 /usr/local/lib/xemacs-19.13/lisp/vm
-13 /usr/local/lib/xemacs-19.13/lisp/vms
-157 /usr/local/lib/xemacs-19.13/lisp/x11
-19 /usr/local/lib/xemacs-19.13/lisp/tooltalk
-14 /usr/local/lib/xemacs-19.13/lisp/sunpro
-291 /usr/local/lib/xemacs-19.13/lisp/games
-198 /usr/local/lib/xemacs-19.13/lisp/edebug
-619 /usr/local/lib/xemacs-19.13/lisp/w3
-229 /usr/local/lib/xemacs-19.13/lisp/eos
-55 /usr/local/lib/xemacs-19.13/lisp/iso
-59 /usr/local/lib/xemacs-19.13/lisp/mailcrypt
-187 /usr/local/lib/xemacs-19.13/lisp/eterm
-356 /usr/local/lib/xemacs-19.13/lisp/ediff
-408 /usr/local/lib/xemacs-19.13/lisp/hyperbole/kotl
-1262 /usr/local/lib/xemacs-19.13/lisp/hyperbole
-247 /usr/local/lib/xemacs-19.13/lisp/hm--html-menus
-161 /usr/local/lib/xemacs-19.13/lisp/mh-e
-299 /usr/local/lib/xemacs-19.13/lisp/viper
-53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-x
-4 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/DocWindow.nib
-3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/InfoPanel.nib
-3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/TreeView.nib
-11 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj
-53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx
-466 /usr/local/lib/xemacs-19.13/lisp/oobr
-14142 /usr/local/lib/xemacs-19.13/lisp
+1959 /usr/local/lib/xemacs-19.13/etc
+175 /usr/local/lib/xemacs-19.13/lisp/bytecomp
+340 /usr/local/lib/xemacs-19.13/lisp/calendar
+342 /usr/local/lib/xemacs-19.13/lisp/comint
+517 /usr/local/lib/xemacs-19.13/lisp/dired
+42 /usr/local/lib/xemacs-19.13/lisp/electric
+212 /usr/local/lib/xemacs-19.13/lisp/emulators
+238 /usr/local/lib/xemacs-19.13/lisp/energize
+289 /usr/local/lib/xemacs-19.13/lisp/gnus
+457 /usr/local/lib/xemacs-19.13/lisp/ilisp
+1439 /usr/local/lib/xemacs-19.13/lisp/modes
+2276 /usr/local/lib/xemacs-19.13/lisp/packages
+1040 /usr/local/lib/xemacs-19.13/lisp/prim
+176 /usr/local/lib/xemacs-19.13/lisp/pcl-cvs
+154 /usr/local/lib/xemacs-19.13/lisp/rmail
+3 /usr/local/lib/xemacs-19.13/lisp/epoch
+45 /usr/local/lib/xemacs-19.13/lisp/term
+860 /usr/local/lib/xemacs-19.13/lisp/utils
+851 /usr/local/lib/xemacs-19.13/lisp/vm
+13 /usr/local/lib/xemacs-19.13/lisp/vms
+157 /usr/local/lib/xemacs-19.13/lisp/x11
+19 /usr/local/lib/xemacs-19.13/lisp/tooltalk
+14 /usr/local/lib/xemacs-19.13/lisp/sunpro
+291 /usr/local/lib/xemacs-19.13/lisp/games
+198 /usr/local/lib/xemacs-19.13/lisp/edebug
+619 /usr/local/lib/xemacs-19.13/lisp/w3
+229 /usr/local/lib/xemacs-19.13/lisp/eos
+55 /usr/local/lib/xemacs-19.13/lisp/iso
+59 /usr/local/lib/xemacs-19.13/lisp/mailcrypt
+187 /usr/local/lib/xemacs-19.13/lisp/eterm
+356 /usr/local/lib/xemacs-19.13/lisp/ediff
+408 /usr/local/lib/xemacs-19.13/lisp/hyperbole/kotl
+1262 /usr/local/lib/xemacs-19.13/lisp/hyperbole
+247 /usr/local/lib/xemacs-19.13/lisp/hm--html-menus
+161 /usr/local/lib/xemacs-19.13/lisp/mh-e
+299 /usr/local/lib/xemacs-19.13/lisp/viper
+53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-x
+4 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/DocWindow.nib
+3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/InfoPanel.nib
+3 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj/TreeView.nib
+11 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx/English.lproj
+53 /usr/local/lib/xemacs-19.13/lisp/oobr/tree-nx
+466 /usr/local/lib/xemacs-19.13/lisp/oobr
+14142 /usr/local/lib/xemacs-19.13/lisp
@end format
These are all Emacs Lisp source code and bytecompiled object code. You
certain packages can be removed from them if you do not use them.
@example
-1972 /usr/local/lib/xemacs-19.13/info
+1972 /usr/local/lib/xemacs-19.13/info
@end example
These are online texinfo sources. You may either gzip them or remove
them. In either case, @kbd{C-h i} (info mode) will no longer work.
@example
-20778 /usr/local/lib/xemacs-19.13
+20778 /usr/local/lib/xemacs-19.13
@end example
The 20MB achieved is less than half of what the full distribution takes up,
suffice. If you don't understand how to do this, don't do it.
@item
-Rebuild XEmacs yourself -- any working ELF version of libc should be
+Rebuild XEmacs yourself---any working ELF version of libc should be
O.K.
@end enumerate
like:
@example
-*Foreground: Black ;everything will be of black on grey95,
-*Background: Grey95 ;unless otherwise specified.
-*cursorColor: Red3 ;red3 cursor with grey95 border.
-*pointerColor: Red3 ;red3 pointer with grey95 border.
+*Foreground: Black ;everything will be of black on grey95,
+*Background: Grey95 ;unless otherwise specified.
+*cursorColor: Red3 ;red3 cursor with grey95 border.
+*pointerColor: Red3 ;red3 pointer with grey95 border.
@end example
@end quotation
(setq default-minibuffer-frame
(make-frame
'(minibuffer only
- width 86
- height 1
- menubar-visible-p nil
- default-toolbar-visible-p nil
- name "minibuffer"
- top -2
- left -2
- has-modeline-p nil)))
+ width 86
+ height 1
+ menubar-visible-p nil
+ default-toolbar-visible-p nil
+ name "minibuffer"
+ top -2
+ left -2
+ has-modeline-p nil)))
(frame-notice-user-settings)
@end lisp
@lisp
(setq frame-title-format
'("%S: " (buffer-file-name "%f"
- (dired-directory dired-directory "%b"))))
+ (dired-directory dired-directory "%b"))))
@end lisp
That is, use the file name, or the dired-directory, or the buffer name.
(set-face-background 'default "bisque") ; frame background
(set-face-foreground 'default "black") ; normal text
(set-face-background 'zmacs-region "red") ; When selecting w/
- ; mouse
+ ; mouse
(set-face-foreground 'zmacs-region "yellow")
(set-face-font 'default "*courier-bold-r*120-100-100*")
(set-face-background 'highlight "blue") ; Ie when selecting
- ; buffers
+ ; buffers
(set-face-foreground 'highlight "yellow")
(set-face-background 'modeline "blue") ; Line at bottom
- ; of buffer
+ ; of buffer
(set-face-foreground 'modeline "white")
(set-face-font 'modeline "*bold-r-normal*140-100-100*")
(set-face-background 'isearch "yellow") ; When highlighting
- ; while searching
+ ; while searching
(set-face-foreground 'isearch "red")
(setq x-pointer-foreground-color "black") ; Adds to bg color,
- ; so keep black
+ ; so keep black
(setq x-pointer-background-color "blue") ; This is color
- ; you really
- ; want ptr/crsr
+ ; you really
+ ; want ptr/crsr
@end lisp
@node Q3.2.2, Q3.2.3, Q3.2.1, Customization
@lisp
(add-hook 'TeX-mode-hook
- '(lambda () (setq fume-display-in-modeline-p nil)))
+ '(lambda () (setq fume-display-in-modeline-p nil)))
@end lisp
@email{dhughes@@origin-at.co.uk, David Hughes} writes:
@lisp
(global-set-key [(control ?.)]
(lambda () (interactive) (scroll-up 1)))
-(global-set-key [(control ? ;)]
- (lambda () (interactive) (scroll-up -1)))
+(global-set-key [(control ?;)]
+ (lambda () (interactive) (scroll-up -1)))
@end lisp
This is fine if you only need a few functions within the lambda body.
(scroll-down 1))
(global-set-key [(control ?.)] 'scroll-up-one-line) ; C-.
-(global-set-key [(control ? ;)] 'scroll-down-one-line) ; C-;
+(global-set-key [(control ?;)] 'scroll-down-one-line) ; C-;
@end lisp
The key point is that you can only bind simple functions to keys; you
@c hey, show some respect, willya -- there's xkeycaps, isn't there? --
@c chr ;)
@example
- xmodmap -e 'keycode 0xff20 = Multi_key'
+ xmodmap -e 'keycode 0xff20 = Multi_key'
@end example
You will need to pick an appropriate keycode. Use xev to find out the
Once you have Multi_key defined, you can use e.g.
@example
- Multi a ' => á
- Multi e " => ë
- Multi c , => ç
+ Multi a ' => á
+ Multi e " => ë
+ Multi c , => ç
@end example
etc.
Also, recent versions of XFree86 define various AltGr-<key>
combinations as dead keys, i.e.
@example
- AltGr [ => dead_diaeresis
- AltGr ] => dead_tilde
- AltGr ; => dead_acute
+ AltGr [ => dead_diaeresis
+ AltGr ] => dead_tilde
+ AltGr ; => dead_acute
@end example
etc.
You can use a color to make it stand out better:
@example
-Emacs*cursorColor: Red
+Emacs*cursorColor: Red
@end example
@node Q3.6.2, Q3.6.3, Q3.6.1, Customization
(interactive "_P")
(let ((zmacs-region-stays t))
(if (interactive-p)
- (condition-case nil
- ad-do-it
- (end-of-buffer (goto-char (point-max))))
+ (condition-case nil
+ ad-do-it
+ (end-of-buffer (goto-char (point-max))))
ad-do-it)))
(defadvice scroll-down (around scroll-down freeze)
(interactive "_P")
(let ((zmacs-region-stays t))
(if (interactive-p)
- (condition-case nil
- ad-do-it
- (beginning-of-buffer (goto-char (point-min))))
+ (condition-case nil
+ ad-do-it
+ (beginning-of-buffer (goto-char (point-min))))
ad-do-it)))
@end lisp
@lisp
(setq vm-reply-ignored-addresses
'("wing@@nuspl@@nvwls.cc.purdue.edu,netcom[0-9]*.netcom.com"
- "wing@@netcom.com" "wing@@xemacs.org"))
+ "wing@@netcom.com" "wing@@xemacs.org"))
@end lisp
Note that each string is a regular expression.
@quotation
@lisp
- ; Don't use multiple frames
+ ; Don't use multiple frames
(setq vm-frame-per-composition nil)
(setq vm-frame-per-folder nil)
(setq vm-frame-per-edit nil)
@lisp
(add-hook 'mh-show-mode-hook '(lambda ()
- (smiley-region (point-min)
+ (smiley-region (point-min)
(point-max))))
@end lisp
Each package bundled with XEmacs means more work for the maintainers,
whether they want it or not. If you are ready to take over the
maintenance responsibilities for the package you port, be sure to say
-so -- we will more likely include it.
+so---we will more likely include it.
@item
The package simply hasn't been noted by the XEmacs development. If
automatically start it by adding lines like:
@lisp
-(add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock)
-(add-hook 'dired-mode-hook 'turn-on-font-lock)
+(add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock)
+(add-hook 'dired-mode-hook 'turn-on-font-lock)
@end lisp
to your @file{.emacs}. See the file @file{etc/sample.emacs} for more
@lisp
(let ((case-fold-search nil))
- ... ; code with searches that must be case-sensitive
+ ... ; code with searches that must be case-sensitive
...)
@end lisp
@lisp
(defun my-function (whatever)
- (let (a) ; default initialization is to nil
+ (let (a) ; default initialization is to nil
... build a large list ...
... and exit, unbinding `a' in the process ...)
@end lisp
The reason for the warning is the following:
@lisp
-(defun flurgoze nil) ; ok, global internal variable
+(defun flurgoze nil) ; ok, global internal variable
...
-(setq flurghoze t) ; ops! a typo, but semantically correct.
- ; however, the byte-compiler warns.
+(setq flurghoze t) ; ops! a typo, but semantically correct.
+ ; however, the byte-compiler warns.
While compiling toplevel forms:
** assignment to free variable flurghoze
(setq sound-alist nil)
@end lisp
-That will make your XEmacs totally silent -- even the default ding sound
+That will make your XEmacs totally silent---even the default ding sound
(TTY beep on TTY-s) will be gone.
Starting with XEmacs-20.2 you can also change these with Customize.
like:
@lisp
-(add-hook 'postscript-mode-hook 'turn-on-font-lock)
+(add-hook 'postscript-mode-hook 'turn-on-font-lock)
@end lisp
Take it out, restart XEmacs, and it won't try to fontify your postscript
@lisp
(setq Info-directory-list (cons
- (expand-file-name "~/info")
- Info-default-directory-list))
+ (expand-file-name "~/info")
+ Info-default-directory-list))
@end lisp
@email{davidm@@prism.kla.com, David Masterson} writes:
@menu
General Info
-* Q6.0.1:: What is the status of the XEmacs port to Windows?
-* Q6.0.2:: What flavors of MS Windows are supported?
+* Q6.0.1:: What is the status of the XEmacs port to Windows?
+* Q6.0.2:: What flavors of MS Windows are supported?
* Q6.0.3:: Where are the XEmacs on MS Windows binaries?
-* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
+* Q6.0.4:: Does XEmacs on MS Windows require an X server to run?
Building XEmacs on MS Windows
-* Q6.1.1:: I decided to run with X. Where do I get an X server?
-* Q6.1.2:: What compiler do I need to compile XEmacs?
-* Q6.1.3:: How do I compile for the native port?
-* Q6.1.4:: How do I compile for the X port?
-* Q6.1.5:: How do I compile for Cygnus' Cygwin?
-* Q6.1.6:: What do I need for Cygwin?
+* Q6.1.1:: I decided to run with X. Where do I get an X server?
+* Q6.1.2:: What compiler do I need to compile XEmacs?
+* Q6.1.3:: How do I compile for the native port?
+* Q6.1.4:: How do I compile for the X port?
+* Q6.1.5:: How do I compile for Cygnus' Cygwin?
+* Q6.1.6:: What do I need for Cygwin?
Customization and User Interface
-* Q6.2.1:: How will the port cope with differences in the Windows user interface?
-* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
-* Q6.2.3:: Where do I put my @file{.emacs} file?
+* Q6.2.1:: How will the port cope with differences in the Windows user interface?
+* Q6.2.2:: How do I change fonts in XEmacs on MS Windows?
+* Q6.2.3:: Where do I put my @file{.emacs} file?
Miscellaneous
-* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
-* Q6.3.2:: What are the differences between the various MS Windows emacsen?
-* Q6.3.3:: What is the porting team doing at the moment?
+* Q6.3.1:: Will XEmacs rename all the win32-* symbols to w32-*?
+* Q6.3.2:: What are the differences between the various MS Windows emacsen?
+* Q6.3.3:: What is the porting team doing at the moment?
@end menu
Long answer: XEmacs can be built in several ways in the MS Windows
environment, some of them requiring an X server and some not.
-One is what we call the "X" port -- it requires X libraries to build
+One is what we call the "X" port---it requires X libraries to build
and an X server to run. Internally it uses the Xt event loop and
makes use of X toolkits. Its look is quite un-Windowsy, but it works
reliably and supports all of the graphical features of Unix XEmacs.
reuse much of the Unix XEmacs code base, such as processes and network
support, or internal select() mechanisms.
-Cygwin port supports all display types -- TTY, X & MS gui, and can be
+Cygwin port supports all display types---TTY, X & MS gui, and can be
built with support for all three. If you build with ms gui support
then the Cygwin version uses the majority of the msw code, which is
mostly related to display. If you want to build with X support you
@node Q6.2.2, Q6.2.3, Q6.2.1, MS Windows
@unnumberedsubsec Q6.2.2: How do I change fonts in XEmacs on MS Windows?
-You can change font manually, but not from the menubar, yet. For
-example:
+In 21.2.*, use the font menu. In 21.1.*, you can change font
+manually. For example:
@display
(set-face-font 'default "Lucida Console:Regular:10")
The XEmacs/Mule support has been only seriously tested in a Japanese
locale, and no doubt many problems still remain. The support for
ISO-Latin-1 and Japanese is fairly strong. MULE support comes at a
-price -- about a 30% slowdown from 19.16. We're making progress on
+price---about a 30% slowdown from 19.16. We're making progress on
improving performance and XEmacs 20.3 compiled without Mule (which is
the default) is definitely faster than XEmacs 19.16.
@example
(lisp-mode-abbrev-table)
-"dk" 0 "define-key"
+"dk" 0 "define-key"
(global-abbrev-table)
-"dfn" 0 "definition"
+"dfn" 0 "definition"
@end example
@noindent
MR Buffer Size Mode File
-- ------ ---- ---- ----
.* emacs.tex 383402 Texinfo /u2/emacs/man/emacs.tex
- *Help* 1287 Fundamental
+ *Help* 1287 Fundamental
files.el 23076 Emacs-Lisp /u2/emacs/lisp/files.el
% RMAIL 64042 RMAIL /u/rms/RMAIL
- *% man 747 Dired /u2/emacs/man/
+ *% man 747 Dired /u2/emacs/man/
net.emacs 343885 Fundamental /u/rms/net.emacs
fileio.c 27691 C /u2/emacs/src/fileio.c
NEWS 67340 Text /u2/emacs/etc/NEWS
- *scratch* 0 Lisp Interaction
+ *scratch* 0 Lisp Interaction
@end smallexample
@noindent
file.
* Audible Bell:: Changing how Emacs sounds the bell.
* Faces:: Changing the fonts and colors of a region of text.
-* X Resources:: X resources controlling various aspects of the
+* X Resources:: X resources controlling various aspects of the
behavior of XEmacs.
@end menu
mode and variable settings should be. For example, these are all legal:
@example
- ;;; -*- mode: emacs-lisp -*-
- ;;; -*- mode: postscript; version-control: never -*-
- ;;; -*- tags-file-name: "/foo/bar/TAGS" -*-
+ ;;; -*- mode: emacs-lisp -*-
+ ;;; -*- mode: postscript; version-control: never -*-
+ ;;; -*- tags-file-name: "/foo/bar/TAGS" -*-
@end example
For historical reasons, the syntax @code{`-*- modename -*-'} is allowed
as well; for example, you can use:
@example
- ;;; -*- emacs-lisp -*-
+ ;;; -*- emacs-lisp -*-
@end example
@vindex enable-local-variables
@example
;;; Bind @code{my-command} to @key{f1}
-(global-set-key 'f1 'my-command)
+(global-set-key 'f1 'my-command)
;;; Bind @code{my-command} to @kbd{Shift-f1}
(global-set-key '(shift f1) 'my-command)
;;; Bind @code{my-command} to @kbd{C-c Shift-f1}
-(global-set-key '[(control c) (shift f1)] 'my-command)
+(global-set-key '[(control c) (shift f1)] 'my-command)
;;; Bind @code{my-command} to the middle mouse button.
(global-set-key 'button2 'my-command)
After binding a command to two key sequences with a form like:
@example
- (define-key global-map "\^X\^I" 'command-1)
+ (define-key global-map "\^X\^I" 'command-1)
@end example
it is possible to redefine only one of those sequences like so:
@example
- (define-key global-map [(control x) (control i)] 'command-2)
- (define-key global-map [(control x) tab] 'command-3)
+ (define-key global-map [(control x) (control i)] 'command-2)
+ (define-key global-map [(control x) tab] 'command-3)
@end example
This applies only when running under a window system. If you are
@item undefined-key
You type a key that is undefined
-@item undefined-click
+@item undefined-click
You use an undefined mouse-click combination
-@item no-completion
+@item no-completion
Completion was not possible
-@item y-or-n-p
+@item y-or-n-p
You type something other than the required @code{y} or @code{n}
-@item yes-or-no-p
+@item yes-or-no-p
You type something other than @code{yes} or @code{no}
@end table
Starting with XEmacs 21, XEmacs uses the class @samp{XEmacs} if it finds
any XEmacs resources in the resource database when the X connection is
initialized. Otherwise, it will use the class @samp{Emacs} for
-backwards compatability. The variable @var{x-emacs-application-class}
+backwards compatibility. The variable @var{x-emacs-application-class}
may be consulted to determine the application class being used.
The examples in this section assume the application class is @samp{Emacs}.
@menu
* Geometry Resources:: Controlling the size and position of frames.
-* Iconic Resources:: Controlling whether frames come up iconic.
-* Resource List:: List of resources settable on a frame or device.
-* Face Resources:: Controlling faces using resources.
-* Widgets:: The widget hierarchy for XEmacs.
-* Menubar Resources:: Specifying resources for the menubar.
+* Iconic Resources:: Controlling whether frames come up iconic.
+* Resource List:: List of resources settable on a frame or device.
+* Face Resources:: Controlling faces using resources.
+* Widgets:: The widget hierarchy for XEmacs.
+* Menubar Resources:: Specifying resources for the menubar.
@end menu
@node Geometry Resources
Here are some examples of complete key sequences:
@table @kbd
-@item [(control c) (control a)]
+@item [(control c) (control a)]
Typing @kbd{C-c} followed by @kbd{C-a}
-@item [(control c) (control 65)]
+@item [(control c) (control 65)]
Typing @kbd{C-c} followed by @kbd{C-a}. (Using the ASCII code
for the character `a')@refill
@item [(control c) (break)]
Create a file called @code{~/.xmodmap}. In this file, place the lines
@example
- remove Lock = Caps_Lock
- keysym Caps_Lock = Super_L
- add Mod2 = Super_L
+ remove Lock = Caps_Lock
+ keysym Caps_Lock = Super_L
+ add Mod2 = Super_L
@end example
The first line says that the key that is currently called @code{Caps_Lock}
))
(cond ((and (string-match "XEmacs" emacs-version)
- (or (> emacs-major-version 19)
- (>= emacs-minor-version 12)))
+ (or (> emacs-major-version 19)
+ (>= emacs-minor-version 12)))
;;
;; Code which requires XEmacs version 19.12 or newer goes here
;;
))
(cond ((and (not (string-match "Lucid" emacs-version))
- (= emacs-major-version 19))
+ (= emacs-major-version 19))
;;
;; Code specific to FSF Emacs 19 (not XEmacs) goes here
;;
XEmacs has the following new default function keybindings:
@table @kbd
-@item @key{HELP}
+@item @key{HELP}
Same as @kbd{C-h}.
-@item @key{UNDO}
+@item @key{UNDO}
Same as @kbd{M-x undo}.
-@item @key{CUT}
+@item @key{CUT}
Same as the Cut menu item; that is, it copies the selected text to
the X Clipboard selection.
-@item @key{COPY}
+@item @key{COPY}
Same as the Copy menu item.
-@item @key{PASTE}
+@item @key{PASTE}
Same as the Paste menu item.
@item @key{PGUP}
@item @key{LEFT-ARROW}
Same as the function @code{backward-char}.
-@item @key{RIGHT-ARROW}
+@item @key{RIGHT-ARROW}
Same as the function @code{forward-char}.
@item @key{UP-ARROW}
also listed on the @code{Options} menu under:
@example
- Options->Customize->Emacs->Packages
+ Options->Customize->Emacs->Packages
@end example
However, don't select any of these menu picks unless you actually want
access it via the menus:
@example
- Options->Manage Packages->List & Install
+ Options->Manage Packages->List & Install
@end example
Or, you can get to it via the keyboard:
add these directory names to @code{package-get-remote} using:
@example
- M-x pui-add-install-directory
+ M-x pui-add-install-directory
@end example
Note, however, that any directories added using this function are not
browser and installer, using the menu pick:
@example
- Options->Manage Packages->List & Install
+ Options->Manage Packages->List & Install
@end example
or
@example
- Options->Manage Packages->Using Custom->Select-> ...
+ Options->Manage Packages->Using Custom->Select-> ...
@end example
You can also access it using the keyboard:
customize menus, under:
@example
- Options->Customize->Emacs->Packages-> ...
+ Options->Customize->Emacs->Packages-> ...
@end example
or
@example
- Options->Manage Packages->Using Custom->Select-> ...
+ Options->Manage Packages->Using Custom->Select-> ...
@end example
Set their state to on, and then do:
@example
- Options->Manage Packages->Using Custom->Update Packages
+ Options->Manage Packages->Using Custom->Update Packages
@end example
This will automatically retrieve the packages you have selected from the
typically do this using the commands:
@example
- gunzip < package.tar.gz | tar xvf -
+ gunzip < package.tar.gz | tar xvf -
@end example
Above, replace @file{package.tar.gz} with the filename of the
Of course, if you use GNU @code{tar}, you could also use:
@example
- tar xvzf package.tar.gz
+ tar xvzf package.tar.gz
@end example
@comment What about native MS Windows users???
@example
(setq tag-table-alist
- '(("/usr/src/public/perl/" . "/usr/src/public/perl/perl-3.0/")
- ("\\.el$" . "/usr/local/emacs/src/")
- ("/jbw/gnu/" . "/usr15/degree/stud/jbw/gnu/")
- ("" . "/usr/local/emacs/src/")
- ))
+ '(("/usr/src/public/perl/" . "/usr/src/public/perl/perl-3.0/")
+ ("\\.el$" . "/usr/local/emacs/src/")
+ ("/jbw/gnu/" . "/usr15/degree/stud/jbw/gnu/")
+ ("" . "/usr/local/emacs/src/")
+ ))
@end example
The example defines the tags table alist in the following way:
@table @kbd
@item tag-table-alist
Controls which tables apply to which buffers.
-@item tags-file-name
+@item tags-file-name
Stores a default tags table.
-@item tags-build-completion-table
+@item tags-build-completion-table
Controls completion behavior.
-@item buffer-tag-table
+@item buffer-tag-table
Specifies a buffer-local table.
-@item make-tags-files-invisible
+@item make-tags-files-invisible
Sets whether tags tables should be very hidden.
-@item tag-mark-stack-max
+@item tag-mark-stack-max
Specifies how many tags-based hops to remember.
@end table
In this version of Emacs, what you see is what you get: in contrast to
some other versions, no abbreviations are expanded after you have sent the
mail. This means you don't suffer the annoyance of having the system do
-things behind your back --- if the system rewrites an address you typed,
+things behind your back---if the system rewrites an address you typed,
you know it immediately, instead of after the mail has been sent and
it's too late to do anything about it. For example, you will never
again be in trouble because you forgot to delete an old alias from your
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-02-03 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * Xpm.def: New file, required to build Xpm.dll.
+
+ * Xpm.mak: Use DEBUG instead of DEBUG_XEMACS - this library is not
+ xemacs-specific. Initialize to DEBUG_XEMACS if specified for
+ compatibility.
+ Build DLL instead of static LIB when USE_CRTDLL=1 is given to
+ make.
+
+ * xemacs.mak: Introduced USE_SYSTEM_MALLOC and USE_CRTDLL.
+ Do not build lastfile.lib when neither unexec not gmalloc are
+ used.
+
+ * config.h: Deleted GNU_MALLOC and SYSTEM_MALLOC, as they are set
+ in makefile.
+
+2000-01-26 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * xemacs.mak (DOC_SRC9): Added tests.c ...
+ (TEMACS_DEBUG_OBJS): ... and tests.obj
+ ($(DOC)): Tweaked a bit, for `nmake docfile' unconditionally
+ rebuild the docfile.
+
+2000-01-22 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * xemacs.mak (docfile): Added shortcut target.
+
+2000-01-19 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * xemacs.mak (TEMACS_LIBS): Added winspool.lib
+
+2000-01-20 Martin Buchholz <martin@xemacs.org>
+
+ * xemacs.mak (dump-xemacs): Remove redundant EMACSBOOTSTRAPMODULEPATH.
+
+2000-01-18 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * xemacs.mak: Patch of 01/13 got in corrupted, fixed.
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
* xemacs.mak: Add rules to build & install minitar.
+2000-01-03 Michael Sperber [Mr. Preprocessor] <sperber@informatik.uni-tuebingen.de>
+
+ * config.h: Fix stuff related to mail locking.
+
1999-12-31 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.26 is released.
numbers. */
#undef LISP_FLOAT_TYPE
-/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
-#define GNU_MALLOC
-
-/* Define USE_SYSTEM_MALLOC if you forcing the use of it. */
-#undef USE_SYSTEM_MALLOC
-
/* Define HAVE_TTY if you want TTY support compiled in. */
#undef HAVE_TTY
#endif /* DEBUG_XEMACS */
+/* Define convenient conditionally defined assertion macros. */
+#ifdef ERROR_CHECK_TYPECHECK
+#define type_checking_assert(assertion) assert (assertion)
+#else
+#define type_checking_assert(assertion)
+#endif
+
+#ifdef ERROR_CHECK_BUFPOS
+#define bufpos_checking_assert(assertion) assert (assertion)
+#else
+#define bufpos_checking_assert(assertion)
+#endif
+
+
/* Define MEMORY_USAGE_STATS if you want extra code compiled in to
determine where XEmacs's memory is going. */
#undef MEMORY_USAGE_STATS
GUNG_HO=0
!endif
+# A little bit of adhockery. Default to use system malloc and
+# DLL version of the C runtime library when using portable
+# dumping. These are the optimal settings.
+!if !defined(USE_SYSTEM_MALLOC)
+USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
+!endif
+!if !defined(USE_CRTDLL)
+USE_CRTDLL=$(USE_PORTABLE_DUMPER)
+!endif
+
#
# System configuration
#
!message Cannot build InfoDock without InfoDock sources
CONFIG_ERROR=1
!endif
+!if !$(USE_PORTABLE_DUMPER) && $(USE_SYSTEM_MALLOC)
+!message Cannot use system allocator when dumping old way, use portable dumper.
+CONFIG_ERROR=1
+!endif
+!if !$(USE_PORTABLE_DUMPER) && $(USE_CRTDLL)
+!message Cannot use C runtime DLL when dumping old way, use portable dumper.
+CONFIG_ERROR=1
+!endif
+!if !$(USE_SYSTEM_MALLOC) && $(USE_CRTDLL)
+!message GNU malloc currently cannot be used with CRT DLL.
+!message [[[Developer note: If you want to fix it, read Q112297 first]]] ####
+CONFIG_ERROR=1
+!endif
!if !$(HAVE_MSW) && !$(HAVE_X)
!message Please specify at least one HAVE_MSW=1 and/or HAVE_X=1
CONFIG_ERROR=1
OPT=-O2 -G5
!endif
-CFLAGS=-nologo -W3 $(OPT)
+!if $(USE_CRTDLL)
+!if $(DEBUG_XEMACS)
+C_LIBFLAG=-MDd
+LIBC_LIB=msvcrtd.lib
+!else
+C_LIBFLAG=-MD
+LIBC_LIB=msvcrt.lib
+!endif
+!else
+C_LIBFLAG=-ML
+LIBC_LIB=libc.lib
+!endif
+
+CFLAGS=-nologo -W3 $(OPT) $(C_LIBFLAG)
!if $(HAVE_X)
X_DEFINES=-DHAVE_X_WINDOWS
LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION
!endif
!if $(USE_UNION_TYPE)
+UNION_DEFINES=-DUSE_UNION_TYPE
+!endif
+
!if $(USE_PORTABLE_DUMPER)
DUMPER_DEFINES=-DPDUMP
!endif
-UNION_DEFINES=-DUSE_UNION_TYPE
+!if $(USE_SYSTEM_MALLOC)
+MALLOC_DEFINES=-DSYSTEM_MALLOC
+!else
+MALLOC_DEFINES=-DGNU_MALLOC
!endif
# Hard-coded paths
INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(XEMACS)\nt\inc -I$(XEMACS)\src -I$(XEMACS)\lwlib
DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
- $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) $(DUMPER_DEFINES)\
+ $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
+ $(DUMPER_DEFINES) $(MALLOC_DEFINES) \
-DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
# LASTFILE Library
+!if !$(USE_SYSTEM_MALLOC) || !$(USE_PORTABLE_DUMPER)
+
LASTFILE=$(OUTDIR)\lastfile.lib
LASTFILE_SRC=$(XEMACS)\src
LASTFILE_FLAGS=$(CFLAGS) $(INCLUDES) -Fo$@ -Fd$* -c
$(OUTDIR)\lastfile.obj: $(LASTFILE_SRC)\lastfile.c
$(CCV) $(LASTFILE_FLAGS) $**
+!endif
+
#------------------------------------------------------------------------------
!if $(HAVE_X)
DOC_SRC3=\
$(XEMACS)\src\font-lock.c \
$(XEMACS)\src\frame.c \
- $(XEMACS)\src\free-hook.c \
$(XEMACS)\src\general.c \
$(XEMACS)\src\glyphs.c \
$(XEMACS)\src\glyphs-eimage.c \
$(XEMACS)\src\glyphs-widget.c \
- $(XEMACS)\src\gmalloc.c \
$(XEMACS)\src\gui.c \
$(XEMACS)\src\gutter.c \
$(XEMACS)\src\hash.c \
$(XEMACS)\src\menubar.c \
$(XEMACS)\src\minibuf.c \
$(XEMACS)\src\nt.c \
- $(XEMACS)\src\ntheap.c \
$(XEMACS)\src\ntplay.c \
$(XEMACS)\src\ntproc.c \
$(XEMACS)\src\objects.c \
$(XEMACS)\src\termcap.c \
$(XEMACS)\src\tparam.c \
$(XEMACS)\src\undo.c \
- $(XEMACS)\src\unexnt.c \
- $(XEMACS)\src\vm-limit.c \
$(XEMACS)\src\window.c \
$(XEMACS)\src\widget.c
!if $(DEBUG_XEMACS)
DOC_SRC9=\
- $(XEMACS)\src\debug.c
+ $(XEMACS)\src\debug.c \
+ $(XEMACS)\src\tests.c
+!endif
+
+!if !$(USE_SYSTEM_MALLOC)
+DOC_SRC10=\
+ $(XEMACS)\src\free-hook.c \
+ $(XEMACS)\src\gmalloc.c \
+ $(XEMACS)\src\ntheap.c \
+ $(XEMACS)\src\vm-limit.c
+!endif
+
+!if !$(USE_PORTABLE_DUMPER)
+DOC_SRC11=\
+ $(XEMACS)\src\unexnt.c
!endif
#------------------------------------------------------------------------------
EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version)
!ENDIF
+!if !$(USE_PORTABLE_DUMPER)
+TEMACS_ENTRYPOINT=-entry:_start
+!endif
+
TEMACS_DIR=$(XEMACS)\src
TEMACS=$(TEMACS_DIR)\temacs.exe
TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc
TEMACS_SRC=$(XEMACS)\src
TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
- kernel32.lib user32.lib gdi32.lib advapi32.lib \
- shell32.lib wsock32.lib winmm.lib libc.lib
+ oldnames.lib kernel32.lib user32.lib gdi32.lib advapi32.lib \
+ shell32.lib wsock32.lib winmm.lib winspool.lib $(LIBC_LIB)
TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
- -stack:0x800000 -entry:_start -subsystem:console\
+ -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:console\
-pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
- -heap:0x00100000 -out:$@
-TEMACS_CPP_FLAGS=-ML -c \
+ -heap:0x00100000 -out:$@ -nodefaultlib
+TEMACS_CPP_FLAGS=-c \
$(CFLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
-DEMACS_MAJOR_VERSION=$(emacs_major_version) \
-DEMACS_MINOR_VERSION=$(emacs_minor_version) \
!if $(DEBUG_XEMACS)
TEMACS_DEBUG_OBJS=\
- $(OUTDIR)\debug.obj
+ $(OUTDIR)\debug.obj \
+ $(OUTDIR)\tests.obj
+!endif
+
+!if !$(USE_SYSTEM_MALLOC)
+TEMACS_ALLOC_OBJS=\
+ $(OUTDIR)\free-hook.obj \
+ $(OUTDIR)\gmalloc.obj \
+ $(OUTDIR)\ntheap.obj \
+ $(OUTDIR)\vm-limit.obj
+!endif
+
+!if !$(USE_PORTABLE_DUMPER)
+TEMACS_DUMP_OBJS=\
+ $(OUTDIR)\unexnt.obj
!endif
TEMACS_OBJS= \
$(TEMACS_CODING_OBJS)\
$(TEMACS_MULE_OBJS)\
$(TEMACS_DEBUG_OBJS)\
+ $(TEMACS_ALLOC_OBJS)\
+ $(TEMACS_DUMP_OBJS)\
$(OUTDIR)\abbrev.obj \
$(OUTDIR)\alloc.obj \
$(OUTDIR)\alloca.obj \
$(OUTDIR)\fns.obj \
$(OUTDIR)\font-lock.obj \
$(OUTDIR)\frame.obj \
- $(OUTDIR)\free-hook.obj \
$(OUTDIR)\general.obj \
$(OUTDIR)\glyphs.obj \
$(OUTDIR)\glyphs-eimage.obj \
$(OUTDIR)\glyphs-widget.obj \
- $(OUTDIR)\gmalloc.obj \
$(OUTDIR)\gui.obj \
$(OUTDIR)\gutter.obj \
$(OUTDIR)\hash.obj \
$(OUTDIR)\md5.obj \
$(OUTDIR)\minibuf.obj \
$(OUTDIR)\nt.obj \
- $(OUTDIR)\ntheap.obj \
$(OUTDIR)\ntplay.obj \
$(OUTDIR)\ntproc.obj \
$(OUTDIR)\objects.obj \
$(OUTDIR)\sysdep.obj \
$(OUTDIR)\tparam.obj \
$(OUTDIR)\undo.obj \
- $(OUTDIR)\unexnt.obj \
- $(OUTDIR)\vm-limit.obj \
$(OUTDIR)\widget.obj \
$(OUTDIR)\window.obj \
$(OUTDIR)\xemacs.res
bscmake -nologo -o$(TEMACS_BROWSE) @bscmake.tmp
@$(DEL) bscmake.tmp
!endif
+!if $(USE_PORTABLE_DUMPER)
+ @if exist $(TEMACS_DIR)\xemacs.dmp del $(TEMACS_DIR)\xemacs.dmp
+!endif
link.exe @<<
$(TEMACS_LFLAGS) $(TEMACS_OBJS) $(TEMACS_LIBS)
<<
LOADPATH=$(LISP)
+# Rebuild docfile target
+docfile ::
+ if exist $(DOC) del $(DOC)
+docfile :: $(DOC)
+
$(DOC): $(LIB_SRC)\make-docfile.exe
- $(DEL) $(DOC)
+ if exist $(DOC) del $(DOC)
+ set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+ set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2)
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC7)
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC8)
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC9)
+ $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC10)
+ $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11)
update-elc:
- set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\update-elc.el
# This rule dumps xemacs and then possibly spawns sub-make if PURESPACE
# requirements have changed.
-dump-xemacs: $(TEMACS)
+dump-xemacs: temacs
@echo >$(TEMACS_DIR)\SATISFIED
cd $(TEMACS_DIR)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+ set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
-1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump
+!if $(USE_PORTABLE_DUMPER)
+ copy temacs.exe xemacs.exe
+!endif
cd $(NT)
@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
-
#------------------------------------------------------------------------------
# use this rule to build the complete system
perl ./make-src-depend > depend.tmp
perl -MFile::Compare -e "compare('depend.tmp', 'depend') && rename('depend.tmp', 'depend') or unlink('depend.tmp')"
+installation::
+ @if exist $(XEMACS)\Installation del $(XEMACS)\Installation
+
+installation:: $(XEMACS)\Installation
+
$(XEMACS)\Installation:
@type > $(XEMACS)\Installation <<
!if defined(OS)
!if $(USE_PORTABLE_DUMPER)
Using portable dumper.
!endif
+!if $(USE_SYSTEM_MALLOC)
+ Using system malloc.
+!endif
+!if $(USE_CRTDLL)
+ Using DLL version of C runtime library
+!endif
!if $(DEBUG_XEMACS)
Compiling in extra debug checks. XEmacs will be slow!
!endif
#
# XPM Makefile for Microsoft NMAKE without X libraries
#
+!if !defined(DEBUG)
+!if defined(DEBUG_XEMACS)
+DEBUG=$(DEBUG_XEMACS)
+!else
+DEBUG=0
+!endif
+!endif
-!if !defined(DEBUG_XEMACS)
-DEBUG_XEMACS=0
+!if !defined(USE_CRTDLL)
+USE_CRTDLL=0
!endif
-!if $(DEBUG_XEMACS)
+!if $(DEBUG)
OPT=-Od -Zi
+LINK_DEBUG=-debug
+!else
+OPT=-Ox
+!endif
+
+!if $(USE_CRTDLL)
+!if $(DEBUG)
+C_LIBFLAG=-MDd
!else
-OPT=-O2 -G5 -Zi
+C_LIBFLAG=-MD
+!endif
+!else
+!if $(DEBUG)
+C_LIBFLAG=-MLd
+!else
+C_LIBFLAG=-ML
+!endif
!endif
WARN_CPP_FLAGS = -W3
CC=cl
-CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) -Fo$@ -c
+CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \
+ $(OPT) $(INCLUDES) -c
OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
.SUFFIXES:
.SUFFIXES: .c
-.c.obj:
- $(CC) $(CFLAGS) $< -Fo$@
+.c.obj::
+ $(CC) $(CFLAGS) $<
# targets
mkdir ..\X11
Xpm.lib: $(OBJS)
- link.exe -lib -nologo -out:$@ $(OBJS)
+!if $(USE_CRTDLL)
+# Target is ok, link builds lib as a side effect.
+ link -nologo -dll -def:xpm.def -out:Xpm.dll gdi32.lib $(OBJS)
+!else
+ lib -nologo -out:$@ $(OBJS)
+!endif
# So we simulate the gdb algorithm by doing it ourselves here.
if test -r $HOME/.dbxrc; then . $HOME/.dbxrc; fi
+dbxenv language_mode ansic
+
ignore POLL
ignore IO
# A bug in dbx prevents string variables from having values beginning with `-'!!
function XEmacsInit {
- function ToInt { eval "$1=\$[(int) $1]"; }
+ function ToInt { eval "$1=\$[(int) \`alloc.c\`$1]"; }
ToInt dbg_USE_UNION_TYPE
ToInt Lisp_Type_Int
ToInt Lisp_Type_Char
ToInt Lisp_Type_Record
ToInt dbg_valbits
ToInt dbg_gctypebits
- function ToLong { eval "$1=\$[(unsigned long) $1]"; }
+ function ToLong { eval "$1=\$[(\`alloc.c\`unsigned long) \`alloc.c\`$1]"; }
ToLong dbg_valmask
ToLong dbg_typemask
xemacs_initted=yes
# Repeat after me... dbx sux, dbx sux, dbx sux...
# Allow both `pobj Qnil' and `pobj 0x82746834' to work
case $(whatis $1) in
- *Lisp_Object*) obj="$[(unsigned long)(($1).i)]";;
- *) obj="$[(unsigned long)($1)]";;
+ *Lisp_Object*) obj="$[(`alloc.c`unsigned long)(($1).i)]";;
+ *) obj="$[(`alloc.c`unsigned long)($1)]";;
esac
else
- obj="$[(unsigned long)($1)]";
+ obj="$[(`alloc.c`unsigned long)($1)]";
fi
if test $[(int)($obj & 1)] = 1; then
# It's an int
if test $type = $Lisp_Type_Record; then
typeset lheader="((struct lrecord_header *) $val)"
- imp=$[(void*)(lrecord_implementations_table[$lheader->type])]
+ imp=$[(void*)(`alloc.c`lrecord_implementations_table[$lheader->type])]
else
imp="0xdeadbeef"
fi
(Vcharset_thai_tis620): Likewise.
(Vcharset_katakana_jisx0201): Likewise.
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-02-06 Martin Buchholz <martin@xemacs.org>
+
+ * event-Xt.c (x_keysym_to_character): New.
+ (maybe_define_x_key_as_self_inserting_character): New.
+ (x_has_keysym): New.
+ Auto-define all keys on the keyboard as self-insert-key.
+
+2000-02-02 Martin Buchholz <martin@xemacs.org>
+
+ * menubar.c (vars_of_menubar): A small code simplification.
+
+ * minibuf.c (echo_area_append): Workaround egcs-20000131 c++ compiler bug
+
+ * ExternalShell.c:
+ * ExternalClient.c:
+ * EmacsShell-sub.c:
+ * EmacsManager.c:
+ * EmacsFrame.c:
+ Use consistent style for specifying X resources.
+
+ * symbols.c (Fset): Further implement SYMVAL_LISP_MAGIC.
+ This makes (dontusethis-set-symbol-value-handler) actually usable.
+
+ * lrecord.h (lrecord_decription_type):
+ * alloc.c (pdump_register_sub):
+ (pdump_dump_data):
+ (pdump_reloc_one):
+ Add XD_LISP_OBJECT_ARRAY to describe multiple Lisp_Objects.
+ Comply with XEmacs coding style.
+ All lrecord descriptions updated to use XD_LISP_OBJECT with 2
+ args, and XD_LISP_OBJECT_ARRAY with 3 args.
+
+ * keymap.c (Faccessible_keymaps):
+ Make (accessible-keymaps map "\C-h") do the Right Thing.
+ Make (accessible-keymaps map []) do the Right Thing.
+ Make (accessible-keymaps map "") do the Right Thing.
+ (check_keymap_definition_loop): New function.
+ (keymap_store_internal): Keep luser from shooting self in foot,
+ via (define-key ctl-x-4-map "p" global-map).
+ Remove fullness slot from struct Lisp_Keymap, since hash tables
+ are now reliable.
+ (print_keymap): Remove 'Yuck' factor by simply printing "size %d".
+
+2000-01-30 Martin Buchholz <martin@xemacs.org>
+
+ * redisplay.c (init_redisplay): Fix small memory leak.
+ * elhash.h:
+ * elhash.c (pdump_reorganize_hash_table):
+ Rename from reorganize_hash_table. Change prototype.
+ Reuse the original memory for hentries. Save 100k.
+ * alloc.c (PDUMP_READ): new macro.
+ * alloc.c (pdump_load): Replace LISP_TO_VOID with higher-level macros.
+ * alloc.c: No need to #ifndef before #undef.
+
+ * print.c: Allow debug_print() to print readably by modifying
+ debug_print_readably. Use consistent variable names.
+
+ * .dbxrc: Try to get things to work even if stopped in a function
+ without source available by explicitly specifying source files.
+2000-02-03 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * unexnt.c (_start): Removed bogus code which caused loading heap
+ from differrent executable file.
+ Removed bogus assignment to _fmode, which caused inconsistencies.
+
+2000-02-03 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * s\windowsnt.h: Removed lots of #if 0 blocks of Emacs heritage.
+ Have spawnve encapsulation regard DONT_ENCAPSULATE.
+ Do not preliminary `#define signal sigset'.
+
+ * systime.h: Do not prototype environ on windows nt and cygwin,
+ this conflicts with system header.
+
+ * syssignal.h: Use correct define for WINDOWSNT
+
+ * sysdep.h: Do not prototype environ on windows nt, this conflicts
+ with system header.
+
+ * sysdep.c (near start of file): Fixed commentary and rearranged
+ ifdefs in readable order.
+ (NEED_STARTS): Do not force NEED_STARTS when PDUMPing.
+ (start_of_text):
+ (end_of_text):
+ (end_of_data): Do not compile in if using PDUMP.
+
+ * symsinit.h: Protptyped vars_of_nt().
+
+ * ntproc.c (windows9x_p): Added, instead of os_subtype.
+ (find_child_console): Use it.
+ (sys_kill): Use it.
+
+ * ntheap.h: Do not extern os_subtype.
+
+ * ntheap.c (cache_system_info): Do not cache unneeded:
+ nt_major_version, nt_minor_version and os_subtype.
+ (recreate_heap): Do not compile in when PDUMPing.
+
+ * nt.c (geteuid and friends): Use the new varibale
+ nt_fake_unix_uid, instead of hashing fake uid out of NT RID.
+ (init_user_info): Removed the above mentioned hackery.
+ (fstat, stat): Do not compile in if using MSVC 5.0 and above -
+ stat has been fixed in the C runtime.
+ (vars_of_nt): Added, defined the nt_fake_unix_uid variable there.
+
+ * file-coding.c (struct file_coding_dump): Do not define
+ ucs_to_mule_table in the struct if not MULE.
+ (struct struct lrecord_description fcd_description_1): Do not dump
+ the above.
+
+ * emacs.c (main_1): Call vars_of_nt().
+ (right before Fdump_emacs_data): Don't need lastfile if using both
+ portabe dumper and system malloc.
+
+ * alloc.c (Fmemory_limit): Conditionalized out.
+ (pdump): Use OPEN_BINARY for the portable dump file.
+ (pdump_load): Ditto.
+
+2000-02-02 Mike Alexander <mta@arbortext.com>
+
+ * nt.c (convert_time): Set tm_isdst before calling mktime and
+ avoid calling it at all if the compiler supports 64 bit integers.
+ Also initialize utc_base_ft before using it.
+
+2000-02-03 Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+
+ * frame.c (change_frame_size_1): Take f->internal_border_width
+ into consideration when calculating the width of the frame.
+
+2000-02-01 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * window.c (frame_min_height):
+ (frame_size_valid_p):
+ (frame_pixsize_valid_p): Added.
+ (check_frame_size): Generalized.
+
+ * window.h: Prototyped the above.
+
+ * lisp.h:
+ * general.c: Added Qbottom_margin, Qduplex, Qlandscape,
+ Qleft_margin, Qorientation, Qportrait, Qright_margin, Qtop_margin.
+ Deleted Vwin32_* and Vbinary_process_* unused variables.
+
+ * device-msw.c (msprinter_init_device): Do not get printer font
+ list; Added DEVMODE functions.
+
+ * frame-msw.c: Added lots of printer code.
+
+ * faces.c: Moved 'left-margin and 'right-margin defsymbols to
+ general.c.
+
+ * console-msw.h: Added more msprinter device private slots.
+
+2000-02-01 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * event-msw.c (key_needs_default_processing_p): Added.
+ (mswindows_wnd_proc, WM_KEYUP, KEYDOWN): Call it.
+
+2000-01-29 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * glyphs.c (image_instance_layout): Mark image instance as clean
+ after layout.
+ (glyph_dirty_p): Removed redundant function.
+ (invalidate_glyph_geometry_maybe): Added.
+ (update_glyph_cachel_data): Call it.
+
+ * glyphs.h: Prototyped it.
+
+ * redisplay.c (add_glyph_rune): Call it.
+ (redisplay_window): Reset glyphs cachels when frame faces has
+ changed, thus forcing recomputation of built-in border glyphs.
+
+2000-01-30 Martin Buchholz <martin@xemacs.org>
+
+ * Makefile.in.in: Make portable dumper and purify play well together.
+ Add imperfect, but better than nothing, support for pdump.
+ Remove xemacs.dmp when temacs is re-generated.
+ Don't ignore errors when dumping xemacs.
+
+ * symbols.c (maybe_call_magic_handler): Remove one magic number.
+
+2000-01-28 Andy Piper <andy@xemacs.org>
+
+ * frame.c (allocate_frame_core): Use new Fset_window_buffer signature.
+ (setup_normal_frame): ditto.
+ (setup_frame_without_minibuffer): ditto.
+ (setup_minibuffer_frame): ditto.
+ (delete_frame_internal): ditto.
+ (Fmake_frame_invisible): ditto.
+ (Ficonify_frame): ditto.
+
+ * window.h: change Fset_window_buffer signature.
+
+ * window.c (Fsplit_window): Use new Fset_window_buffer signature.
+ (Fset_window_buffer): allow recording of buffer if the window is
+ the selected window.
+ (window_loop): Use new Fset_window signature.
+
+2000-01-23 Daniel Pittman <daniel@danann.net>
+
+ * config.h.in: Added template for `HAVE_ATHENA_3D'
+
+2000-01-29 Andy Piper <andy@xemacs.org>
+
+ * glyphs-x.c (x_resize_subwindow): Try and catch bogus resizes.
+
+ * gutter.c (output_gutter): Don't output if the window isn't live.
+
+2000-01-28 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * glyphs-msw.c (mswindows_unmap_subwindow): Fix of corrupted patch
+ of 01/12/00: Moved SetFocus back here where it belongs.
+
+2000-01-23 Andy Piper <andy@xemacs.org>
+
+ * s/cygwin32.h: declare printer things.
+
+2000-01-26 Andy Piper <andy@xemacs.org>
+
+ * select.c (Fown_selection_internal): GCPRO bug fix from Mike
+ Alexander.
+
+2000-01-24 Andy Piper <andy@xemacs.org>
+
+ * glyphs-msw.c (mswindows_locate_pixmap_file): Expand filename.
+ (mswindows_button_instantiate): Make sure glyph is a pixmap.
+
+ * glyphs-widget.c (widget_instantiate): Avoid shadows.
+
+ * frame-msw.c (msprinter_init_frame_3): Nuke warning.
+
+ * glyphs-msw.c: (mswindows_string_to_color): remove declaration.
+
+ * redisplay-msw.c (mswindows_output_cursor): Avoid shadows.
+ (mswindows_output_display_block): Avoid local shadows.
+
+ * event-msw.c (mswindows_enqueue_magic_event): Avoid shadows.
+ (mswindows_enqueue_mouse_button_event): ditto.
+ (mswindows_handle_gui_wm_command): remove declaration.
+
+ * console-msw.c (mswindows_canonicalize_console_connection): Avoid
+ warnings.
+
+ * console-msw.h: Avoid shadows.
+ (mswindows_get_toolbar_button_text):
+ (emacs_mswindows_create_stream_pair):
+ (emacs_mswindows_delete_stream_pair):
+ (mswindows_handle_toolbar_wm_command): declare.
+
+ * device-msw.c (build_syscolor_string): Avoid shadows.
+
+2000-01-23 Andy Piper <andy@xemacs.org>
+
+ * glyphs-widget.c (widget_instantiate): reverse the items for
+ layouts so that children are in the expected order.
+
+2000-01-28 Martin Buchholz <martin@xemacs.org>
+
+ * ralloc.c: safe_bcopy ==> memmove
+ * gmalloc.c: Remove MEMMOVE_MISSING conditional code.
+ * s/msdos.h: Remove BCOPY macros.
+ * insdel.c (gap_right): Remove BCOPY conditional code.
+ * insdel.c (gap_left): Remove BCOPY conditional code.
+ XEmacs demands a working ANSI C compiler - hence memmove.
+
+ * regex.c (regex_compile): Remove accidental use of trigraphs.
+
+2000-01-27 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * event-msw.c (mswindows_enqueue_misc_user_event): Initialize
+ event timestamp.
+
+2000-01-26 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * event-msw.c (mswindows_drain_windows_queue): Added the
+ parameter.
+ (mswindows_need_event): Commented the call to
+ mswindows_drain_windows_queue().
+ (emacs_mswindows_quit_p): Lookup the windows for keyboard messages
+ only.
+
+ * console-msw.h: Moved a few function prototypes here from
+ event-msw.c.
+
+ * gui-msw.c (mswindows_handle_gui_wm_command): Changed the ID
+ parameter from unsigned short to unsigned long.
+ (Fmswindows_shell_execute): Added return value.
+
+2000-01-27 URA Hiroshi <ura@hiru.aoba.yokohama.jp>
+
+ * sysdep.c (init_system_name):
+ process-unix.c (unix_canonicalized_host_name):
+ Don't call freeaddrinfo() if getaddrinfo() fails.
+
+ * process-unix.c (unix_open_unix_network_stream):
+ Moved the code to get a port # into address loop.
+
+2000-01-27 Martin Buchholz <martin@xemacs.org>
+
+ * buffer.c (reinit_vars_of_buffer):
+ The right place to initialize conversion_in_dynarr and
+ conversion_out_dynarr.
+
+ * alloc.c (pdump): Use the real open() till sys_open() is functional.
+
+ * process-unix.c (unix_canonicalize_host_name): Muleize.
+ (unix_open_network_stream): Muleize.
+
+ * buffer.h: Fix up prototypes for ralloc.c functions.
+
+2000-01-27 URA Hiroshi <ura@hiru.aoba.yokohama.jp>
+ * config.h.in: added HAVE_GETADDRINFO and HAVE_GETNAMEINFO
+ * sysdep.c: In init_system_name(), add code to use getaddrinfo()
+ instead of gethostbyname()
+ * process-unix.c: In unix_canonicalize_host_name() and
+ unix_open_network_stream(), add code to use getaddrinfo()
+ instead of gethostbyname().
+
+2000-01-27 Daniel Pittman <daniel@danann.net>
+
+ * device-x.c (x_init_device): Warn at run-time if using Athena 3d
+ libs when built with flat Athena.
+
+2000-01-27 Martin Buchholz <martin@xemacs.org>
+
+ * ralloc.c: Replace SIZE (conflicts with Windows headers) with size_t.
+ Use coding standards for function prototypes.
+
+2000-01-25 Martin Buchholz <martin@xemacs.org>
+
+ * dialog-msw.c (push_lisp_string_as_unicode):
+ * doc.c (unparesseuxify_doc_string):
+ * dired.c (Fuser_name_completion_1):
+ * dired.c (Fuser_name_all_completions):
+ * dired.c (free_user_cache):
+ * dired.c (user_name_completion):
+ * console-x.c (get_display_arg_connection):
+ * minibuf.c (clear_echo_area_internal):
+ * minibuf.c (echo_area_append):
+ * eldap.c (Fldap_open):
+ * eldap.c (Fldap_search_internal):
+ * frame-x.c (x_set_frame_text_value):
+ * frame-x.c (x_set_frame_properties):
+ * frame-x.c (x_create_widgets):
+ * redisplay-tty.c (term_get_fkeys_1):
+ * objects-x.c (x_parse_nearest_color):
+ * objects-x.c (x_valid_color_name_p):
+ * objects-x.c (x_initialize_font_instance):
+ * objects-x.c (x_list_fonts):
+ * objects-x.c (x_find_charset_font):
+ * tooltalk.c (Fadd_tooltalk_message_arg):
+ * tooltalk.c (Fadd_tooltalk_pattern_attribute):
+ * tooltalk.c (Fadd_tooltalk_pattern_arg):
+ * process-unix.c (unix_create_process):
+ * ntproc.c (sys_spawnve):
+ * sound.c (Fplay_sound_file):
+ * sound.c (Fplay_sound):
+ * buffer.c (init_initial_directory):
+ * buffer.c (init_buffer):
+ * editfns.c (init_editfns):
+ * editfns.c (Ftemp_directory):
+ * editfns.c (Fuser_full_name):
+ * editfns.c (uncache_home_directory):
+ * editfns.c (get_home_directory):
+ * editfns.c (Fuser_home_directory):
+ * editfns.c (Fformat_time_string):
+ * editfns.c (Fcurrent_time_string):
+ * gui-x.c (button_item_to_widget_value):
+ * database.c (Fopen_database):
+ * event-Xt.c (x_to_emacs_keysym):
+ * event-Xt.c (x_event_to_emacs_event):
+ * event-Xt.c (describe_event_window):
+ * event-msw.c (mswindows_wnd_proc):
+ * glyphs-eimage.c (jpeg_instantiate):
+ * glyphs-eimage.c (gif_instantiate):
+ * glyphs-eimage.c (png_instantiate):
+ * glyphs-eimage.c (tiff_instantiate):
+ * glyphs-x.c (xbm_instantiate_1):
+ * glyphs-x.c (x_xbm_instantiate):
+ * glyphs-x.c (x_xface_instantiate):
+ * glyphs-x.c (autodetect_instantiate):
+ * glyphs-x.c (cursor_font_instantiate):
+ * glyphs-x.c (x_widget_instantiate):
+ * glyphs-x.c (x_widget_set_property):
+ * glyphs-x.c (x_widget_property):
+ * glyphs-x.c (BUILD_GLYPH_INST):
+ * print.c (write_string_to_stdio_stream):
+ * print.c (output_string):
+ * print.c (Falternate_debugging_output):
+ * print.c (Fexternal_debugging_output):
+ * glyphs-msw.c (extract_xpm_color_names):
+ * glyphs-msw.c (mswindows_xpm_instantiate):
+ * glyphs-msw.c (bmp_instantiate):
+ * glyphs-msw.c (resource_name_to_resource):
+ * glyphs-msw.c (mswindows_resource_instantiate):
+ * glyphs-msw.c (xbm_instantiate_1):
+ * glyphs-msw.c (mswindows_xbm_instantiate):
+ * glyphs-msw.c (mswindows_xface_instantiate):
+ * glyphs-msw.c (mswindows_widget_instantiate):
+ * glyphs-msw.c (add_tree_item):
+ * glyphs-msw.c (add_tab_item):
+ * glyphs-msw.c (mswindows_combo_box_instantiate):
+ * glyphs-msw.c (mswindows_widget_property):
+ * glyphs-msw.c (mswindows_combo_box_property):
+ * glyphs-msw.c (mswindows_widget_set_property):
+ * console.c (stuff_buffered_input):
+ * objects-msw.c (mswindows_initialize_color_instance):
+ * objects-msw.c (mswindows_valid_color_name_p):
+ * objects-msw.c (mswindows_list_fonts):
+ * objects-msw.c (mswindows_font_instance_truename):
+ * bytecode.c (optimize_compiled_function):
+ * select-x.c (symbol_to_x_atom):
+ * select-x.c (x_atom_to_symbol):
+ * select-x.c (hack_motif_clipboard_selection):
+ * select-x.c (selection_data_to_lisp_data):
+ * select-x.c (lisp_data_to_selection_data):
+ * select-x.c (Fx_get_cutbuffer_internal):
+ * select-x.c (Fx_store_cutbuffer_internal):
+ * buffer.h (TO_EXTERNAL_FORMAT): New function.
+ * buffer.h (TO_INTERNAL_FORMAT): New function.
+ * emacs.c (make_arg_list_1):
+ * emacs.c (make_argc_argv):
+ * emacs.c (main_1):
+ * emacs.c (Fdump_emacs):
+ * emacs.c (split_string_by_emchar_1):
+ * file-coding.h:
+ * lisp.h:
+ * lstream.h:
+ * symsinit.h:
+ * device-x.c (x_init_device):
+ * device-x.c (Fx_valid_keysym_name_p):
+ * device-x.c (Fx_get_font_path):
+ * device-x.c (Fx_set_font_path):
+ * glyphs.c (bitmap_to_lisp_data):
+ * glyphs.c (pixmap_to_lisp_data):
+ * alloc.c (make_ext_string): Use coding system arguments. Update
+ all callers.
+ * alloc.c (build_string):
+ * callproc.c (child_setup):
+ * callproc.c (init_callproc):
+ * fileio.c (lisp_strerror):
+ * fileio.c (directory_file_name):
+ * fileio.c (Fexpand_file_name):
+ * fileio.c (Ffile_truename):
+ * fileio.c (Fsysnetunam):
+ * fileio.c (Fdo_auto_save):
+ * sysdep.c (sys_readdir):
+ * tests.c: New file. Allow adding C tests.
+ Replace GET_* macros with a more comprehensible and flexible
+ interface, TO_INTERNAL_FORMAT() and TO_EXTERNAL_FORMAT().
+ Modify all calls.
+ Any coding system can be used to do format conversion.
+ Eliminate enum external_data_format.
+ Eliminate convert_to_external_format.
+ Eliminate convert_to_internal_format.
+ Make sure file-name, keyboard, terminal, and ctext are always
+ defined as coding systems or aliases. Make
+ file-name-coding-system, terminal-coding-system, and
+ keyboard-coding-system magical variables that are equivalent to
+ defining the corresponding coding system aliases.
+
+ * file-coding.c (Fcoding_system_canonical_name_p): New function.
+ * file-coding.c (Fcoding_system_alias_p): New function.
+ * file-coding.c (Fcoding_system_aliasee): New function.
+ * file-coding.c (append_suffix_to_symbol): New function.
+ * file-coding.c (dangling_coding_system_alias_p): New function.
+ * file-coding.c (Ffind_coding_system):
+ * file-coding.c (Fcopy_coding_system):
+ * file-coding.c (encode_coding_no_conversion):
+ * file-coding.c (syms_of_file_coding):
+ * file-coding.c (vars_of_file_coding):
+ Rewrite coding system alias code.
+ Allow nested aliases, like symbolic links.
+ Allow redefinition of coding system aliases.
+ Prevent existence of dangling coding system aliases.
+
+ * dired.c (Fuser_name_completion_1):
+ * dired.c (Fuser_name_all_completions):
+ A crash would happen if user did QUIT in the middle of building
+ user_name_cache. Remove redundant code in mainline and unwind_protect.
+
+ * lisp.h:
+ * dynarr.c (Dynarr_min_size): Make static. Increase value to 8.
+
+ * lstream.c (make_fixed_buffer_input_stream): Take a void *, not
+ an unsigned char *. Update all callers.
+
+2000-01-26 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * callproc.c (Fcall_process_internal): Ignore Vbinary-process_output.
+
+2000-01-25 Martin Buchholz <martin@xemacs.org>
+
+ * elhash.c (hentry_description): Use more portable definition.
+ (resize_hash_table): Initialize new hentries using
+ xnew_array_and_zero, thereby simplifying the code.
+
+ * mule-charset.c (make_charset): Make sure entire object is
+ intialized, to avoid Purify warnings.
+
+ * alloc.c (resize_string): Fix unlikely crash with big strings.
+
+2000-01-24 Martin Buchholz <martin@xemacs.org>
+
+ * realpath.c (xrealpath):
+ Don't call getwd().
+
+2000-01-25 Martin Buchholz <martin@xemacs.org>
+
+ * lread.c (read_bit_vector): Fix memory leak reading literal bit vectors.
+
+1999-12-28 Max Matveev <max@melbourne.sgi.com>
+
+ * unexelfsgi.c (unexec): Change the way we decide which segment
+ should be extended.
+
+ Assumption that .bss section should be outside the PT_LOADable
+ segment. On IRIX with version 6.2 and above, .bss (or .sbss, if
+ it's present) is inside the 'data' segment. This would fail the
+ test which was used to find a segment to grow and cover new
+ heap. Instead of this assumption, I created another one - on IRIX
+ the segment to grow should start below .bss and it's address
+ should extent above the end of .bss. Once this segment is
+ identified, it's grown to accommodate the new heap and new
+ zero-length .bss section is added at the end of .data2.
+
+2000-01-25 Martin Buchholz <martin@xemacs.org>
+
+ * eval.c (Feval): Wrong number of arguments should use original
+ function, not the indirect_function version of it.
+
+2000-01-24 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * glyphs-x.c (x_button_instantiate): Don't add image if
+ it is not a pixmap.
+ (x_locate_pixmap_file): Call Fexpand_file_name when file name
+ is relative.
+
+2000-01-21 Yoshiki Hayashi <yoshiki@xemacs.org>
+
+ * symeval.h (DEFVAR_LISP_MAGIC): Remove semicolon after macro
+ declaration.
+ (DEFVAR_INT_MAGIC): Ditto.
+ (DEFVAR_BOOL_MAGIC): Ditto.
+ * glyphs.h: Reindent backslash.
+
+2000-01-24 Martin Buchholz <martin@xemacs.org>
+
+ * glyphs-widget.c (layout_query_geometry):
+ (layout_layout): Use correct types for gheight, gwidth.
+
+2000-01-24 Martin Buchholz <martin@xemacs.org>
+
+ * EmacsManager.c (QueryGeometry): Purified.
+
+2000-01-23 Martin Buchholz <martin@xemacs.org>
+
+ * alloc.c (make_float): Make sure entire object is intialized, to
+ avoid Purify warnings.
+ (pdump_register_sub): Remove useless assignment.
+ (pdump): Use xmalloc, not malloc.
+ (pdump_load): Use xmalloc, not malloc.
+
+2000-01-23 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * callproc.c:
+ * dired-msw.c:
+ * fileio.c:
+ * process-nt.c:
+ * redisplay-msw.c:
+ * sysdep.c: Removed redundant #include <windows.h>
+
+2000-01-22 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * frame.c (delete_frame_internal): Do not delete device when its
+ implementation so declares.
+ (delete_frame_internal): Set device selected frame to nil when
+ last frame goes away.
+
+ * device-msw.c (msprinter_device_system_metrics): Implemented.
+ (mswindows_device_system_metrics): Added 'device-dpi property.
+
+ * device.c: (Fdevice_printer_p): Added.
+ Added 'offset-workspace device metric.
+
+ * console.h (device_metrics): Declared DM_offset_workspace.
+
+2000-01-23 Martin Buchholz <martin@xemacs.org>
+
+ * fileio.c (Ffile_truename): Remove pointless and confusing
+ initialization of elen.
+
+ * glyphs-widget.c: Compiler warning fixes.
+
+2000-01-23 Gunnar Evermann <ge204@eng.cam.ac.uk>
+
+ * process.h (PROCESS_LIVE_P): Modify to take a Lisp_Process
+ instead of a Lisp_Object as argument to make it consistent with
+ the other LIVE_P macros.
+ (CHECK_LIVE_PROCESS): New macro.
+
+ * process.c: Declare Qprocess_live_p.
+ (Fprocess_live_p): New function.
+ (create_process): Use PROCESS_LIVE_P.
+ (read_process_output): Ditto.
+ (set_process_filter): Ditto.
+ (Fdelete_process): Ditto.
+ (kill_buffer_processes): Ditto
+ (process_send_signal): Use CHECK_LIVE_PROCESS.
+ (Fprocess_input_coding_system): Check whether process is still
+ alive (fix PR#1061).
+ (Fprocess_output_coding_system): Ditto.
+ (Fprocess_coding_system): Ditto.
+ (Fset_process_input_coding_system): Ditto.
+ (Fset_process_output_coding_system): Ditto.
+
+2000-01-23 Andy Piper <andy@xemacs.org>
+
+ * glyphs.h (struct Lisp_Image_Instance): change format by unifying
+ layout and widget.
+
+ * glyphs.c (mark_image_instance): take into account changed
+ image_instance format.
+ (image_instance_equal): ditto.
+ (image_instance_hash): ditto.
+
+ * glyphs-widget.c (widget_instantiate): Incorporate layout
+ instantiation here. Delay layout of the layout until later.
+ (layout_instantiate): deleted.
+ (layout_query_geometry): new function. get the geometry of a
+ layout.
+ (layout_layout): layout a layout dynamically.
+ (image_instantiator_widget): New function - splitting up
+ image_instantiator_format_create_glyphs_widget for netwinder
+ compilation.
+ (image_instantiator_buttons):
+ (image_instantiator_edit_fields):
+ (image_instantiator_combo_box):
+ (image_instantiator_scrollbar):
+ (image_instantiator_progress_guage):
+ (image_instantiator_tree_view):
+ (image_instantiator_tab_control):
+ (image_instantiator_labels):
+ (image_instantiator_layout): ditto.
+ (image_instantiator_format_create_glyphs_widget): Call preceeding
+ functions.
+
+2000-01-22 Martin Buchholz <martin@xemacs.org>
+
+ * process.c (Fset_process_coding_system):
+ * device-x.c (Fx_keysym_hash_table):
+ Docstring fixes.
+
+ * lstream.c (Lstream_write): Return documented value, not 0.
+
+ * fileio.c (directory_file_name):
+ (Fsubstitute_in_file_name):
+ (Fsubstitute_insert_file_contents_internal):
+ (Fwrite_region_internal):
+ * emacs.c:
+ * sysdep.c:
+ * getloadavg.c:
+ * systty.h:
+ Remove vestigial APOLLO-conditional code.
+
+2000-01-21 Martin Buchholz <martin@xemacs.org>
+
+ * getpagesize.h: Add guard macros.
+ * libsst.h: Add guard macros.
+ * libst.h: Add guard macros.
+ * line-number.h: Add guard macros.
+ * ndir.h: Add guard macros.
+ * sysfloat.h: Add guard macros.
+ * sysfile.h: Add guard macros.
+ * sysproc.h: Add guard macros.
+ * syswait.h: Add guard macros.
+ * xintrinsic.h: Add guard macros.
+ * xintrinsicp.h: Add guard macros.
+ * xmmanager.h: Add guard macros.
+ * xmmanagerp.h: Add guard macros.
+ * xmprimitive.h: Add guard macros.
+ * xmu.h: Add guard macros.
+ * gpmevent.h: Add copyright statement. Add guard macros.
+ * miscplay.h: Add guard macros.
+ * *.h: Use consistent C-standards-approved guard macro names.
+
+ * opaque.c (make_opaque): Switch parameter order.
+ * opaque.h (make_opaque): Switch parameter order.
+ Update all callers.
+ * buffer.h (MAKE_MIRROR_TRT_TABLE): Use symbolic constant OPAQUE_CLEAR.
+
+ * config.h.in (type_checking_assert): Added.
+ (bufpos_checking_assert): Added.
+
+2000-01-21 Martin Buchholz <martin@xemacs.org>
+
+ * alloc.c: Harmless pdump changes.
+ - Use countof().
+ - spell alignment correctly.
+ * sysdep.c: Use countof()
+
+2000-01-20 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * console.c (create_console): Use CONMETH_OR_GIVEN when calling
+ initially_selected_for_input() console method, default to 0.
+ (semi_canonicalize_console_connection): Try to delegate to
+ canonicalize_console_connection if no such console method.
+ (canonicalize_console_connection): Vice versa.
+ (print_console): Do not print nil connection.
+
+ * console.h (XDEVIMPF_IS_A_PRINTER): Added.
+ (XDEVIMPF_NO_AUTO_REDISPLAY): Added.
+ (XDEVIMPF_FRAMELESS_OK): Added.
+ (CONSOLE_INHERITS_METHOD): Added.
+
+ * console-msw.c (mswindows_canonicalize_console_connection):
+ Added.
+ (mswindows_canonicalize_device_connection): Added.
+
+ * console-msw.h (struct msprinter_device): Added this struct and
+ accessor macros.
+ (mswindows_device): Made fontlist a lisp object.
+
+ * device.c (semi_canonicalize_device_connection): Try to delegate
+ to canonicalize_device_connection if no such console method.
+ (canonicalize_device_connection): Vice versa.
+ (print_device): Do not print nil connection.
+
+ * device-msw.c (mswindows_init_device): Call InitCommonControls
+ when have widgets.
+ (mswindows_delete_device): Removed fontlist deallocation.
+ (mswindows_mark_device): Added.
+
+ * events.c (event_equal): Added abort() at unreached code.
+ (event_hash): Ditto.
+
+ * faces.c (complex_vars_of_faces): Added Qmsprinter to the list of
+ fallback tags of Windows devices.
+
+ * general.c (syms_of_general): Initialized Qmsprinter.
+
+ * gutter.c (complex_vars_of_gutters): Added Qmsprinter to the list
+ of fallback tags of Windows devices.
+
+ * lisp.h: Declared Qmsprinter.
+
+ * objects-msw.c (font_enum_callback_2): Rewrote to build lisp list
+ of strings.
+ (mswindows_list_fonts): Ditto.
+ (mswindows_enumerate_fonts): Removed dependency on XDEVICE, so
+ that it can be used by both mswindows and msprinter devices.
+ (initialize_font_instance): Added.
+ (mswindows_initialize_font_instance): Use it.
+ (msprinter_initialize_font_instance): Added.
+
+ * redisplay.c (redisplay_device): Added the parameter AUTOMATIC
+ and implementation flags check.
+ (redisplay_without_hooks): Changed the call to the above.
+ (Fredraw_device): Ditto.
+ (Fredisplay_device): Ditto.
+
+ * redisplay-msw.c (get_frame_dc): Implemented.
+ (get_frame_compdc): Implemented.
+ (many functions): Use the two functions above to get device
+ contexts, ether for a window or a printer.
+
+2000-01-21 Olivier Galibert <galibert@pobox.com>
+
+ * symbols.c (reinit_symbols_once_early): Put Qzero/Qnull_pointer
+ initialization here.
+ (init_symbols_once_early): Call it.
+ * emacs.c (main_1): Call it.
+ * symsinit.h: Declare it.
+
+2000-01-19 Olivier Galibert <galibert@pobox.com>
+
+ * alloc.c: Use a lrecord_header * in the backtrace instead of a
+ Lisp_Object.
+ (pdump_backtrace): Ditto.
+ (pdump_register_object): Ditto. Cleanup use of the pointers.
+ (pdump_get_entry): Abort if trying to register a null pointer.
+ (pdump_dump_data): Cleanup types when relocating.
+ (pdump_dump_staticvec): Cleanup types w.r.t the reloc table.
+ (pdump_dump_rtables): Remove bad casts.
+ (pdump_load): Cleanup relocation w.r.t union type. Use a
+ Lisp_Object instead of a EMACS_INT for the hashtable
+ reorganization.
+
+2000-01-20 Martin Buchholz <martin@xemacs.org>
+
+ * emacs.c (main_1): Rearrange morass of #ifdef's for correctness.
+
+ * callproc.c (call_process_cleanup): Isolate WINDOWSNT code for clarity.
+
+ * EmacsManager.c (GeometryManager): Avoid use of CPP for clarity.
+
+ * *.[ch]: global-replace 's/_of_xselect/_of_select_x/g' *.[ch]
+
+2000-01-17 Kirill 'Big K' Katsnelson <kkm@dtmx.com>
+
+ * faces.h (FACE_STRIKETHRU_P): Added.
+
+ * glyphs-msw.c (mswindows_widget_hfont): Implemented, to take care
+ of font variants.
+
+ * redisplay-msw.c (mswindows_apply_face_effects): Deleted.
+ (mswindows_set_dc_font): New function, aware of font variants,
+ separated from mswindows_update_dc.
+
+ * objects-msw.h (struct mswindows_font_instance_data): Added
+ definition.
+
+ * objects-msw.c (mswindows_finalize_font_instance): Delete all
+ cached fonts and the data structure.
+ (mswindows_initialize_font_instance): Added creation of font data
+ structure.
+ (mswindows_print_font_instance): Print at least something.
+ (mswindows_create_font_variant): Implemented.
+ (mswindows_get_hfont): Implemented.
+
+2000-01-13 Fabrice Popineau <Fabrice.Popineau@supelec.fr>
+
+ * dired-msw.c: permute "sysdir.h" with "sysfile.h" because of
+ prototyping problem with msvc.
+
+ * emacs.c (main_1): added syms_of_gui_mswindows() call
+
+ * gui-msw.c: added "mswindows-shell-execute" lisp subr and
+ syms_of_gui_mswindows() function
+
+ * symsinit.h: added the prototype for syms_of_gui_mswindows()
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
(CCL_ReadMultibyteCharacter, CCL_WriteMultibyteCharacter): New
macros for CCL Commands.
(EXCMD): New macro.
- (ccl_driver): New case lable `CCL_Extention'.
+ (ccl_driver): New case label `CCL_Extension'.
(setup_ccl_program): Initialize the member `private_state' of CCL.
1999-07-08 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs.c: Rearrange NT initialization order so that
environment/registry variables will be properly entered into
- Vprocess_enviroment.
+ Vprocess_environment.
* fileio.c: replaced egetenv("HOME") with calls to the new
get_home_directory().
#undef XtOffset
#define XtOffset(p_type,field) \
((Cardinal) (((char *) (&(((p_type)0)->field))) - ((char *)0)))
-#define offset(field) XtOffset(EmacsFrame, emacs_frame.field)
+#define offset(field) XtOffset (EmacsFrame, emacs_frame.field)
static XtResource resources[] = {
- {XtNgeometry, XtCGeometry, XtRString, sizeof(String),
- offset (geometry), XtRString, (XtPointer) 0},
- {XtNiconic, XtCIconic, XtRBoolean, sizeof(Boolean),
- offset (iconic), XtRImmediate, (XtPointer) False},
-
- {XtNemacsFrame, XtCEmacsFrame, XtRPointer, sizeof (XtPointer),
- offset (frame), XtRImmediate, 0},
- {XtNmenubar, XtCMenubar, XtRBoolean, sizeof (Boolean),
- offset (menubar_p), XtRImmediate, (XtPointer) True},
- {XtNinitiallyUnmapped, XtCInitiallyUnmapped, XtRBoolean, sizeof (Boolean),
- offset (initially_unmapped), XtRImmediate, (XtPointer) False},
- {XtNminibuffer, XtCMinibuffer, XtRBoolean, sizeof (Boolean),
- offset (minibuffer), XtRImmediate, (XtPointer) True},
- {XtNunsplittable, XtCUnsplittable, XtRBoolean, sizeof (Boolean),
- offset (unsplittable), XtRImmediate, (XtPointer) False},
- {XtNinternalBorderWidth, XtCInternalBorderWidth, XtRInt, sizeof (int),
- offset (internal_border_width), XtRImmediate, (XtPointer)4},
+ { XtNgeometry, XtCGeometry,
+ XtRString, sizeof (String),
+ offset (geometry), XtRString, (XtPointer) 0 },
+ { XtNiconic, XtCIconic,
+ XtRBoolean, sizeof (Boolean),
+ offset (iconic), XtRImmediate, (XtPointer) False },
+
+ { XtNemacsFrame, XtCEmacsFrame,
+ XtRPointer, sizeof (XtPointer),
+ offset (frame), XtRImmediate, 0 },
+ { XtNmenubar, XtCMenubar,
+ XtRBoolean, sizeof (Boolean),
+ offset (menubar_p), XtRImmediate, (XtPointer) True },
+ { XtNinitiallyUnmapped, XtCInitiallyUnmapped,
+ XtRBoolean, sizeof (Boolean),
+ offset (initially_unmapped), XtRImmediate, (XtPointer) False },
+ { XtNminibuffer, XtCMinibuffer,
+ XtRBoolean, sizeof (Boolean),
+ offset (minibuffer), XtRImmediate, (XtPointer) True },
+ { XtNunsplittable, XtCUnsplittable,
+ XtRBoolean, sizeof (Boolean),
+ offset (unsplittable), XtRImmediate, (XtPointer) False },
+ { XtNinternalBorderWidth, XtCInternalBorderWidth,
+ XtRInt, sizeof (int),
+ offset (internal_border_width), XtRImmediate, (XtPointer)4 },
#ifdef HAVE_SCROLLBARS
- {XtNscrollBarWidth, XtCScrollBarWidth, XtRInt, sizeof (int),
- offset (scrollbar_width), XtRImmediate, (XtPointer)-1},
- {XtNscrollBarHeight, XtCScrollBarHeight, XtRInt, sizeof (int),
- offset (scrollbar_height), XtRImmediate, (XtPointer)-1},
- {XtNscrollBarPlacement, XtCScrollBarPlacement, XtRScrollBarPlacement,
- sizeof(unsigned char), offset(scrollbar_placement), XtRImmediate,
+ { XtNscrollBarWidth, XtCScrollBarWidth,
+ XtRInt, sizeof (int),
+ offset (scrollbar_width), XtRImmediate, (XtPointer)-1 },
+ { XtNscrollBarHeight, XtCScrollBarHeight,
+ XtRInt, sizeof (int),
+ offset (scrollbar_height), XtRImmediate, (XtPointer)-1 },
+ { XtNscrollBarPlacement, XtCScrollBarPlacement,
+ XtRScrollBarPlacement, sizeof (unsigned char),
+ offset (scrollbar_placement), XtRImmediate,
#if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID) || \
defined (LWLIB_SCROLLBARS_ATHENA3D)
- (XtPointer) XtBOTTOM_RIGHT
+ (XtPointer) XtBOTTOM_RIGHT
#else
- (XtPointer) XtBOTTOM_LEFT
+ (XtPointer) XtBOTTOM_LEFT
#endif
},
#endif /* HAVE_SCROLLBARS */
+
#ifdef HAVE_TOOLBARS
- {XtNtopToolBarHeight, XtCTopToolBarHeight, XtRInt, sizeof (int),
- offset (top_toolbar_height), XtRImmediate, (XtPointer)-1},
- {XtNbottomToolBarHeight, XtCBottomToolBarHeight, XtRInt, sizeof (int),
- offset (bottom_toolbar_height), XtRImmediate, (XtPointer)-1},
- {XtNleftToolBarWidth, XtCLeftToolBarWidth, XtRInt, sizeof (int),
- offset (left_toolbar_width), XtRImmediate, (XtPointer)-1},
- {XtNrightToolBarWidth, XtCRightToolBarWidth, XtRInt, sizeof (int),
- offset (right_toolbar_width), XtRImmediate, (XtPointer)-1},
- {XtNtopToolBarBorderWidth, XtCTopToolBarBorderWidth, XtRInt,
- sizeof (int),
- offset (top_toolbar_border_width), XtRImmediate, (XtPointer)-1},
- {XtNbottomToolBarBorderWidth, XtCBottomToolBarBorderWidth, XtRInt,
- sizeof (int),
- offset (bottom_toolbar_border_width), XtRImmediate, (XtPointer)-1},
- {XtNleftToolBarBorderWidth, XtCLeftToolBarBorderWidth, XtRInt,
- sizeof (int),
- offset (left_toolbar_border_width), XtRImmediate, (XtPointer)-1},
- {XtNrightToolBarBorderWidth, XtCRightToolBarBorderWidth, XtRInt,
- sizeof (int),
- offset (right_toolbar_border_width), XtRImmediate, (XtPointer)-1},
- {XtNtopToolBarShadowColor, XtCTopToolBarShadowColor, XtRPixel, sizeof(Pixel),
- offset(top_toolbar_shadow_pixel), XtRString, (XtPointer) "#000000"},
- {XtNbottomToolBarShadowColor, XtCBottomToolBarShadowColor, XtRPixel,
- sizeof(Pixel), offset(bottom_toolbar_shadow_pixel), XtRString, (XtPointer) "#000000"},
- {XtNbackgroundToolBarColor, XtCBackgroundToolBarColor, XtRPixel,
- sizeof(Pixel), offset(background_toolbar_pixel), XtRImmediate,
- (XtPointer)-1},
- {XtNforegroundToolBarColor, XtCForegroundToolBarColor, XtRPixel,
- sizeof(Pixel), offset(foreground_toolbar_pixel), XtRImmediate,
- (XtPointer)-1},
- {XtNtopToolBarShadowPixmap, XtCTopToolBarShadowPixmap, XtRPixmap,
- sizeof (Pixmap), offset(top_toolbar_shadow_pixmap), XtRImmediate,
- (XtPointer)None},
- {XtNbottomToolBarShadowPixmap, XtCBottomToolBarShadowPixmap, XtRPixmap,
- sizeof (Pixmap), offset(bottom_toolbar_shadow_pixmap), XtRImmediate,
- (XtPointer)None},
- {XtNtoolBarShadowThickness, XtCToolBarShadowThickness, XtRDimension,
- sizeof (Dimension), offset (toolbar_shadow_thickness), XtRImmediate,
- (XtPointer)2},
+ { XtNtopToolBarHeight, XtCTopToolBarHeight,
+ XtRInt, sizeof (int),
+ offset (top_toolbar_height), XtRImmediate, (XtPointer)-1 },
+ { XtNbottomToolBarHeight, XtCBottomToolBarHeight,
+ XtRInt, sizeof (int),
+ offset (bottom_toolbar_height), XtRImmediate, (XtPointer)-1 },
+ { XtNleftToolBarWidth, XtCLeftToolBarWidth,
+ XtRInt, sizeof (int),
+ offset (left_toolbar_width), XtRImmediate, (XtPointer)-1 },
+ { XtNrightToolBarWidth, XtCRightToolBarWidth,
+ XtRInt, sizeof (int),
+ offset (right_toolbar_width), XtRImmediate, (XtPointer)-1 },
+ { XtNtopToolBarBorderWidth, XtCTopToolBarBorderWidth,
+ XtRInt, sizeof (int),
+ offset (top_toolbar_border_width), XtRImmediate, (XtPointer)-1 },
+ { XtNbottomToolBarBorderWidth, XtCBottomToolBarBorderWidth,
+ XtRInt, sizeof (int),
+ offset (bottom_toolbar_border_width), XtRImmediate, (XtPointer)-1 },
+ { XtNleftToolBarBorderWidth, XtCLeftToolBarBorderWidth,
+ XtRInt, sizeof (int),
+ offset (left_toolbar_border_width), XtRImmediate, (XtPointer)-1 },
+ { XtNrightToolBarBorderWidth, XtCRightToolBarBorderWidth,
+ XtRInt, sizeof (int),
+ offset (right_toolbar_border_width), XtRImmediate, (XtPointer)-1 },
+ { XtNtopToolBarShadowColor, XtCTopToolBarShadowColor,
+ XtRPixel, sizeof (Pixel),
+ offset(top_toolbar_shadow_pixel), XtRString, (XtPointer) "#000000" },
+ { XtNbottomToolBarShadowColor, XtCBottomToolBarShadowColor,
+ XtRPixel, sizeof (Pixel),
+ offset (bottom_toolbar_shadow_pixel), XtRString, (XtPointer) "#000000" },
+ { XtNbackgroundToolBarColor, XtCBackgroundToolBarColor,
+ XtRPixel, sizeof (Pixel),
+ offset (background_toolbar_pixel), XtRImmediate, (XtPointer)-1 },
+ { XtNforegroundToolBarColor, XtCForegroundToolBarColor,
+ XtRPixel, sizeof (Pixel),
+ offset (foreground_toolbar_pixel), XtRImmediate, (XtPointer)-1 },
+ { XtNtopToolBarShadowPixmap, XtCTopToolBarShadowPixmap,
+ XtRPixmap, sizeof (Pixmap),
+ offset (top_toolbar_shadow_pixmap), XtRImmediate, (XtPointer)None },
+ { XtNbottomToolBarShadowPixmap, XtCBottomToolBarShadowPixmap,
+ XtRPixmap, sizeof (Pixmap),
+ offset (bottom_toolbar_shadow_pixmap), XtRImmediate, (XtPointer)None },
+ { XtNtoolBarShadowThickness, XtCToolBarShadowThickness,
+ XtRDimension, sizeof (Dimension),
+ offset (toolbar_shadow_thickness), XtRImmediate, (XtPointer)2 },
#endif /* HAVE_TOOLBARS */
- {XtNinterline, XtCInterline, XtRInt, sizeof (int),
- offset (interline), XtRImmediate, (XtPointer)0},
+
+ { XtNinterline, XtCInterline,
+ XtRInt, sizeof (int),
+ offset (interline), XtRImmediate, (XtPointer)0 },
{
#ifdef I18N4
- XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet),
+ XtNfontSet, XtCFontSet,
+ XtRFontSet, sizeof (XFontSet),
#else
- XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *),
+ XtNfont, XtCFont,
+ XtRFontStruct, sizeof (XFontStruct *),
#endif
offset(font), XtRImmediate, (XtPointer)0
},
- {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
- offset(foreground_pixel), XtRString, (XtPointer) "Black"},
- {XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
- offset(background_pixel), XtRString, (XtPointer) "Gray80"},
- {XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel),
- offset(cursor_color), XtRString, (XtPointer) "XtDefaultForeground"},
- {XtNbarCursor, XtCBarCursor, XtRBoolean, sizeof (Boolean),
- offset (bar_cursor), XtRImmediate, (XtPointer)0},
- {XtNvisualBell, XtCVisualBell, XtRBoolean, sizeof (Boolean),
- offset (visual_bell), XtRImmediate, (XtPointer)0},
- {XtNbellVolume, XtCBellVolume, XtRInt, sizeof (int),
- offset (bell_volume), XtRImmediate, (XtPointer)0},
- {XtNuseBackingStore, XtCUseBackingStore, XtRBoolean, sizeof (Boolean),
- offset (use_backing_store), XtRImmediate, (XtPointer)0},
- {XtNpreferredWidth, XtCPreferredWidth, XtRDimension, sizeof (Dimension),
- offset (preferred_width), XtRImmediate, (XtPointer)0},
- {XtNpreferredHeight, XtCPreferredHeight, XtRDimension, sizeof (Dimension),
- offset (preferred_height), XtRImmediate, (XtPointer)0},
+ { XtNforeground, XtCForeground,
+ XtRPixel, sizeof (Pixel),
+ offset(foreground_pixel), XtRString, (XtPointer) "Black" },
+ { XtNbackground, XtCBackground,
+ XtRPixel, sizeof (Pixel),
+ offset(background_pixel), XtRString, (XtPointer) "Gray80" },
+ { XtNcursorColor, XtCForeground,
+ XtRPixel, sizeof (Pixel),
+ offset(cursor_color), XtRString, (XtPointer) "XtDefaultForeground" },
+ { XtNbarCursor, XtCBarCursor,
+ XtRBoolean, sizeof (Boolean),
+ offset (bar_cursor), XtRImmediate, (XtPointer)0 },
+ { XtNvisualBell, XtCVisualBell,
+ XtRBoolean, sizeof (Boolean),
+ offset (visual_bell), XtRImmediate, (XtPointer)0 },
+ { XtNbellVolume, XtCBellVolume,
+ XtRInt, sizeof (int),
+ offset (bell_volume), XtRImmediate, (XtPointer)0 },
+ { XtNuseBackingStore, XtCUseBackingStore,
+ XtRBoolean, sizeof (Boolean),
+ offset (use_backing_store), XtRImmediate, (XtPointer)0 },
+ { XtNpreferredWidth, XtCPreferredWidth,
+ XtRDimension, sizeof (Dimension),
+ offset (preferred_width), XtRImmediate, (XtPointer)0 },
+ { XtNpreferredHeight, XtCPreferredHeight,
+ XtRDimension, sizeof (Dimension),
+ offset (preferred_height), XtRImmediate, (XtPointer)0 },
};
#undef offset
/* superclass */ &widgetClassRec,
#endif
/* class_name */ "EmacsFrame",
- /* widget_size */ sizeof(EmacsFrameRec),
+ /* widget_size */ sizeof (EmacsFrameRec),
/* class_initialize */ EmacsFrameClassInitialize,
/* class_part_initialize */ 0,
/* class_inited */ FALSE,
/* actions */ emacsFrameActionsTable,
/* num_actions */ XtNumber (emacsFrameActionsTable),
/* resources */ resources,
- /* resource_count */ XtNumber(resources),
+ /* resource_count */ XtNumber (resources),
/* xrm_class */ NULLQUARK,
/* compress_motion */ TRUE,
/* compress_exposure */ TRUE,
}
/* Xt string-to-scrollbar-placement converter */
-/* ### Convert this to a `new-style' converter (See XtAddTypeConverter) */
+/* #### Convert this to a `new-style' converter (See XtAddTypeConverter) */
/* This variable cannot be a stack variable. */
static unsigned char cvt_string_scrollbar_placement;
/* Synched up with: Not in FSF. */
-#ifndef _EmacsFrame_h
-#define _EmacsFrame_h
+#ifndef INCLUDED_EmacsFrame_h_
+#define INCLUDED_EmacsFrame_h_
#ifndef XtNminibuffer
#define XtNminibuffer "minibuffer"
void EmacsFrameRecomputeCellSize (Widget widget);
void EmacsFrameSetCharSize (Widget widget, int rows, int cols);
-#endif /* _EmacsFrame_h */
+#endif /* INCLUDED_EmacsFrame_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _EmacsFrameP_h
-#define _EmacsFrameP_h
+#ifndef INCLUDED_EmacsFrameP_h_
+#define INCLUDED_EmacsFrameP_h_
#include "xintrinsicp.h"
#include <X11/CoreP.h>
extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */
-
-
-#endif /* _EmacsFrameP_h */
+#endif /* INCLUDED_EmacsFrameP_h_ */
static XtResource resources[] = {
#define offset(field) XtOffset(EmacsManagerWidget, emacs_manager.field)
- { XtNresizeCallback, XtCCallback, XtRCallback, sizeof(XtCallbackList),
- offset(resize_callback), XtRImmediate, (XtPointer) 0 },
- { XtNqueryGeometryCallback, XtCCallback, XtRCallback, sizeof(XtCallbackList),
- offset(query_geometry_callback), XtRImmediate, (XtPointer) 0 },
- { XtNuserData, XtCUserData, XtRPointer, sizeof(XtPointer),
- offset(user_data), XtRImmediate, (XtPointer) 0 },
+ { XtNresizeCallback, XtCCallback,
+ XtRCallback, sizeof (XtCallbackList),
+ offset(resize_callback), XtRImmediate, (XtPointer) 0 },
+ { XtNqueryGeometryCallback, XtCCallback,
+ XtRCallback, sizeof (XtCallbackList),
+ offset(query_geometry_callback), XtRImmediate, (XtPointer) 0 },
+ { XtNuserData, XtCUserData,
+ XtRPointer, sizeof (XtPointer),
+ offset(user_data), XtRImmediate, (XtPointer) 0 },
};
/****************************************************************
/* superclass */ (WidgetClass) &compositeClassRec,
#endif
/* class_name */ "EmacsManager",
- /* widget_size */ sizeof(EmacsManagerRec),
+ /* widget_size */ sizeof (EmacsManagerRec),
/* class_initialize */ ClassInitialize,
/* class_part_init */ NULL,
/* class_inited */ FALSE,
{
EmacsManagerWidget emw = (EmacsManagerWidget) w;
EmacsManagerQueryGeometryStruct struc;
- int mask = request->request_mode & (CWWidth | CWHeight);
+ int request_mode = request->request_mode;
- struc.request_mode = mask;
- if (mask & CWWidth) struc.proposed_width = request->width;
- if (mask & CWHeight) struc.proposed_height = request->height;
+ struc.request_mode = request_mode;
+ struc.proposed_width = (request_mode & CWWidth) ? request->width : 0;
+ struc.proposed_height = (request_mode & CWHeight) ? request->height : 0;
XtCallCallbackList (w, emw->emacs_manager.query_geometry_callback, &struc);
reply->request_mode = CWWidth | CWHeight;
reply->width = struc.proposed_width;
reply->height = struc.proposed_height;
- if (((mask & CWWidth) && (request->width != reply->width)) ||
- ((mask & CWHeight) && (request->height != reply->height)))
+ if (((request_mode & CWWidth) && (request->width != reply->width)) ||
+ ((request_mode & CWHeight) && (request->height != reply->height)))
return XtGeometryAlmost;
return XtGeometryYes;
}
GeometryManager (Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply)
{
/* Sure, any changes are fine. */
-#define COPY(field, mask) \
- if (request->request_mode & mask) w->core.field = request->field
+#ifdef LWLIB_MENUBARS_MOTIF
/* The Motif menubar will merrily request a new size every time a
child is added or deleted. Blow it off because it doesn't know
what it's talking about. */
-#ifdef LWLIB_MENUBARS_MOTIF
- if (!(XtClass (w) == xmRowColumnWidgetClass))
+ if (XtClass (w) != xmRowColumnWidgetClass)
#endif /* LWLIB_MENUBARS_MOTIF */
{
- COPY (width, CWWidth);
- COPY (height, CWHeight);
+ if (request->request_mode & CWWidth) w->core.width = request->width;
+ if (request->request_mode & CWHeight) w->core.height = request->height;
}
- COPY (border_width, CWBorderWidth);
- COPY (x, CWX);
- COPY (y, CWY);
-#undef COPY
+ if (request->request_mode & CWBorderWidth)
+ w->core.border_width = request->border_width;
+ if (request->request_mode & CWX) w->core.x = request->x;
+ if (request->request_mode & CWY) w->core.y = request->y;
return XtGeometryYes;
}
{
if (!XtIsRealized (w))
{
- XtWidgetGeometry req, repl;
+ XtWidgetGeometry request, reply;
/* find out how big we'd like to be ... */
- req.request_mode = 0;
- XtQueryGeometry (w, &req, &repl);
- EmacsManagerChangeSize (w, repl.width, repl.height);
+ request.request_mode = 0;
+ XtQueryGeometry (w, &request, &reply);
+ EmacsManagerChangeSize (w, reply.width, reply.height);
}
}
/* Written by Ben Wing. */
-#ifndef _EmacsManager_h
-#define _EmacsManager_h
+#ifndef INCLUDED_EmacsManager_h_
+#define INCLUDED_EmacsManager_h_
#ifndef XtNresizeCallback
#define XtNresizeCallback "resizeCallback"
void EmacsManagerChangeSize (Widget w, Dimension width, Dimension height);
-#endif /* _EmacsManager_h */
+#endif /* INCLUDED_EmacsManager_h_ */
/* Written by Ben Wing. */
-#ifndef _EmacsManagerP_h
-#define _EmacsManagerP_h
+#ifndef INCLUDED_EmacsManagerP_h_
+#define INCLUDED_EmacsManagerP_h_
#include "xintrinsicp.h"
extern EmacsManagerClassRec emacsManagerClassRec; /* class pointer */
-#endif /* _EmacsManagerP_h */
+#endif /* INCLUDED_EmacsManagerP_h_ */
the default values for X and Y, for no obvious reason. This
causes Shell to indicate that the defaults of (0,0) were
program-specified, instead of letting the WM do what it wants. */
- {XtNx, XtCPosition, XtRPosition, sizeof(Position),
- coreoffset (x), XtRImmediate, (XtPointer)BIGSIZE},
- {XtNy, XtCPosition, XtRPosition, sizeof(Position),
- coreoffset (y), XtRImmediate, (XtPointer)BIGSIZE},
+ { XtNx, XtCPosition,
+ XtRPosition, sizeof (Position),
+ coreoffset (x), XtRImmediate, (XtPointer)BIGSIZE },
+ { XtNy, XtCPosition,
+ XtRPosition, sizeof (Position),
+ coreoffset (y), XtRImmediate, (XtPointer)BIGSIZE },
#endif
- { XtNwidthCells, XtCWidthCells, XtRInt, sizeof(int),
- offset (width_cells), XtRImmediate, (XtPointer)0},
- { XtNheightCells, XtCHeightCells, XtRInt, sizeof(int),
- offset (height_cells), XtRImmediate, (XtPointer)0},
- { XtNminWidthCells, XtCMinWidthCells, XtRInt, sizeof(int),
- offset (min_width_cells), XtRImmediate, (XtPointer)0},
- { XtNminHeightCells, XtCMinHeightCells, XtRInt, sizeof(int),
- offset (min_height_cells), XtRImmediate, (XtPointer)0},
+ { XtNwidthCells, XtCWidthCells,
+ XtRInt, sizeof (int),
+ offset (width_cells), XtRImmediate, (XtPointer)0 },
+ { XtNheightCells, XtCHeightCells,
+ XtRInt, sizeof (int),
+ offset (height_cells), XtRImmediate, (XtPointer)0 },
+ { XtNminWidthCells, XtCMinWidthCells,
+ XtRInt, sizeof (int),
+ offset (min_width_cells), XtRImmediate, (XtPointer)0 },
+ { XtNminHeightCells, XtCMinHeightCells,
+ XtRInt, sizeof (int),
+ offset (min_height_cells), XtRImmediate, (XtPointer)0 },
};
static CompositeClassExtensionRec compositeClassExtRec = {
NULL,
NULLQUARK,
XtCompositeExtensionVersion,
- sizeof(CompositeClassExtensionRec),
+ sizeof (CompositeClassExtensionRec),
TRUE,
};
NULL,
NULLQUARK,
XtShellExtensionVersion,
- sizeof(ShellClassExtensionRec),
+ sizeof (ShellClassExtensionRec),
RootGeometryManager
};
*/
/* superclass */ (WidgetClass) &SUPERCLASS_CLASS_REC,
/* class_name */ (String) EMACS_SHELL_CLASS_NAME,
- /* size */ sizeof(EMACS_SHELL_REC),
+ /* size */ sizeof (EMACS_SHELL_REC),
/* Class Initializer */ NULL,
/* class_part_initialize*/ NULL, /* XtInheritClassPartInitialize, */
/* Class init'ed ? */ FALSE,
/* Written by Ben Wing, May, 1994. */
-#ifndef _EmacsShell_h
-#define _EmacsShell_h
+#ifndef INCLUDED_EmacsShell_h_
+#define INCLUDED_EmacsShell_h_
#ifndef XtNwidthCells
#define XtNwidthCells "widthCells"
void EmacsShellSetPositionUserSpecified (Widget gw);
void EmacsShellSmashIconicHint (Widget shell, int iconic_p);
-#endif /* _EmacsShell_h */
+#endif /* INCLUDED_EmacsShell_h_ */
/* Written by Ben Wing, May, 1994. */
-#ifndef _EmacsShellP_h
-#define _EmacsShellP_h
+#ifndef INCLUDED_EmacsShellP_h_
+#define INCLUDED_EmacsShellP_h_
#include "xintrinsic.h"
#include <X11/ShellP.h>
/* class pointer */
extern TransientEmacsShellClassRec transientEmacsShellClassRec;
-#endif /* _EmacsShellP_h */
+#endif /* INCLUDED_EmacsShellP_h_ */
static XtResource resources[] = {
#define offset(field) XtOffset(ExternalClientWidget, externalClient.field)
- { XtNshellTimeout, XtCShellTimeout, XtRInt, sizeof(int),
- offset(shell_timeout), XtRImmediate,(XtPointer)DEFAULT_WM_TIMEOUT},
- { XtNdeadShell, XtCDeadShell, XtRBoolean, sizeof(Boolean),
- offset(dead_shell), XtRImmediate, (XtPointer)False},
+ { XtNshellTimeout, XtCShellTimeout,
+ XtRInt, sizeof (int),
+ offset(shell_timeout), XtRImmediate,(XtPointer)DEFAULT_WM_TIMEOUT },
+ { XtNdeadShell, XtCDeadShell,
+ XtRBoolean, sizeof (Boolean),
+ offset(dead_shell), XtRImmediate, (XtPointer)False },
#ifdef EXTW_USES_MOTIF
- { XmNnavigationType, XmCNavigationType, XmRNavigationType,
- sizeof(XmNavigationType), XtOffset(ExternalClientWidget,
- primitive.navigation_type), XtRImmediate,
- (XtPointer)XmTAB_GROUP},
+ { XmNnavigationType, XmCNavigationType,
+ XmRNavigationType, sizeof (XmNavigationType),
+ XtOffset (ExternalClientWidget, primitive.navigation_type),
+ XtRImmediate, (XtPointer)XmTAB_GROUP },
#endif
- { XtNemacsProcID, XtCEmacsProcID, XtRString, sizeof(String),
- offset(emacs_procid), XtRImmediate, (XtPointer)NULL},
- { XtNshellReadyCallback, XtCCallback, XtRCallback, sizeof(XtCallbackList),
- offset(shell_ready_callback), XtRImmediate, (XtPointer)NULL},
- { XtNshellName, XtCShellName, XtRString, sizeof(String),
- offset(shell_name), XtRImmediate, (XtPointer)NULL},
- { XtNuseToolTalk, XtCUseToolTalk, XtRBoolean, sizeof(Boolean),
- offset(use_tooltalk), XtRImmediate, (XtPointer)False}
+ { XtNemacsProcID, XtCEmacsProcID,
+ XtRString, sizeof (String),
+ offset(emacs_procid), XtRImmediate, (XtPointer)NULL },
+ { XtNshellReadyCallback, XtCCallback,
+ XtRCallback, sizeof (XtCallbackList),
+ offset(shell_ready_callback), XtRImmediate, (XtPointer)NULL },
+ { XtNshellName, XtCShellName,
+ XtRString, sizeof (String),
+ offset(shell_name), XtRImmediate, (XtPointer)NULL },
+ { XtNuseToolTalk, XtCUseToolTalk,
+ XtRBoolean, sizeof (Boolean),
+ offset(use_tooltalk), XtRImmediate, (XtPointer)False }
};
static XtActionsRec actions[] = {
/* superclass */ (WidgetClass) &coreClassRec,
#endif
/* class_name */ "ExternalClient",
- /* size */ sizeof(ExternalClientRec),
+ /* size */ sizeof (ExternalClientRec),
/* Class Initializer */ NULL,
/* class_part_initialize*/ NULL, /* XtInheritClassPartInitialize, */
/* Class init'ed ? */ FALSE,
/* initialize */ externalClientInitialize,
/* initialize_notify */ NULL,
- /* realize */ externalClientRealize,
+ /* realize */ externalClientRealize,
/* actions */ actions,
/* num_actions */ XtNumber (actions),
/* resources */ resources,
/* resize */ XtInheritResize,
/* expose */ NULL,
/* set_values */ NULL, /* XtInheritSetValues, */
- /* set_values_hook */ NULL,
- /* set_values_almost */ XtInheritSetValuesAlmost,
- /* get_values_hook */ NULL,
+ /* set_values_hook */ NULL,
+ /* set_values_almost */ XtInheritSetValuesAlmost,
+ /* get_values_hook */ NULL,
/* accept_focus */ NULL,
/* intrinsics version */ XtVersion,
/* callback offsets */ NULL,
-- BPW
*/
-
+
XtOverrideTranslations (new,
XtParseTranslationTable ("None<Key>Tab:\n"
"<FocusIn>:focusIn()\n"
"<Leave>:leave()\n"));
#endif
-
+
XtAddEventHandler (new, 0, TRUE, EventHandler, (XtPointer) NULL);
ecw->externalClient.shell_ready = False;
tt_callback(Tt_message m, Tt_pattern p)
{
ExternalClientWidget ecw = (ExternalClientWidget)tt_message_user (m, 0);
-
+
switch (tt_message_state(m))
{
case TT_FAILED:
ecw->externalClient.shell_ready_callback, NULL);
break;
}
-
+
tt_message_destroy (m);
return TT_CALLBACK_PROCESSED;
}
tt_message_class_set (m, TT_REQUEST);
tt_message_arg_add (m, TT_IN, "string", name);
tt_message_iarg_add (m, TT_IN, "int", win);
- tt_message_arg_add (m, TT_OUT, "string", NULL);
+ tt_message_arg_add (m, TT_OUT, "string", NULL);
tt_message_user_set (m, 0, (void *)ecw);
tt_message_callback_add (m, tt_callback);
if (ecw->externalClient.emacs_procid)
externalClientRealize (Widget w, XtValueMask *vm, XSetWindowAttributes *attrs)
{
ExternalClientWidget ecw = (ExternalClientWidget)w;
-
-#ifdef EXTW_USES_MOTIF
+
+#ifdef EXTW_USES_MOTIF
(*xmPrimitiveWidgetClass->core_class.realize) (w, vm, attrs);
#else
(*coreWidgetClass->core_class.realize) (w, vm, attrs);
XSync (XtDisplay (w), False);
send_tooltalk_handshake (ecw, XtWindow (w), XtName (w));
}
-#endif
+#endif
}
{
struct ww_list *w1, *w2;
Widget wid = 0;
-
+
for (w1=ww_list, w2=w1->next; w2; w1=w2, w2=w2->next)
if (w2->win == win)
{
XSetWindowAttributes xswa;
XtValueMask mask;
Widget wid = (Widget) w;
-
+
w->externalClient.shell_ready = False;
XtRemoveEventHandler (wid, w->externalClient.event_mask,
FALSE, MaskableEventHandler, (XtPointer) NULL);
my_error_handler (Display *display, XErrorEvent *xev)
{
Widget wid;
-
+
if (xev->error_code != BadWindow)
goto call_old;
wid = remove_ww (xev->resourceid);
end_connection ((ExternalClientWidget) wid);
return 0;
}
-
+
call_old:
return error_old_handler (display, xev);
}
/* closure and continue_to_dispatch unused */
{
ExternalClientWidget w = (ExternalClientWidget) wid;
-
+
if (w->externalClient.shell_ready)
{
if (event->type == KeyPress || event->type == KeyRelease ||
XSync (XtDisplay (wid), 0); /* make sure that any BadWindow errors
(meaning the server died) get handled
before XSendEvent is called again. */
-
+
}
}
/* closure and continue_to_dispatch unused */
{
ExternalClientWidget w = (ExternalClientWidget) wid;
-
+
if (w->core.window != event->xany.window)
{
XtAppErrorMsg (XtWidgetToApplicationContext (wid),
(String *)NULL, (Cardinal *)NULL);
return;
}
-
+
if (event->type == ClientMessage &&
event->xclient.message_type == a_EXTW_NOTIFY &&
event->xclient.data.l[0] == extw_shell_send)
switch (event->xclient.data.l[1])
{
-
+
case extw_notify_qg:
/* shell is alive again. */
-
+
w->externalClient.dead_shell = False;
break;
-
+
case extw_notify_gm:
{
XtWidgetGeometry xwg, xwg_return;
XtGeometryResult result;
-
+
extw_get_geometry_value (XtDisplay (wid), XtWindow (wid),
a_EXTW_GEOMETRY_MANAGER, &xwg);
result = XtMakeGeometryRequest (wid, &xwg, &xwg_return);
-
+
extw_send_geometry_value (XtDisplay (wid), XtWindow (wid),
a_EXTW_GEOMETRY_MANAGER, extw_notify_gm,
result == XtGeometryAlmost ? &xwg_return :
NULL, result);
break;
}
-
+
case extw_notify_init:
w->externalClient.shell_ready = True;
w->externalClient.event_window = event->xclient.data.l[2];
w->externalClient.event_mask = event->xclient.data.l[3];
add_ww (w->externalClient.event_window, (Widget) w);
-
+
XtAddEventHandler (wid, w->externalClient.event_mask,
FALSE, MaskableEventHandler, (XtPointer) NULL);
#ifdef EXTW_USES_MOTIF
0, 0);
#endif
break;
-
+
case extw_notify_end:
end_connection (w);
remove_ww (w->externalClient.event_window);
break;
-
+
case extw_notify_set_focus:
#ifdef EXTW_USES_MOTIF
XmProcessTraversal (wid, XmTRAVERSE_CURRENT);
XtSetKeyboardFocus (wid, None);
#endif
break;
-
+
}
}
Widget wid;
{
ExternalClientWidget w = (ExternalClientWidget)wid;
-
+
NOTIFY(w, extw_notify_end, 0, 0, 0);
}
unsigned long request_num;
Display *display = XtDisplay(gw);
XtWidgetGeometry req = *request; /* don't modify caller's structure */
-
+
if (!XtIsRealized((Widget)w) || !w->externalClient.shell_ready)
return XtGeometryYes;
-
+
if (w->externalClient.dead_shell == TRUE)
/* The shell is sick. */
return XtGeometryNo;
-
+
req.sibling = None;
req.request_mode &= ~CWSibling;
request_num = NextRequest(display);
Cardinal *num_params)
{
ExternalClientWidget ecw = (ExternalClientWidget) w;
-
+
if (event->xfocus.send_event && !ecw->externalClient.has_focus) {
ecw->externalClient.has_focus = True;
NOTIFY(ecw, extw_notify_focus_in, 0, 0, 0);
Cardinal *num_params)
{
ExternalClientWidget ecw = (ExternalClientWidget) w;
-
+
if (event->xfocus.send_event && ecw->externalClient.has_focus) {
ecw->externalClient.has_focus = False;
NOTIFY(ecw, extw_notify_focus_out, 0, 0, 0);
Cardinal *num_params)
{
ExternalClientWidget ecw = (ExternalClientWidget) w;
-
+
if (
#ifdef EXTW_USES_MOTIF
_XmGetFocusPolicy (w) != XmEXPLICIT &&
Cardinal *num_params)
{
ExternalClientWidget ecw = (ExternalClientWidget) w;
-
+
if (
#ifdef EXTW_USES_MOTIF
_XmGetFocusPolicy (w) != XmEXPLICIT &&
/* Written by Ben Wing. */
-#ifndef _ExternalClient_h
-#define _ExternalClient_h
+#ifndef INCLUDED_ExternalClient_h_
+#define INCLUDED_ExternalClient_h_
#ifndef XtNshellTimeout
#define XtNshellTimeout "shellTimeout"
void ExternalClientInitialize (Display *display, Window win);
void ExternalClientEventHandler (Display *display, Window win, XEvent *event);
-#endif /* _ExternalClient_h */
+#endif /* INCLUDED_ExternalClient_h_ */
/* Written by Ben Wing. */
-#ifndef _ExternalClientP_h
-#define _ExternalClientP_h
+#ifndef INCLUDED_ExternalClientP_h_
+#define INCLUDED_ExternalClientP_h_
#include "ExternalClient.h"
#ifdef EXTW_USES_MOTIF
extern ExternalClientClassRec externalClientClassRec; /* class pointer */
-#endif /* _ExternalClientP_h */
+#endif /* INCLUDED_ExternalClientP_h_ */
static XtResource resources[] = {
#define offset(field) XtOffset(ExternalShellWidget, externalShell.field)
- { XtNwindow, XtCWindow, XtRWindow, sizeof (Window),
- offset (external_window), XtRImmediate, (XtPointer)0},
- { XtNclientTimeout, XtCClientTimeout, XtRInt, sizeof(int),
- offset(client_timeout), XtRImmediate,(XtPointer)DEFAULT_WM_TIMEOUT},
- { XtNdeadClient, XtCDeadClient, XtRBoolean, sizeof(Boolean),
- offset(dead_client), XtRImmediate, (XtPointer)False},
+ { XtNwindow, XtCWindow,
+ XtRWindow, sizeof (Window),
+ offset (external_window), XtRImmediate, (XtPointer)0 },
+ { XtNclientTimeout, XtCClientTimeout,
+ XtRInt, sizeof (int),
+ offset(client_timeout), XtRImmediate,(XtPointer)DEFAULT_WM_TIMEOUT },
+ { XtNdeadClient, XtCDeadClient,
+ XtRBoolean, sizeof (Boolean),
+ offset(dead_client), XtRImmediate, (XtPointer)False },
};
static CompositeClassExtensionRec compositeClassExtRec = {
NULL,
NULLQUARK,
XtCompositeExtensionVersion,
- sizeof(CompositeClassExtensionRec),
+ sizeof (CompositeClassExtensionRec),
TRUE,
};
NULL,
NULLQUARK,
XtShellExtensionVersion,
- sizeof(ShellClassExtensionRec),
+ sizeof (ShellClassExtensionRec),
ExternalShellRootGeometryManager
};
*/
/* superclass */ (WidgetClass) &shellClassRec,
/* class_name */ "ExternalShell",
- /* size */ sizeof(ExternalShellRec),
+ /* size */ sizeof (ExternalShellRec),
/* Class Initializer */ NULL,
/* class_part_initialize*/ NULL, /* XtInheritClassPartInitialize, */
/* Class init'ed ? */ FALSE,
/* resize */ XtInheritResize,
/* expose */ NULL,
/* set_values */ NULL, /* XtInheritSetValues, */
- /* set_values_hook */ NULL,
- /* set_values_almost */ XtInheritSetValuesAlmost,
- /* get_values_hook */ NULL,
+ /* set_values_hook */ NULL,
+ /* set_values_almost */ XtInheritSetValuesAlmost,
+ /* get_values_hook */ NULL,
/* accept_focus */ NULL,
/* intrinsics version */ XtVersion,
/* callback offsets */ NULL,
case extw_notify_focus_in: {
XFocusChangeEvent evnt;
-
+
evnt.type = FocusIn;
evnt.serial = LastKnownRequestProcessed (XtDisplay (wid));
evnt.send_event = True;
#endif
break;
}
-
+
case extw_notify_focus_out: {
XFocusChangeEvent evnt;
-
+
evnt.type = FocusOut;
evnt.serial = LastKnownRequestProcessed (XtDisplay (wid));
evnt.send_event = True;
int x, y, win_gravity = -1, flag;
XSizeHints hints;
Window win = w->externalShell.external_window;
-
+
{
Window dummy_root;
unsigned int dummy_bd_width, dummy_depth, width, height;
-
+
/* determine the existing size of the window. */
XGetGeometry(XtDisplay(W), win, &dummy_root, &x, &y, &width,
&height, &dummy_bd_width, &dummy_depth);
w->core.background_pixmap =
(*childP)->core.background_pixmap;
} else {
- attr->background_pixel =
- w->core.background_pixel =
+ attr->background_pixel =
+ w->core.background_pixel =
(*childP)->core.background_pixel;
}
break;
/* Written by Ben Wing, September 1993. */
-#ifndef _ExternalShell_h
-#define _ExternalShell_h
+#ifndef INCLUDED_ExternalShell_h_
+#define INCLUDED_ExternalShell_h_
#ifndef XtNwindow
#define XtNwindow "window"
#define is_external_shell(w) (XtClass (w) == externalShellWidgetClass)
-#endif /* _ExternalShell_h */
+#endif /* INCLUDED_ExternalShell_h_ */
/* Written by Ben Wing, September 1993. */
-#ifndef _ExternalShellP_h
-#define _ExternalShellP_h
+#ifndef INCLUDED_ExternalShellP_h_
+#define INCLUDED_ExternalShellP_h_
#include "xintrinsic.h"
#include <X11/ShellP.h>
extern ExternalShellClassRec externalShellClassRec; /* class pointer */
-#endif /* _ExternalShellP_h */
+#endif /* INCLUDED_ExternalShellP_h_ */
cd ../lwlib && $(RECURSIVE_MAKE)
x_objs=balloon_help.o balloon-x.o console-x.o device-x.o event-Xt.o frame-x.o\
- glyphs-x.o objects-x.o redisplay-x.o select-x.o xgccache.o
+ glyphs-x.o objects-x.o redisplay-x.o select-x.o xgccache.o
#ifdef AIX4
LIBI18N = -li18n
# define EXTW_LINK(objs, output) $(CC) -shared objs -Xlinker -z -Xlinker text -o output
extw_link_beg = $(CC) -shared
extw_link_mid = -Xlinker -z -Xlinker text -o
-extw_link_end =
+extw_link_end =
## I cannot figure out how to do shared a.out libraries, so just punt.
# elif !defined (LINUX) || defined (__ELF__)
# define EXTW_LINK(objs, output) $(CC) -shared objs -o output
extw_link_beg = $(CC) -shared
extw_link_mid = -o
-extw_link_end =
+extw_link_end =
# endif
# elif defined (USG5)
# if defined (IRIX)
# define EXTW_LINK(objs, output) $(LD) -shared -g -check_registry ${TOOLROOT}/usr/lib/so_locations objs -o output
-extw_link_beg = $(LD) -shared -g -check_registry ${TOOLROOT}/usr/lib/so_locations
-extw_link_mid = -o
-extw_link_end =
+extw_link_beg = $(LD) -shared -g -check_registry ${TOOLROOT}/usr/lib/so_locations
+extw_link_mid = -o
+extw_link_end =
# else /* not IRIX */
# define EXTW_LINK(objs, output) $(CC) -G objs -z text -o output
extw_link_beg = $(CC) -G
extw_link_mid = -z text -o
-extw_link_end =
+extw_link_end =
# endif /* not IRIX */
# else /* not USG5 */
# if defined (DEC_ALPHA) && defined (OSF1)
# define EXTW_LINK(objs, output) $(LD) $(ldflags) $(ld_switch_shared) -d objs -o output $(LIBES)
-extw_link_beg = $(LD) $(ldflags) $(ld_switch_shared) -d
-extw_link_mid = -o
+extw_link_beg = $(LD) $(ldflags) $(ld_switch_shared) -d
+extw_link_mid = -o
extw_link_end = $(LIBES)
# else /* !(DEC_ALPHA && OSF1) */
# define EXTW_LINK(objs, output) $(LD) -dc objs -assert pure-text -o output
extw_link_beg = $(LD) -dc
extw_link_mid = -assert pure-text -o
-extw_link_end =
+extw_link_end =
# endif /* !(DEC_ALPHA && OSF1) */
# endif /* not USG5 */
if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \
$(RECURSIVE_MAKE) $@;
#else
- @$(RM) $@
- -${dump_temacs}
+ @$(RM) $@ xemacs.dmp
+ ${dump_temacs}
+#ifdef PDUMP
+ @mv temacs $@
+#endif
@echo "Testing for Lisp shadows ..."
@./${PROGNAME} -batch -vanilla -f list-load-path-shadows
#endif
-fastdump: temacs
+fastdump: temacs
@$(RM) ${PROGNAME} && touch SATISFIED
-${dump_temacs}
@./${PROGNAME} -batch -vanilla -f list-load-path-shadows
temacs: $(temacs_deps)
$(LD) $(temacs_link_args)
+#ifdef PDUMP
+ @$(RM) xemacs.dmp
+#endif
.PHONY : run-temacs
##
## Purify
PURIFY_PROG = purify
-PURIFY_FLAGS = -chain-length=32 -ignore-signals=SIGPOLL -threads=yes \
+PURIFY_FLAGS =\
+#ifdef PDUMP
+ -search-mmaps=yes\
+#endif
+ -chain-length=32 -ignore-signals=SIGPOLL -threads=yes\
-cache-dir=./purecache -always-use-cache-dir=yes
+
PURIFY_LIBS = -lpthread
puremacs: $(temacs_deps)
$(PURIFY_PROG) $(PURIFY_FLAGS) $(LD) $(temacs_link_args) $(PURIFY_LIBS)
\f
struct abbrev_match_mapper_closure {
struct buffer *buf;
- struct Lisp_Char_Table *chartab;
+ Lisp_Char_Table *chartab;
Charcount point, maxlen;
- struct Lisp_Symbol *found;
+ Lisp_Symbol *found;
};
/* For use by abbrev_match(): Match SYMBOL's name against buffer text
struct abbrev_match_mapper_closure *closure =
(struct abbrev_match_mapper_closure *)arg;
Charcount abbrev_length;
- struct Lisp_Symbol *sym = XSYMBOL (symbol);
- struct Lisp_String *abbrev;
+ Lisp_Symbol *sym = XSYMBOL (symbol);
+ Lisp_String *abbrev;
/* symbol_value should be OK here, because abbrevs are not expected
to contain any SYMBOL_MAGIC stuff. */
/* Match the buffer text against names of symbols in obarray. Returns
the matching symbol, or 0 if not found. */
-static struct Lisp_Symbol *
+static Lisp_Symbol *
abbrev_match (struct buffer *buf, Lisp_Object obarray)
{
struct abbrev_match_mapper_closure closure;
This speed difference should be unnoticeable, though. I have tested
the degenerated cases of thousands of abbrevs being defined, and
abbrev_match() was still fast enough for normal operation. */
-static struct Lisp_Symbol *
+static Lisp_Symbol *
abbrev_oblookup (struct buffer *buf, Lisp_Object obarray)
{
Bufpos wordstart, wordend;
Bufpos point; /* position of point */
Bufpos abbrev_start; /* position of abbreviation beginning */
- struct Lisp_Symbol *(*fun) (struct buffer *, Lisp_Object);
+ Lisp_Symbol *(*fun) (struct buffer *, Lisp_Object);
- struct Lisp_Symbol *abbrev_symbol;
- struct Lisp_String *abbrev_string;
+ Lisp_Symbol *abbrev_symbol;
+ Lisp_String *abbrev_string;
Lisp_Object expansion, count, hook;
Charcount abbrev_length;
int lccount, uccount;
/* like malloc and realloc but check for no memory left, and block input. */
-#ifdef xmalloc
#undef xmalloc
-#endif
-
void *
xmalloc (size_t size)
{
return val;
}
-#ifdef xcalloc
#undef xcalloc
-#endif
-
static void *
xcalloc (size_t nelem, size_t elsize)
{
return xcalloc (size, sizeof (char));
}
-#ifdef xrealloc
#undef xrealloc
-#endif
-
void *
xrealloc (void *block, size_t size)
{
#endif /* !ERROR_CHECK_GC */
-#ifdef xstrdup
#undef xstrdup
-#endif
-
char *
xstrdup (CONST char *str)
{
#endif
#endif
+#if !((defined HAVE_X_WINDOWS) && \
+ (defined (HAVE_MENUBARS) || \
+ defined (HAVE_SCROLLBARS) || \
+ defined (HAVE_DIALOGS) || \
+ defined (HAVE_TOOLBARS) || \
+ defined (HAVE_WIDGETS)))
+unsigned char lrecord_popup_data;
+#endif
+
#ifndef HAVE_TOOLBARS
unsigned char lrecord_toolbar_button;
#endif
pointer to the actual string data, which is stored in structures of
type struct string_chars_block. Each string_chars_block consists
of a pointer to a struct Lisp_String, followed by the data for that
- string, followed by another pointer to a struct Lisp_String,
- followed by the data for that string, etc. At GC time, the data in
- these blocks is compacted by searching sequentially through all the
+ string, followed by another pointer to a Lisp_String, followed by
+ the data for that string, etc. At GC time, the data in these
+ blocks is compacted by searching sequentially through all the
blocks and compressing out any holes created by unmarked strings.
Strings that are more than a certain size (bigger than the size of
a string_chars_block, although something like half as big might
varies depending on type) of them already on the list.
This way, we ensure that an object that gets freed will
remain free for the next 1000 (or whatever) times that
- an object of that type is allocated.
-*/
+ an object of that type is allocated. */
#ifndef MALLOC_OVERHEAD
#ifdef GNU_MALLOC
/* Cons allocation */
/************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (cons, struct Lisp_Cons);
+DECLARE_FIXED_TYPE_ALLOC (cons, Lisp_Cons);
/* conses are used and freed so often that we set this really high */
/* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 20000 */
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 2000
}
static const struct lrecord_description cons_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Cons, car), 2 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Cons, car) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Cons, cdr) },
{ XD_END }
};
*/
0,
cons_description,
- struct Lisp_Cons);
+ Lisp_Cons);
DEFUN ("cons", Fcons, 2, 2, 0, /*
Create a new cons, give it CAR and CDR as components, and return it.
{
/* This cannot GC. */
Lisp_Object val;
- struct Lisp_Cons *c;
+ Lisp_Cons *c;
- ALLOCATE_FIXED_TYPE (cons, struct Lisp_Cons, c);
+ ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c);
set_lheader_implementation (&(c->lheader), &lrecord_cons);
XSETCONS (val, c);
c->car = car;
noseeum_cons (Lisp_Object car, Lisp_Object cdr)
{
Lisp_Object val;
- struct Lisp_Cons *c;
+ Lisp_Cons *c;
- NOSEEUM_ALLOCATE_FIXED_TYPE (cons, struct Lisp_Cons, c);
+ NOSEEUM_ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c);
set_lheader_implementation (&(c->lheader), &lrecord_cons);
XSETCONS (val, c);
XCAR (val) = car;
#ifdef LISP_FLOAT_TYPE
-DECLARE_FIXED_TYPE_ALLOC (float, struct Lisp_Float);
+DECLARE_FIXED_TYPE_ALLOC (float, Lisp_Float);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_float 1000
Lisp_Object
make_float (double float_value)
{
Lisp_Object val;
- struct Lisp_Float *f;
+ Lisp_Float *f;
+
+ ALLOCATE_FIXED_TYPE (float, Lisp_Float, f);
+
+ /* Avoid dump-time `uninitialized memory read' purify warnings. */
+ if (sizeof (struct lrecord_header) + sizeof (double) != sizeof (*f))
+ xzero (*f);
- ALLOCATE_FIXED_TYPE (float, struct Lisp_Float, f);
set_lheader_implementation (&(f->lheader), &lrecord_float);
float_data (f) = float_value;
XSETFLOAT (val, f);
}
static const struct lrecord_description vector_description[] = {
- { XD_LONG, offsetof(struct Lisp_Vector, size) },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Vector, contents), XD_INDIRECT(0, 0) },
+ { XD_LONG, offsetof (Lisp_Vector, size) },
+ { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Vector, contents), XD_INDIRECT(0, 0) },
{ XD_END }
};
static Lisp_Object all_bit_vectors;
/* #### should allocate `small' bit vectors from a frob-block */
-static struct Lisp_Bit_Vector *
+static Lisp_Bit_Vector *
make_bit_vector_internal (size_t sizei)
{
size_t num_longs = BIT_VECTOR_LONG_STORAGE (sizei);
Lisp_Object
make_bit_vector (size_t length, Lisp_Object init)
{
- struct Lisp_Bit_Vector *p = make_bit_vector_internal (length);
+ Lisp_Bit_Vector *p = make_bit_vector_internal (length);
size_t num_longs = BIT_VECTOR_LONG_STORAGE (length);
CHECK_BIT (init);
/* Symbol allocation */
/************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (symbol, struct Lisp_Symbol);
+DECLARE_FIXED_TYPE_ALLOC (symbol, Lisp_Symbol);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_symbol 1000
DEFUN ("make-symbol", Fmake_symbol, 1, 1, 0, /*
(name))
{
Lisp_Object val;
- struct Lisp_Symbol *p;
+ Lisp_Symbol *p;
CHECK_STRING (name);
- ALLOCATE_FIXED_TYPE (symbol, struct Lisp_Symbol, p);
+ ALLOCATE_FIXED_TYPE (symbol, Lisp_Symbol, p);
set_lheader_implementation (&(p->lheader), &lrecord_symbol);
p->name = XSTRING (name);
p->plist = Qnil;
/* Event allocation */
/************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (event, struct Lisp_Event);
+DECLARE_FIXED_TYPE_ALLOC (event, Lisp_Event);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_event 1000
Lisp_Object
allocate_event (void)
{
Lisp_Object val;
- struct Lisp_Event *e;
+ Lisp_Event *e;
- ALLOCATE_FIXED_TYPE (event, struct Lisp_Event, e);
+ ALLOCATE_FIXED_TYPE (event, Lisp_Event, e);
set_lheader_implementation (&(e->lheader), &lrecord_event);
XSETEVENT (val, e);
/* Marker allocation */
/************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (marker, struct Lisp_Marker);
+DECLARE_FIXED_TYPE_ALLOC (marker, Lisp_Marker);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_marker 1000
DEFUN ("make-marker", Fmake_marker, 0, 0, 0, /*
())
{
Lisp_Object val;
- struct Lisp_Marker *p;
+ Lisp_Marker *p;
- ALLOCATE_FIXED_TYPE (marker, struct Lisp_Marker, p);
+ ALLOCATE_FIXED_TYPE (marker, Lisp_Marker, p);
set_lheader_implementation (&(p->lheader), &lrecord_marker);
p->buffer = 0;
p->memind = 0;
noseeum_make_marker (void)
{
Lisp_Object val;
- struct Lisp_Marker *p;
+ Lisp_Marker *p;
- NOSEEUM_ALLOCATE_FIXED_TYPE (marker, struct Lisp_Marker, p);
+ NOSEEUM_ALLOCATE_FIXED_TYPE (marker, Lisp_Marker, p);
set_lheader_implementation (&(p->lheader), &lrecord_marker);
p->buffer = 0;
p->memind = 0;
}
static const struct lrecord_description string_description[] = {
- { XD_BYTECOUNT, offsetof(Lisp_String, size) },
- { XD_OPAQUE_DATA_PTR, offsetof(Lisp_String, data), XD_INDIRECT(0, 1) },
- { XD_LISP_OBJECT, offsetof(Lisp_String, plist), 1 },
+ { XD_BYTECOUNT, offsetof (Lisp_String, size) },
+ { XD_OPAQUE_DATA_PTR, offsetof (Lisp_String, data), XD_INDIRECT(0, 1) },
+ { XD_LISP_OBJECT, offsetof (Lisp_String, plist) },
{ XD_END }
};
{
if (BIG_STRING_FULLSIZE_P (newfullsize))
{
- /* Both strings are big. We can just realloc(). */
+ /* Both strings are big. We can just realloc().
+ But careful! If the string is shrinking, we have to
+ memmove() _before_ realloc(), and if growing, we have to
+ memmove() _after_ realloc() - otherwise the access is
+ illegal, and we might crash. */
+ Bytecount len = string_length (s) + 1 - pos;
+
+ if (delta < 0 && pos >= 0)
+ memmove (string_data (s) + pos + delta, string_data (s) + pos, len);
set_string_data (s, (Bufbyte *) xrealloc (string_data (s),
string_length (s) + delta + 1));
- if (pos >= 0)
- {
- Bufbyte *addroff = pos + string_data (s);
-
- memmove (addroff + delta, addroff,
- string_length (s) + 1 - pos);
- }
+ if (delta > 0 && pos >= 0)
+ memmove (string_data (s) + pos + delta, string_data (s) + pos, len);
}
else /* String has been demoted from BIG_STRING. */
{
and convert it into a Lisp string. */
Lisp_Object
make_ext_string (CONST Extbyte *contents, EMACS_INT length,
- enum external_data_format fmt)
+ Lisp_Object coding_system)
{
- Bufbyte *intstr;
- Bytecount intlen;
-
- GET_CHARPTR_INT_DATA_ALLOCA (contents, length, fmt, intstr, intlen);
- return make_string (intstr, intlen);
+ Lisp_Object string;
+ TO_INTERNAL_FORMAT (DATA, (contents, length),
+ LISP_STRING, string,
+ coding_system);
+ return string;
}
Lisp_Object
}
Lisp_Object
-build_ext_string (CONST char *str, enum external_data_format fmt)
+build_ext_string (CONST char *str, Lisp_Object coding_system)
{
/* Some strlen's crash and burn if passed null. */
- return make_ext_string ((CONST Extbyte *) str, (str ? strlen(str) : 0), fmt);
+ return make_ext_string ((CONST Extbyte *) str, (str ? strlen(str) : 0),
+ coding_system);
}
Lisp_Object
}
/* Not "static" because of linker lossage on some systems */
-struct {
+struct
+{
void *data;
const struct struct_description *desc;
} dumpstructvec[200];
UNMARK_RECORD_HEADER (h);
num_used++;
/* total_size += n->implementation->size_in_bytes (h);*/
- /* ### May modify header->next on a C_READONLY lcrecord */
+ /* #### May modify header->next on a C_READONLY lcrecord */
prev = &(header->next);
header = *prev;
tick_lcrecord_stats (h, 0);
STRETCHY_STRUCT_SIZEOF (Lisp_Bit_Vector, bits,
BIT_VECTOR_LONG_STORAGE (len));
num_used++;
- /* ### May modify next on a C_READONLY bitvector */
+ /* #### May modify next on a C_READONLY bitvector */
prev = &(bit_vector_next (v));
bit_vector = *prev;
}
#define UNMARK_cons(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
#define ADDITIONAL_FREE_cons(ptr)
- SWEEP_FIXED_TYPE_BLOCK (cons, struct Lisp_Cons);
+ SWEEP_FIXED_TYPE_BLOCK (cons, Lisp_Cons);
}
/* Explicitly free a cons cell. */
void
-free_cons (struct Lisp_Cons *ptr)
+free_cons (Lisp_Cons *ptr)
{
#ifdef ERROR_CHECK_GC
/* If the CAR is not an int, then it will be a pointer, which will
#endif /* ERROR_CHECK_GC */
#ifndef ALLOC_NO_POOLS
- FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, struct Lisp_Cons, ptr);
+ FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, Lisp_Cons, ptr);
#endif /* ALLOC_NO_POOLS */
}
#define UNMARK_float(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
#define ADDITIONAL_FREE_float(ptr)
- SWEEP_FIXED_TYPE_BLOCK (float, struct Lisp_Float);
+ SWEEP_FIXED_TYPE_BLOCK (float, Lisp_Float);
}
#endif /* LISP_FLOAT_TYPE */
#define UNMARK_symbol(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
#define ADDITIONAL_FREE_symbol(ptr)
- SWEEP_FIXED_TYPE_BLOCK (symbol, struct Lisp_Symbol);
+ SWEEP_FIXED_TYPE_BLOCK (symbol, Lisp_Symbol);
}
static void
#define UNMARK_event(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
#define ADDITIONAL_FREE_event(ptr)
- SWEEP_FIXED_TYPE_BLOCK (event, struct Lisp_Event);
+ SWEEP_FIXED_TYPE_BLOCK (event, Lisp_Event);
}
static void
unchain_marker (tem); \
} while (0)
- SWEEP_FIXED_TYPE_BLOCK (marker, struct Lisp_Marker);
+ SWEEP_FIXED_TYPE_BLOCK (marker, Lisp_Marker);
}
/* Explicitly free a marker. */
void
-free_marker (struct Lisp_Marker *ptr)
+free_marker (Lisp_Marker *ptr)
{
#ifdef ERROR_CHECK_GC
/* Perhaps this will catch freeing an already-freed marker. */
#endif /* ERROR_CHECK_GC */
#ifndef ALLOC_NO_POOLS
- FREE_FIXED_TYPE_WHEN_NOT_IN_GC (marker, struct Lisp_Marker, ptr);
+ FREE_FIXED_TYPE_WHEN_NOT_IN_GC (marker, Lisp_Marker, ptr);
#endif /* ALLOC_NO_POOLS */
}
\f
{
int i;
char *p = pdump_rt_list;
- if(p)
- for(;;)
+ if (p)
+ for (;;)
{
pdump_reloc_table *rt = (pdump_reloc_table *)p;
p += sizeof (pdump_reloc_table);
- if (rt->desc) {
- for (i=0; i<rt->count; i++)
- {
- UNMARK_RECORD_HEADER ((struct lrecord_header *)(*(EMACS_INT *)p));
- p += sizeof (EMACS_INT);
- }
- } else
- break;
+ if (rt->desc)
+ {
+ for (i=0; i<rt->count; i++)
+ {
+ UNMARK_RECORD_HEADER ((struct lrecord_header *)(*(EMACS_INT *)p));
+ p += sizeof (EMACS_INT);
+ }
+ } else
+ break;
}
}
#endif
results of old evaluation don't look like potential problems.
But first we set some notable variables to nil and do one more GC,
to turn those strings into garbage.
- */
+ */
/* Yeah, this list is pretty ad-hoc... */
Vprocess_environment = Qnil;
int count = sizeof (scb->string_chars) - scb->pos;
assert (count >= 0 && count < STRING_CHARS_BLOCK_SIZE);
- if (count != 0) {
- /* from the block's fill ptr to the end */
- memset ((scb->string_chars + scb->pos), 0, count);
- }
+ if (count != 0)
+ {
+ /* from the block's fill ptr to the end */
+ memset ((scb->string_chars + scb->pos), 0, count);
+ }
}
}
return make_int (consing_since_gc);
}
+#if 0
DEFUN ("memory-limit", Fmemory_limit, 0, 0, "", /*
Return the address of the last byte Emacs has allocated, divided by 1024.
This may be helpful in debugging Emacs's memory usage.
{
return make_int ((EMACS_INT) sbrk (0) / 1024);
}
-
+#endif
\f
int
DEFSUBR (Fmake_marker);
DEFSUBR (Fpurecopy);
DEFSUBR (Fgarbage_collect);
+#if 0
DEFSUBR (Fmemory_limit);
+#endif
DEFSUBR (Fconsing_since_gc);
}
static pdump_entry_list_elmt *
pdump_get_entry (const void *obj)
{
- int pos = pdump_make_hash(obj);
+ int pos = pdump_make_hash (obj);
pdump_entry_list_elmt *e;
+
+ assert (obj != 0);
+
while ((e = pdump_hash[pos]) != 0)
{
if (e->obj == obj)
pos = 0;
}
- e = malloc (sizeof (pdump_entry_list_elmt));
+ e = xnew (pdump_entry_list_elmt);
e->next = list->first;
e->obj = obj;
pdump_hash[pos] = e;
align = align_table[size & 255];
- if (align<2 && is_lrecord)
+ if (align < 2 && is_lrecord)
align = 2;
- if(align < list->align)
+ if (align < list->align)
list->align = align;
}
static pdump_entry_list *
-pdump_get_entry_list(const struct struct_description *sdesc)
+pdump_get_entry_list (const struct struct_description *sdesc)
{
int i;
- for(i=0; i<pdump_struct_table.count; i++)
+ for (i=0; i<pdump_struct_table.count; i++)
if (pdump_struct_table.list[i].sdesc == sdesc)
return &pdump_struct_table.list[i].list;
pdump_struct_table.size = 10;
else
pdump_struct_table.size = pdump_struct_table.size * 2;
- pdump_struct_table.list = xrealloc (pdump_struct_table.list,
- pdump_struct_table.size*sizeof (pdump_struct_list_elmt));
+ pdump_struct_table.list = (pdump_struct_list_elmt *)
+ xrealloc (pdump_struct_table.list,
+ pdump_struct_table.size * sizeof (pdump_struct_list_elmt));
}
pdump_struct_table.list[pdump_struct_table.count].list.first = 0;
pdump_struct_table.list[pdump_struct_table.count].list.align = 8;
return &pdump_struct_table.list[pdump_struct_table.count++].list;
}
-static struct {
- Lisp_Object obj;
+static struct
+{
+ struct lrecord_header *obj;
int position;
int offset;
} backtrace[65536];
else
{
fprintf (stderr, " - %s (%d, %d)\n",
- XRECORD_LHEADER_IMPLEMENTATION (backtrace[i].obj)->name,
+ LHEADER_IMPLEMENTATION (backtrace[i].obj)->name,
backtrace[i].position,
backtrace[i].offset);
}
int delta = XD_INDIRECT_DELTA (code);
irdata = ((char *)idata) + idesc[line].offset;
- switch (idesc[line].type) {
- case XD_SIZE_T:
- count = *(size_t *)irdata;
- break;
- case XD_INT:
- count = *(int *)irdata;
- break;
- case XD_LONG:
- count = *(long *)irdata;
- break;
- case XD_BYTECOUNT:
- count = *(Bytecount *)irdata;
- break;
- default:
- fprintf (stderr, "Unsupported count type : %d (line = %d, code=%ld)\n", idesc[line].type, line, (long)code);
- pdump_backtrace ();
- abort ();
- }
+ switch (idesc[line].type)
+ {
+ case XD_SIZE_T:
+ count = *(size_t *)irdata;
+ break;
+ case XD_INT:
+ count = *(int *)irdata;
+ break;
+ case XD_LONG:
+ count = *(long *)irdata;
+ break;
+ case XD_BYTECOUNT:
+ count = *(Bytecount *)irdata;
+ break;
+ default:
+ fprintf (stderr, "Unsupported count type : %d (line = %d, code=%ld)\n", idesc[line].type, line, (long)code);
+ pdump_backtrace ();
+ abort ();
+ }
count += delta;
return count;
}
pdump_register_sub (const void *data, const struct lrecord_description *desc, int me)
{
int pos;
- const void *rdata;
restart:
for (pos = 0; desc[pos].type != XD_END; pos++)
{
+ const void *rdata = (const char *)data + desc[pos].offset;
+
backtrace[me].position = pos;
backtrace[me].offset = desc[pos].offset;
- rdata = ((const char *)data) + desc[pos].offset;
- switch(desc[pos].type)
+ switch (desc[pos].type)
{
case XD_SPECIFIER_END:
pos = 0;
- desc = ((const struct Lisp_Specifier *)data)->methods->extra_description;
+ desc = ((const Lisp_Specifier *)data)->methods->extra_description;
goto restart;
case XD_SIZE_T:
case XD_INT:
case XD_OPAQUE_DATA_PTR:
{
EMACS_INT count = desc[pos].data1;
- if (XD_IS_INDIRECT(count))
+ if (XD_IS_INDIRECT (count))
count = pdump_get_indirect_count (count, desc, data);
pdump_add_entry (&pdump_opaque_data_list,
}
case XD_LISP_OBJECT:
{
- EMACS_INT count = desc[pos].data1;
+ const Lisp_Object *pobj = (const Lisp_Object *)rdata;
+
+ assert (desc[pos].data1 == 0);
+
+ backtrace[me].offset = (const char *)pobj - (const char *)data;
+ pdump_register_object (*pobj);
+ break;
+ }
+ case XD_LISP_OBJECT_ARRAY:
+ {
int i;
+ EMACS_INT count = desc[pos].data1;
if (XD_IS_INDIRECT (count))
count = pdump_get_indirect_count (count, desc, data);
- for(i=0;i<count;i++) {
- const Lisp_Object *pobj = ((const Lisp_Object *)rdata) + i;
- Lisp_Object dobj = *pobj;
+ for (i = 0; i < count; i++)
+ {
+ const Lisp_Object *pobj = ((const Lisp_Object *)rdata) + i;
+ Lisp_Object dobj = *pobj;
- backtrace[me].offset = (const char *)pobj - (const char *)data;
- pdump_register_object (dobj);
- }
+ backtrace[me].offset = (const char *)pobj - (const char *)data;
+ pdump_register_object (dobj);
+ }
break;
}
case XD_STRUCT_PTR:
EMACS_INT count = desc[pos].data1;
const struct struct_description *sdesc = desc[pos].data2;
const char *dobj = *(const char **)rdata;
- if (dobj) {
- if (XD_IS_INDIRECT (count))
- count = pdump_get_indirect_count (count, desc, data);
+ if (dobj)
+ {
+ if (XD_IS_INDIRECT (count))
+ count = pdump_get_indirect_count (count, desc, data);
- pdump_register_struct (dobj, sdesc, count);
- }
+ pdump_register_struct (dobj, sdesc, count);
+ }
break;
}
default:
static void
pdump_register_object (Lisp_Object obj)
{
- if (!obj ||
- !POINTER_TYPE_P (XTYPE (obj)) ||
- pdump_get_entry (XRECORD_LHEADER (obj)))
+ struct lrecord_header *objh;
+
+ if (!POINTER_TYPE_P (XTYPE (obj)))
return;
- if (XRECORD_LHEADER_IMPLEMENTATION (obj)->description)
+ objh = XRECORD_LHEADER (obj);
+ if (!objh)
+ return;
+
+ if (pdump_get_entry (objh))
+ return;
+
+ if (LHEADER_IMPLEMENTATION (objh)->description)
{
int me = depth++;
if (me>65536)
fprintf (stderr, "Backtrace overflow, loop ?\n");
abort ();
}
- backtrace[me].obj = obj;
+ backtrace[me].obj = objh;
backtrace[me].position = 0;
backtrace[me].offset = 0;
- pdump_add_entry (pdump_object_table + XRECORD_LHEADER (obj)->type,
- XRECORD_LHEADER (obj),
- XRECORD_LHEADER_IMPLEMENTATION (obj)->static_size ?
- XRECORD_LHEADER_IMPLEMENTATION (obj)->static_size :
- XRECORD_LHEADER_IMPLEMENTATION (obj)->size_in_bytes_method (XRECORD_LHEADER (obj)),
+ pdump_add_entry (pdump_object_table + objh->type,
+ objh,
+ LHEADER_IMPLEMENTATION (objh)->static_size ?
+ LHEADER_IMPLEMENTATION (objh)->static_size :
+ LHEADER_IMPLEMENTATION (objh)->size_in_bytes_method (objh),
1,
1);
- pdump_register_sub (XRECORD_LHEADER (obj),
- XRECORD_LHEADER_IMPLEMENTATION (obj)->description,
+ pdump_register_sub (objh,
+ LHEADER_IMPLEMENTATION (objh)->description,
me);
--depth;
}
else
{
- pdump_alert_undump_object[XRECORD_LHEADER (obj)->type]++;
- fprintf (stderr, "Undumpable object type : %s\n", XRECORD_LHEADER_IMPLEMENTATION (obj)->name);
+ pdump_alert_undump_object[objh->type]++;
+ fprintf (stderr, "Undumpable object type : %s\n", LHEADER_IMPLEMENTATION (objh)->name);
pdump_backtrace ();
}
}
if (desc)
{
int pos, i;
- void *rdata;
memcpy (pdump_buf, elmt->obj, size*count);
for (i=0; i<count; i++)
restart:
for (pos = 0; desc[pos].type != XD_END; pos++)
{
- rdata = cur + desc[pos].offset;
+ void *rdata = cur + desc[pos].offset;
switch (desc[pos].type)
{
case XD_SPECIFIER_END:
- pos = 0;
- desc = ((const struct Lisp_Specifier *)(elmt->obj))->methods->extra_description;
+ desc = ((const Lisp_Specifier *)(elmt->obj))->methods->extra_description;
goto restart;
case XD_SIZE_T:
case XD_INT:
{
Lisp_Object obj = *(Lisp_Object *)rdata;
pdump_entry_list_elmt *elmt1;
- for(;;)
+ for (;;)
{
- elmt1 = pdump_get_entry (XRECORD_LHEADER(obj));
+ elmt1 = pdump_get_entry (XRECORD_LHEADER (obj));
if (elmt1)
break;
obj = *(Lisp_Object *)(desc[pos].offset + (char *)(XRECORD_LHEADER (obj)));
}
case XD_LISP_OBJECT:
{
+ Lisp_Object *pobj = (Lisp_Object *) rdata;
+
+ assert (desc[pos].data1 == 0);
+
+ if (POINTER_TYPE_P (XTYPE (*pobj)) && XRECORD_LHEADER (*pobj))
+ *(EMACS_INT *)pobj =
+ pdump_get_entry (XRECORD_LHEADER (*pobj))->save_offset;
+ break;
+ }
+ case XD_LISP_OBJECT_ARRAY:
+ {
EMACS_INT count = desc[pos].data1;
int i;
if (XD_IS_INDIRECT (count))
count = pdump_get_indirect_count (count, desc, elmt->obj);
- for(i=0; i<count; i++)
+ for (i=0; i<count; i++)
{
Lisp_Object *pobj = ((Lisp_Object *)rdata) + i;
- Lisp_Object dobj = *pobj;
- if (dobj && POINTER_TYPE_P (XTYPE (dobj)))
- *pobj = pdump_get_entry (XRECORD_LHEADER (dobj))->save_offset;
+ if (POINTER_TYPE_P (XTYPE (*pobj)) && XRECORD_LHEADER (*pobj))
+ *(EMACS_INT *)pobj =
+ pdump_get_entry (XRECORD_LHEADER (*pobj))->save_offset;
}
break;
}
pdump_reloc_one (void *data, EMACS_INT delta, const struct lrecord_description *desc)
{
int pos;
- void *rdata;
- restart:
+ restart:
for (pos = 0; desc[pos].type != XD_END; pos++)
{
- rdata = ((char *)data) + desc[pos].offset;
- switch (desc[pos].type) {
- case XD_SPECIFIER_END:
- pos = 0;
- desc = ((const struct Lisp_Specifier *)data)->methods->extra_description;
- goto restart;
- case XD_SIZE_T:
- case XD_INT:
- case XD_LONG:
- case XD_BYTECOUNT:
- case XD_INT_RESET:
- break;
- case XD_OPAQUE_DATA_PTR:
- case XD_C_STRING:
- case XD_STRUCT_PTR:
- case XD_LO_LINK:
+ void *rdata = (char *)data + desc[pos].offset;
+ switch (desc[pos].type)
{
- EMACS_INT ptr = *(EMACS_INT *)rdata;
- if (ptr)
- *(EMACS_INT *)rdata = ptr+delta;
+ case XD_SPECIFIER_END:
+ pos = 0;
+ desc = ((const Lisp_Specifier *)data)->methods->extra_description;
+ goto restart;
+ case XD_SIZE_T:
+ case XD_INT:
+ case XD_LONG:
+ case XD_BYTECOUNT:
+ case XD_INT_RESET:
break;
- }
- case XD_LISP_OBJECT:
- case XD_LO_RESET_NIL:
- {
- EMACS_INT count = desc[pos].data1;
- int i;
- if (XD_IS_INDIRECT (count))
- count = pdump_get_indirect_count (count, desc, data);
+ case XD_OPAQUE_DATA_PTR:
+ case XD_C_STRING:
+ case XD_STRUCT_PTR:
+ case XD_LO_LINK:
+ {
+ EMACS_INT ptr = *(EMACS_INT *)rdata;
+ if (ptr)
+ *(EMACS_INT *)rdata = ptr+delta;
+ break;
+ }
+ case XD_LISP_OBJECT:
+ {
+ Lisp_Object *pobj = (Lisp_Object *) rdata;
- for (i=0; i<count; i++)
- {
- Lisp_Object *pobj = ((Lisp_Object *)rdata) + i;
- Lisp_Object dobj = *pobj;
- if (dobj && POINTER_TYPE_P (XTYPE (dobj)))
- *pobj = dobj + delta;
- }
- break;
- }
- case XD_DOC_STRING:
- {
- EMACS_INT str = *(EMACS_INT *)rdata;
- if (str > 0)
- *(EMACS_INT *)rdata = str + delta;
- break;
- }
- default:
- fprintf (stderr, "Unsupported dump type : %d\n", desc[pos].type);
- abort ();
- };
+ assert (desc[pos].data1 == 0);
+
+ if (POINTER_TYPE_P (XTYPE (*pobj))
+ && ! EQ (*pobj, Qnull_pointer))
+ XSETOBJ (*pobj, XTYPE (*pobj), (char *) XPNTR (*pobj) + delta);
+
+ break;
+ }
+ case XD_LISP_OBJECT_ARRAY:
+ case XD_LO_RESET_NIL:
+ {
+ EMACS_INT count = desc[pos].data1;
+ int i;
+ if (XD_IS_INDIRECT (count))
+ count = pdump_get_indirect_count (count, desc, data);
+
+ for (i=0; i<count; i++)
+ {
+ Lisp_Object *pobj = (Lisp_Object *) rdata + i;
+
+ if (POINTER_TYPE_P (XTYPE (*pobj))
+ && ! EQ (*pobj, Qnull_pointer))
+ XSETOBJ (*pobj, XTYPE (*pobj), (char *) XPNTR (*pobj) + delta);
+ }
+ break;
+ }
+ case XD_DOC_STRING:
+ {
+ EMACS_INT str = *(EMACS_INT *)rdata;
+ if (str > 0)
+ *(EMACS_INT *)rdata = str + delta;
+ break;
+ }
+ default:
+ fprintf (stderr, "Unsupported dump type : %d\n", desc[pos].type);
+ abort ();
+ };
}
}
}
static void
-pdump_scan_by_alignement (void (*f)(pdump_entry_list_elmt *, const struct lrecord_description *))
+pdump_scan_by_alignment (void (*f)(pdump_entry_list_elmt *, const struct lrecord_description *))
{
int align, i;
const struct lrecord_description *idesc;
}
for (i=0; i<pdump_struct_table.count; i++)
- if (pdump_struct_table.list[i].list.align == align) {
- elmt = pdump_struct_table.list[i].list.first;
- idesc = pdump_struct_table.list[i].sdesc->description;
- while (elmt)
- {
- f (elmt, idesc);
- elmt = elmt->next;
- }
- }
+ if (pdump_struct_table.list[i].list.align == align)
+ {
+ elmt = pdump_struct_table.list[i].list.first;
+ idesc = pdump_struct_table.list[i].sdesc->description;
+ while (elmt)
+ {
+ f (elmt, idesc);
+ elmt = elmt->next;
+ }
+ }
elmt = pdump_opaque_data_list.first;
while (elmt)
static void
pdump_dump_staticvec (void)
{
- Lisp_Object *reloc = malloc (staticidx*sizeof (Lisp_Object));
+ EMACS_INT *reloc = xnew_array (EMACS_INT, staticidx);
int i;
write (pdump_fd, staticvec, staticidx*sizeof (Lisp_Object *));
- for(i=0; i<staticidx; i++)
+ for (i=0; i<staticidx; i++)
{
Lisp_Object obj = *staticvec[i];
- if (obj && POINTER_TYPE_P (XTYPE (obj)))
+ if (POINTER_TYPE_P (XTYPE (obj)))
reloc[i] = pdump_get_entry (XRECORD_LHEADER (obj))->save_offset;
else
- reloc[i] = obj;
+ reloc[i] = *(EMACS_INT *)(staticvec[i]);
}
write (pdump_fd, reloc, staticidx*sizeof (Lisp_Object));
free (reloc);
write (pdump_fd, &(dumpstructvec[i].data), sizeof (void *));
adr = pdump_get_entry (*(void **)(dumpstructvec[i].data))->save_offset;
write (pdump_fd, &adr, sizeof (adr));
- }
+ }
}
static void
for (i=0; i<=last_lrecord_type_index_assigned; i++)
{
elmt = pdump_object_table[i].first;
- if(!elmt)
+ if (!elmt)
continue;
rt.desc = lrecord_implementations_table[i]->description;
rt.count = pdump_object_table[i].count;
write (pdump_fd, &rt, sizeof (rt));
while (elmt)
{
- EMACS_INT rdata = pdump_get_entry (XRECORD_LHEADER (elmt->obj))->save_offset;
+ EMACS_INT rdata = pdump_get_entry (elmt->obj)->save_offset;
write (pdump_fd, &rdata, sizeof (rdata));
elmt = elmt->next;
}
- }
+ }
rt.desc = 0;
rt.count = 0;
write (pdump_fd, &rt, sizeof (rt));
while (elmt)
{
- EMACS_INT rdata = pdump_get_entry (XRECORD_LHEADER (elmt->obj))->save_offset;
- for (j=0; j<elmt->count; j++) {
- write (pdump_fd, &rdata, sizeof (rdata));
- rdata += elmt->size;
- }
+ EMACS_INT rdata = pdump_get_entry (elmt->obj)->save_offset;
+ for (j=0; j<elmt->count; j++)
+ {
+ write (pdump_fd, &rdata, sizeof (rdata));
+ rdata += elmt->size;
+ }
elmt = elmt->next;
}
}
for (i=0; i<pdump_wireidx; i++)
{
- Lisp_Object obj = pdump_get_entry (XRECORD_LHEADER (*(pdump_wirevec[i])))->save_offset;
+ EMACS_INT obj = pdump_get_entry (XRECORD_LHEADER (*(pdump_wirevec[i])))->save_offset;
write (pdump_fd, &pdump_wirevec[i], sizeof (pdump_wirevec[i]));
write (pdump_fd, &obj, sizeof (obj));
}
pdump_entry_list_elmt *elmt;
EMACS_INT res;
- for(;;)
+ for (;;)
{
const struct lrecord_description *desc;
int pos;
Vterminal_frame = Qnil;
Vterminal_device = Qnil;
- pdump_hash = malloc (PDUMP_HASHSIZE*sizeof (pdump_entry_list_elmt *));
- memset (pdump_hash, 0, PDUMP_HASHSIZE*sizeof (pdump_entry_list_elmt *));
+ pdump_hash = xnew_array_and_zero (pdump_entry_list_elmt *, PDUMP_HASHSIZE);
for (i=0; i<=last_lrecord_type_index_assigned; i++)
{
pdump_register_object (*pdump_wirevec[i]);
none = 1;
- for(i=0;i<=last_lrecord_type_index_assigned;i++)
+ for (i=0; i<=last_lrecord_type_index_assigned; i++)
if (pdump_alert_undump_object[i])
{
if (none)
cur_offset = 256;
max_size = 0;
- pdump_scan_by_alignement (pdump_allocate_offset);
+ pdump_scan_by_alignment (pdump_allocate_offset);
pdump_qnil = pdump_get_entry (XRECORD_LHEADER (Qnil));
- pdump_buf = malloc (max_size);
- pdump_fd = open ("xemacs.dmp", O_WRONLY|O_CREAT|O_TRUNC, 0666);
+ pdump_buf = xmalloc (max_size);
+ /* Avoid use of the `open' macro. We want the real function. */
+#undef open
+ pdump_fd = open ("xemacs.dmp",
+ O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, 0666);
hd.stab_offset = (cur_offset + 3) & ~3;
write (pdump_fd, &hd, sizeof (hd));
lseek (pdump_fd, 256, SEEK_SET);
- pdump_scan_by_alignement (pdump_dump_data);
+ pdump_scan_by_alignment (pdump_dump_data);
lseek (pdump_fd, hd.stab_offset, SEEK_SET);
EMACS_INT delta;
EMACS_INT count;
+#define PDUMP_READ(p, type) (p = (char*) (((type *) p) + 1), *((type *) p - 1))
+
pdump_start = pdump_end = 0;
- pdump_fd = open ("xemacs.dmp", O_RDONLY);
+ pdump_fd = open ("xemacs.dmp", O_RDONLY | OPEN_BINARY);
if (pdump_fd<0)
return 0;
lseek (pdump_fd, 0, SEEK_SET);
#ifdef HAVE_MMAP
- pdump_start = mmap (0, length, PROT_READ|PROT_WRITE, MAP_PRIVATE, pdump_fd, 0);
+ pdump_start = (char *) mmap (0, length, PROT_READ|PROT_WRITE, MAP_PRIVATE, pdump_fd, 0);
if (pdump_start == MAP_FAILED)
pdump_start = 0;
#endif
if (!pdump_start)
{
- pdump_start = (void *)((((unsigned long)(malloc(length+255))) + 255) & ~255);
- read(pdump_fd, pdump_start, length);
+ pdump_start = (char *)((((unsigned long)(xmalloc(length+255))) + 255) & ~255);
+ read (pdump_fd, pdump_start, length);
}
close (pdump_fd);
pdump_end = pdump_start + length;
staticidx = ((dump_header *)(pdump_start))->nb_staticpro;
- last_lrecord_type_index_assigned = ((dump_header *)(pdump_start))->last_type;
+ last_lrecord_type_index_assigned = ((dump_header *)pdump_start)->last_type;
delta = ((EMACS_INT)pdump_start) - ((dump_header *)pdump_start)->reloc_address;
p = pdump_start + ((dump_header *)pdump_start)->stab_offset;
p += staticidx*sizeof (Lisp_Object *);
for (i=0; i<staticidx; i++)
{
- Lisp_Object obj = *(Lisp_Object *)p;
- p += sizeof (Lisp_Object);
- if (obj && POINTER_TYPE_P (XTYPE (obj)))
- obj += delta;
+ Lisp_Object obj = PDUMP_READ (p, Lisp_Object);
+ if (POINTER_TYPE_P (XTYPE (obj)))
+ XSETOBJ (obj, XTYPE (obj), (char *) XPNTR (obj) + delta);
*staticvec[i] = obj;
}
/* Put back the dumpstructs */
for (i=0; i<((dump_header *)pdump_start)->nb_structdmp; i++)
{
- void **adr = *(void **)p;
- p += sizeof (void *);
- *adr = (void *)((*(EMACS_INT *)p) + delta);
- p += sizeof (EMACS_INT);
+ void **adr = PDUMP_READ (p, void **);
+ *adr = (void *) (PDUMP_READ (p, char *) + delta);
}
/* Put back the lrecord_implementations_table */
p += sizeof (lrecord_implementations_table);
/* Give back their numbers to the lrecord implementations */
- for (i=0; i<sizeof(lrecord_implementations_table)/sizeof(lrecord_implementations_table[0]); i++)
+ for (i = 0; i < countof (lrecord_implementations_table); i++)
if (lrecord_implementations_table[i])
{
*(lrecord_implementations_table[i]->lrecord_type_index) = i;
/* Do the relocations */
pdump_rt_list = p;
count = 2;
- for(;;)
+ for (;;)
{
- pdump_reloc_table *rt = (pdump_reloc_table *)p;
- p += sizeof (pdump_reloc_table);
- if (rt->desc) {
- for (i=0; i<rt->count; i++)
- {
- EMACS_INT adr = delta + *(EMACS_INT *)p;
- *(EMACS_INT *)p = adr;
- pdump_reloc_one ((void *)adr, delta, rt->desc);
- p += sizeof (EMACS_INT);
- }
- } else
- if(!(--count))
- break;
+ pdump_reloc_table rt = PDUMP_READ (p, pdump_reloc_table);
+ if (rt.desc)
+ {
+ for (i=0; i < rt.count; i++)
+ {
+ char *adr = delta + *(char **)p;
+ *(char **)p = adr;
+ pdump_reloc_one (adr, delta, rt.desc);
+ p += sizeof (char *);
+ }
+ } else
+ if (!(--count))
+ break;
}
/* Put the pdump_wire variables in place */
- count = *(EMACS_INT *)p;
- p += sizeof(EMACS_INT);
+ count = PDUMP_READ (p, EMACS_INT);
for (i=0; i<count; i++)
{
- Lisp_Object *var, obj;
- var = *(Lisp_Object **)p;
- p += sizeof (Lisp_Object *);
+ Lisp_Object *var = PDUMP_READ (p, Lisp_Object *);
+ Lisp_Object obj = PDUMP_READ (p, Lisp_Object);
- obj = *(Lisp_Object *)p;
- p += sizeof (Lisp_Object);
+ if (POINTER_TYPE_P (XTYPE (obj)))
+ XSETOBJ (obj, XTYPE (obj), (char *) XPNTR (obj) + delta);
- if (obj && POINTER_TYPE_P (XTYPE (obj)))
- obj += delta;
*var = obj;
}
/* Final cleanups */
/* reorganize hash tables */
p = pdump_rt_list;
- for(;;)
+ for (;;)
{
- pdump_reloc_table *rt = (pdump_reloc_table *)p;
- p += sizeof (pdump_reloc_table);
- if (!rt->desc)
+ pdump_reloc_table rt = PDUMP_READ (p, pdump_reloc_table);
+ if (!rt.desc)
break;
- if (rt->desc == hash_table_description)
+ if (rt.desc == hash_table_description)
{
- for (i=0; i<rt->count; i++)
- {
- struct Lisp_Hash_Table *ht = XHASH_TABLE (*(EMACS_INT *)p);
- reorganize_hash_table (ht);
- p += sizeof (EMACS_INT);
- }
+ for (i=0; i < rt.count; i++)
+ pdump_reorganize_hash_table (PDUMP_READ (p, Lisp_Object));
break;
} else
- p += sizeof (EMACS_INT)*rt->count;
+ p += sizeof (Lisp_Object) * rt.count;
}
return 1;
}
-#endif
+#endif /* PDUMP */
Mly (probably) or JWZ: Some changes.
*/
-#ifndef _XEMACS_BACKTRACE_H_
-#define _XEMACS_BACKTRACE_H_
+#ifndef INCLUDED_backtrace_h_
+#define INCLUDED_backtrace_h_
#include <setjmp.h>
Lisp_Object SB_symbol = (symbol_object); \
Lisp_Object SB_newval = (value_object); \
Lisp_Object SB_oldval; \
- struct Lisp_Symbol *SB_sym; \
+ Lisp_Symbol *SB_sym; \
\
SPECPDL_RESERVE (1); \
\
\
if (!SYMBOL_VALUE_MAGIC_P (SB_oldval) || UNBOUNDP (SB_oldval)) \
{ \
- /* ### the following test will go away when we have a constant \
+ /* #### the following test will go away when we have a constant \
symbol magic object */ \
if (EQ (SB_symbol, Qnil) || \
EQ (SB_symbol, Qt) || \
#define SPECBIND_FAST_UNSAFE(symbol_object, value_object) do { \
Lisp_Object SFU_symbol = (symbol_object); \
Lisp_Object SFU_newval = (value_object); \
- struct Lisp_Symbol *SFU_sym = XSYMBOL (SFU_symbol); \
+ Lisp_Symbol *SFU_sym = XSYMBOL (SFU_symbol); \
Lisp_Object SFU_oldval = SFU_sym->value; \
if (!SYMBOL_VALUE_MAGIC_P (SFU_oldval) || UNBOUNDP (SFU_oldval)) \
{ \
int UNBIND_TO_count = (count); \
while (specpdl_depth_counter != UNBIND_TO_count) \
{ \
- struct Lisp_Symbol *sym; \
+ Lisp_Symbol *sym; \
--specpdl_ptr; \
--specpdl_depth_counter; \
\
int UNBIND_TO_count = (count); \
while (specpdl_depth_counter != UNBIND_TO_count) \
{ \
- struct Lisp_Symbol *sym; \
+ Lisp_Symbol *sym; \
--specpdl_ptr; \
--specpdl_depth_counter; \
\
int UNBIND_TO_count = (count); \
while (specpdl_depth_counter != UNBIND_TO_count) \
{ \
- struct Lisp_Symbol *sym; \
+ Lisp_Symbol *sym; \
--specpdl_ptr; \
--specpdl_depth_counter; \
\
#define FSET_FAST_UNSAFE(sym, newval) do { \
Lisp_Object FFU_sym = (sym); \
Lisp_Object FFU_newval = (newval); \
- struct Lisp_Symbol *FFU_symbol = XSYMBOL (FFU_sym); \
+ Lisp_Symbol *FFU_symbol = XSYMBOL (FFU_sym); \
Lisp_Object FFU_oldval = FFU_symbol->value; \
if (!SYMBOL_VALUE_MAGIC_P (FFU_oldval) || UNBOUNDP (FFU_oldval)) \
FFU_symbol->value = FFU_newval; \
Fset (FFU_sym, FFU_newval); \
} while (0)
-#endif /* _XEMACS_BACKTRACE_H_ */
+#endif /* INCLUDED_backtrace_h_ */
#include "balloon_help.h"
-/* ### start of hack */
+/* #### start of hack */
static unsigned long
alloc_color (Display* dpy, CONST char* colorname, int light)
}
}
-/* ### end of hack */
+/* #### end of hack */
DEFUN ("show-balloon-help", Fshow_balloon_help, 1, 1, 0, /*
Show balloon help.
/* Synched up with: Not in FSF. */
-#ifndef BALLOON_HELP_H
-#define BALLOON_HELP_H
+#ifndef INCLUDED_balloon_help_h_
+#define INCLUDED_balloon_help_h_
#include "xintrinsic.h"
void balloon_help_hide (void);
void balloon_help_move_to_pointer (void);
-#endif /* BALLOON_HELP_H */
+#endif /* INCLUDED_balloon_help_h_ */
JWZ (?): 1992?.
*/
-#ifndef _XEMACS_BITMAPS_H_
-#define _XEMACS_BITMAPS_H_
+#ifndef INCLUDED_bitmaps_h_
+#define INCLUDED_bitmaps_h_
#if 0
/* A gnu, like on the back of the emacs manual, for icons. */
0x00, 0x00, 0x22, 0x22, 0x22, 0x22, 0x00, 0x00};
#endif
-#endif /* _XEMACS_BITMAPS_H_ */
+#endif /* INCLUDED_bitmaps_h_ */
Ben Wing: December 1994, for 19.12.
*/
-#ifndef _XEMACS_BLOCKTYPE_H_
-#define _XEMACS_BLOCKTYPE_H_
+#ifndef INCLUDED_blocktype_h_
+#define INCLUDED_blocktype_h_
#define Blocktype_declare(type) \
type *free; \
(structype *) Blocktype_newf (sizeof(*(((structype *) NULL)->free)))
#define Blocktype_alloc(b) (Blocktype_allocf (b), (b)->tempel)
-#endif /* _XEMACS_BLOCKTYPE_H_ */
+#endif /* INCLUDED_blocktype_h_ */
/* Sun's standard and GCC's header files leave out prototypes for
all sorts of functions. */
-#ifndef _XEMACS_BROKEN_SUN_H_
-#define _XEMACS_BROKEN_SUN_H_
+#ifndef INCLUDED_broken_sun_h_
+#define INCLUDED_broken_sun_h_
#ifdef __GNUC__
#include <stdlib.h>
#endif /* __GNUC__ */
-#endif /* _XEMACS_BROKEN_SUN_H_ */
+#endif /* INCLUDED_broken_sun_h_ */
#include "elhash.h"
#include "extents.h"
#include "faces.h"
+#ifdef FILE_CODING
+#include "file-coding.h"
+#endif
#include "frame.h"
#include "insdel.h"
+#include "lstream.h"
#include "process.h" /* for kill_buffer_processes */
#ifdef REGION_CACHE_NEEDS_WORK
#include "region-cache.h"
f->buffer_alist = lynk;
va_run_hook_with_args (Qrecord_buffer_hook, 1, buffer);
-
+
return Qnil;
}
#endif /* MEMORY_USAGE_STATS */
+\f
+/************************************************************************/
+/* Implement TO_EXTERNAL_FORMAT, TO_INTERNAL_FORMAT */
+/************************************************************************/
+
+/* This implementation should probably be elsewhere, but it can't be
+ in file-coding.c since that file is only available if FILE_CODING
+ is defined. */
+#ifdef FILE_CODING
+static int
+coding_system_is_binary (Lisp_Object coding_system)
+{
+ Lisp_Coding_System *cs = XCODING_SYSTEM (coding_system);
+ return
+ (CODING_SYSTEM_TYPE (cs) == CODESYS_NO_CONVERSION &&
+ CODING_SYSTEM_EOL_TYPE (cs) == EOL_LF &&
+ EQ (CODING_SYSTEM_POST_READ_CONVERSION (cs), Qnil) &&
+ EQ (CODING_SYSTEM_PRE_WRITE_CONVERSION (cs), Qnil));
+}
+#else
+#define coding_system_is_binary(coding_system) 1
+#endif
+
+static Extbyte_dynarr *conversion_out_dynarr;
+static Bufbyte_dynarr *conversion_in_dynarr;
+
+static int dfc_convert_to_external_format_in_use;
+static int dfc_convert_to_internal_format_in_use;
+
+static Lisp_Object
+dfc_convert_to_external_format_reset_in_use (Lisp_Object value)
+{
+ dfc_convert_to_external_format_in_use = XINT (value);
+ return Qnil;
+}
+
+static Lisp_Object
+dfc_convert_to_internal_format_reset_in_use (Lisp_Object value)
+{
+ dfc_convert_to_internal_format_in_use = XINT (value);
+ return Qnil;
+}
+
+void
+dfc_convert_to_external_format (dfc_conversion_type source_type,
+ dfc_conversion_data *source,
+#ifdef FILE_CODING
+ Lisp_Object coding_system,
+#endif
+ dfc_conversion_type sink_type,
+ dfc_conversion_data *sink)
+{
+ int count = specpdl_depth ();
+
+ type_checking_assert
+ (((source_type == DFC_TYPE_DATA) ||
+ (source_type == DFC_TYPE_LISP_LSTREAM && LSTREAMP (source->lisp_object)) ||
+ (source_type == DFC_TYPE_LISP_STRING && STRINGP (source->lisp_object)))
+ &&
+ ((sink_type == DFC_TYPE_DATA) ||
+ (sink_type == DFC_TYPE_LISP_LSTREAM && LSTREAMP (source->lisp_object))));
+
+ if (dfc_convert_to_external_format_in_use != 0)
+ error ("Can't call a conversion function from a conversion function");
+ else
+ dfc_convert_to_external_format_in_use = 1;
+
+ record_unwind_protect (dfc_convert_to_external_format_reset_in_use,
+ Qzero);
+
+#ifdef FILE_CODING
+ coding_system = Fget_coding_system (coding_system);
+#endif
+
+ Dynarr_reset (conversion_out_dynarr);
+
+ /* Here we optimize in the case where the coding system does no
+ conversion. However, we don't want to optimize in case the source
+ or sink is an lstream, since writing to an lstream can cause a
+ garbage collection, and this could be problematic if the source
+ is a lisp string. */
+ if (source_type != DFC_TYPE_LISP_LSTREAM &&
+ sink_type != DFC_TYPE_LISP_LSTREAM &&
+ coding_system_is_binary (coding_system))
+ {
+ const Bufbyte *ptr;
+ Bytecount len;
+
+ if (source_type == DFC_TYPE_LISP_STRING)
+ {
+ ptr = XSTRING_DATA (source->lisp_object);
+ len = XSTRING_LENGTH (source->lisp_object);
+ }
+ else
+ {
+ ptr = (Bufbyte *) source->data.ptr;
+ len = source->data.len;
+ }
+
+#ifdef MULE
+ {
+ const Bufbyte *end;
+ for (end = ptr + len; ptr < end;)
+ {
+#ifdef UTF2000
+ Bufbyte c =
+ (*ptr < 0xc0) ? *ptr :
+ ((*ptr & 0x1f) << 6) | (*(ptr+1) & 0x3f);
+#else
+ Bufbyte c =
+ (BYTE_ASCII_P (*ptr)) ? *ptr :
+ (*ptr == LEADING_BYTE_CONTROL_1) ? (*(ptr+1) - 0x20) :
+ (*ptr == LEADING_BYTE_LATIN_ISO8859_1) ? (*(ptr+1)) :
+ '~';
+#endif
+
+ Dynarr_add (conversion_out_dynarr, (Extbyte) c);
+ INC_CHARPTR (ptr);
+ }
+ bufpos_checking_assert (ptr == end);
+ }
+#else
+ Dynarr_add_many (conversion_out_dynarr, ptr, len);
+#endif
+
+ }
+ else
+ {
+ Lisp_Object streams_to_delete[3];
+ int delete_count = 0;
+ Lisp_Object instream, outstream;
+ Lstream *reader, *writer;
+ struct gcpro gcpro1, gcpro2;
+
+ if (source_type == DFC_TYPE_LISP_LSTREAM)
+ instream = source->lisp_object;
+ else if (source_type == DFC_TYPE_DATA)
+ streams_to_delete[delete_count++] = instream =
+ make_fixed_buffer_input_stream (source->data.ptr, source->data.len);
+ else
+ {
+ type_checking_assert (source_type == DFC_TYPE_LISP_STRING);
+ streams_to_delete[delete_count++] = instream =
+ make_lisp_string_input_stream (source->lisp_object, 0, -1);
+ }
+
+ if (sink_type == DFC_TYPE_LISP_LSTREAM)
+ outstream = sink->lisp_object;
+ else
+ {
+ type_checking_assert (sink_type == DFC_TYPE_DATA);
+ streams_to_delete[delete_count++] = outstream =
+ make_dynarr_output_stream
+ ((unsigned_char_dynarr *) conversion_out_dynarr);
+ }
+
+#ifdef FILE_CODING
+ streams_to_delete[delete_count++] = outstream =
+ make_encoding_output_stream (XLSTREAM (outstream), coding_system);
+#endif
+
+ reader = XLSTREAM (instream);
+ writer = XLSTREAM (outstream);
+ /* decoding_stream will gc-protect outstream */
+ GCPRO2 (instream, outstream);
+
+ while (1)
+ {
+ ssize_t size_in_bytes;
+ char tempbuf[1024]; /* some random amount */
+
+ size_in_bytes = Lstream_read (reader, tempbuf, sizeof (tempbuf));
+
+ if (size_in_bytes == 0)
+ break;
+ else if (size_in_bytes < 0)
+ error ("Error converting to external format");
+
+ size_in_bytes = Lstream_write (writer, tempbuf, size_in_bytes);
+
+ if (size_in_bytes <= 0)
+ error ("Error converting to external format");
+ }
+
+ /* Closing writer will close any stream at the other end of writer. */
+ Lstream_close (writer);
+ Lstream_close (reader);
+ UNGCPRO;
+
+ /* The idea is that this function will create no garbage. */
+ while (delete_count)
+ Lstream_delete (XLSTREAM (streams_to_delete [--delete_count]));
+ }
+
+ unbind_to (count, Qnil);
+
+ if (sink_type != DFC_TYPE_LISP_LSTREAM)
+ {
+ sink->data.len = Dynarr_length (conversion_out_dynarr);
+ Dynarr_add (conversion_out_dynarr, 0);
+ sink->data.ptr = Dynarr_atp (conversion_out_dynarr, 0);
+ }
+}
+
+void
+dfc_convert_to_internal_format (dfc_conversion_type source_type,
+ dfc_conversion_data *source,
+#ifdef FILE_CODING
+ Lisp_Object coding_system,
+#endif
+ dfc_conversion_type sink_type,
+ dfc_conversion_data *sink)
+{
+ int count = specpdl_depth ();
+
+ type_checking_assert
+ ((source_type == DFC_TYPE_DATA ||
+ source_type == DFC_TYPE_LISP_LSTREAM)
+ &&
+ (sink_type == DFC_TYPE_DATA ||
+ sink_type == DFC_TYPE_LISP_LSTREAM));
+
+ if (dfc_convert_to_internal_format_in_use != 0)
+ error ("Can't call a conversion function from a conversion function");
+ else
+ dfc_convert_to_internal_format_in_use = 1;
+
+ record_unwind_protect (dfc_convert_to_internal_format_reset_in_use,
+ Qzero);
+
+#ifdef FILE_CODING
+ coding_system = Fget_coding_system (coding_system);
+#endif
+
+ Dynarr_reset (conversion_in_dynarr);
+
+ if (source_type != DFC_TYPE_LISP_LSTREAM &&
+ sink_type != DFC_TYPE_LISP_LSTREAM &&
+ coding_system_is_binary (coding_system))
+ {
+#ifdef MULE
+ const Bufbyte *ptr = (const Bufbyte *) source->data.ptr;
+ Bytecount len = source->data.len;
+ const Bufbyte *end = ptr + len;
+
+ for (; ptr < end; ptr++)
+ {
+ Extbyte c = *ptr;
+
+#ifdef UTF2000
+ if (BYTE_ASCII_P (c))
+ Dynarr_add (conversion_in_dynarr, c);
+ else
+ {
+ Dynarr_add (conversion_in_dynarr, (c >> 6) | 0xC0);
+ Dynarr_add (conversion_in_dynarr, (c & 0x3F) | 0x80);
+ }
+#else
+ if (BYTE_ASCII_P (c))
+ Dynarr_add (conversion_in_dynarr, c);
+ else if (BYTE_C1_P (c))
+ {
+ Dynarr_add (conversion_in_dynarr, LEADING_BYTE_CONTROL_1);
+ Dynarr_add (conversion_in_dynarr, c + 0x20);
+ }
+ else
+ {
+ Dynarr_add (conversion_in_dynarr, LEADING_BYTE_LATIN_ISO8859_1);
+ Dynarr_add (conversion_in_dynarr, c);
+ }
+#endif
+ }
+#else
+ Dynarr_add_many (conversion_in_dynarr, source->data.ptr, source->data.len);
+#endif
+ }
+ else
+ {
+ Lisp_Object streams_to_delete[3];
+ int delete_count = 0;
+ Lisp_Object instream, outstream;
+ Lstream *reader, *writer;
+ struct gcpro gcpro1, gcpro2;
+
+ if (source_type == DFC_TYPE_LISP_LSTREAM)
+ instream = source->lisp_object;
+ else
+ {
+ type_checking_assert (source_type == DFC_TYPE_DATA);
+ streams_to_delete[delete_count++] = instream =
+ make_fixed_buffer_input_stream (source->data.ptr, source->data.len);
+ }
+
+ if (sink_type == DFC_TYPE_LISP_LSTREAM)
+ outstream = sink->lisp_object;
+ else
+ {
+ type_checking_assert (sink_type == DFC_TYPE_DATA);
+ streams_to_delete[delete_count++] = outstream =
+ make_dynarr_output_stream
+ ((unsigned_char_dynarr *) conversion_in_dynarr);
+ }
+
+#ifdef FILE_CODING
+ streams_to_delete[delete_count++] = outstream =
+ make_decoding_output_stream (XLSTREAM (outstream), coding_system);
+#endif
+
+ reader = XLSTREAM (instream);
+ writer = XLSTREAM (outstream);
+ /* outstream will gc-protect its sink stream, if necessary */
+ GCPRO2 (instream, outstream);
+
+ while (1)
+ {
+ ssize_t size_in_bytes;
+ char tempbuf[1024]; /* some random amount */
+
+ size_in_bytes = Lstream_read (reader, tempbuf, sizeof (tempbuf));
+
+ if (size_in_bytes == 0)
+ break;
+ else if (size_in_bytes < 0)
+ error ("Error converting to internal format");
+
+ size_in_bytes = Lstream_write (writer, tempbuf, size_in_bytes);
+
+ if (size_in_bytes <= 0)
+ error ("Error converting to internal format");
+ }
+
+ /* Closing writer will close any stream at the other end of writer. */
+ Lstream_close (writer);
+ Lstream_close (reader);
+ UNGCPRO;
+
+ /* The idea is that this function will create no garbage. */
+ while (delete_count)
+ Lstream_delete (XLSTREAM (streams_to_delete [--delete_count]));
+ }
+
+ unbind_to (count, Qnil);
+
+ if (sink_type != DFC_TYPE_LISP_LSTREAM)
+ {
+ sink->data.len = Dynarr_length (conversion_in_dynarr);
+ Dynarr_add (conversion_in_dynarr, 0); /* remember to zero-terminate! */
+ sink->data.ptr = Dynarr_atp (conversion_in_dynarr, 0);
+ }
+}
+\f
+
void
syms_of_buffer (void)
{
void
reinit_vars_of_buffer (void)
{
+ conversion_in_dynarr = Dynarr_new (Bufbyte);
+ conversion_out_dynarr = Dynarr_new (Extbyte);
+
staticpro_nodump (&Vbuffer_alist);
Vbuffer_alist = Qnil;
current_buffer = 0;
static const struct lrecord_description buffer_slots_description_1[] = {
- { XD_LISP_OBJECT, 0, BUFFER_SLOTS_COUNT },
+ { XD_LISP_OBJECT_ARRAY, 0, BUFFER_SLOTS_COUNT },
{ XD_END }
};
buffer_local_symbols_saved_slots = &syms->BUFFER_SLOTS_FIRST_NAME;
dumpstruct (&buffer_defaults_saved_slots, &buffer_slots_description);
dumpstruct (&buffer_local_symbols_saved_slots, &buffer_slots_description);
-
+
DEFVAR_BUFFER_DEFAULTS ("default-modeline-format", modeline_format /*
Default value of `modeline-format' for buffers that don't override it.
This is the same as (default-value 'modeline-format).
/* Is PWD another name for `.' ? */
static int
-directory_is_current_directory (char *pwd)
+directory_is_current_directory (Extbyte *pwd)
{
Bufbyte *pwd_internal;
+ Bytecount pwd_internal_len;
struct stat dotstat, pwdstat;
- GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (pwd, pwd_internal);
+ TO_INTERNAL_FORMAT (DATA, (pwd, strlen ((char *)pwd) + 1),
+ ALLOCA, (pwd_internal, pwd_internal_len),
+ Qfile_name);
return (IS_DIRECTORY_SEP (*pwd_internal)
&& stat ((char *) pwd_internal, &pwdstat) == 0
&& stat (".", &dotstat) == 0
&& dotstat.st_ino == pwdstat.st_ino
&& dotstat.st_dev == pwdstat.st_dev
- && (int) strlen ((char *) pwd_internal) < MAXPATHLEN);
+ && pwd_internal_len < MAXPATHLEN);
}
void
{
/* This function can GC */
- char *pwd;
+ Extbyte *pwd;
initial_directory[0] = 0;
/* If PWD is accurate, use it instead of calling getcwd. This is faster
when PWD is right, and may avoid a fatal error. */
- if ((pwd = getenv ("PWD")) != NULL
+ if ((pwd = (Extbyte *) getenv ("PWD")) != NULL
&& directory_is_current_directory (pwd))
- strcpy (initial_directory, pwd);
+ strcpy (initial_directory, (char *) pwd);
else if (getcwd (initial_directory, MAXPATHLEN) == NULL)
fatal ("`getcwd' failed: %s\n", strerror (errno));
Fset_buffer (Fget_buffer_create (QSscratch));
current_buffer->directory =
- build_ext_string (initial_directory, FORMAT_FILENAME);
+ build_ext_string (initial_directory, Qfile_name);
#if 0 /* FSFmacs */
/* #### is this correct? */
Ben Wing: almost completely rewritten for Mule, 19.12.
*/
-#ifndef _XEMACS_BUFFER_H_
-#define _XEMACS_BUFFER_H_
+#ifndef INCLUDED_buffer_h_
+#define INCLUDED_buffer_h_
#include "character.h"
#include "multibyte.h"
/* The markers that refer to this buffer. This is actually a single
marker -- successive elements in its marker `chain' are the other
markers referring to this buffer */
- struct Lisp_Marker *markers;
+ Lisp_Marker *markers;
/* The buffer's extent info. This is its own type, an extent-info
object (done this way for ease in marking / finalizing). */
#define BUF_CHARPTR_COPY_CHAR(buf, pos, str) \
BI_BUF_CHARPTR_COPY_CHAR (buf, bufpos_to_bytind (buf, pos), str)
-
-
\f
/************************************************************************/
-/* */
-/* working with externally-formatted data */
-/* */
+/* */
+/* Converting between internal and external format */
+/* */
/************************************************************************/
+/*
+ All client code should use only the two macros
+
+ TO_EXTERNAL_FORMAT (source_type, source, sink_type, sink, coding_system)
+ TO_INTERNAL_FORMAT (source_type, source, sink_type, sink, coding_system)
+
+ Typical use is
+
+ TO_EXTERNAL_FORMAT (DATA, (ptr, len),
+ LISP_BUFFER, buffer,
+ Qfile_name);
+
+ The source or sink can be specified in one of these ways:
+
+ DATA, (ptr, len), // input data is a fixed buffer of size len
+ ALLOCA, (ptr, len), // output data is in a alloca()ed buffer of size len
+ MALLOC, (ptr, len), // output data is in a malloc()ed buffer of size len
+ C_STRING_ALLOCA, ptr, // equivalent to ALLOCA (ptr, len_ignored) on output.
+ C_STRING_MALLOC, ptr, // equivalent to MALLOC (ptr, len_ignored) on output.
+ C_STRING, ptr, // equivalent to DATA, (ptr, strlen (ptr) + 1) on input
+ LISP_STRING, string, // input or output is a Lisp_Object of type string
+ LISP_BUFFER, buffer, // output is written to (point) in lisp buffer
+ LISP_LSTREAM, lstream, // input or output is a Lisp_Object of type lstream
+ LISP_OPAQUE, object, // input or output is a Lisp_Object of type opaque
+
+ When specifying the sink, use lvalues, since the macro will assign to them,
+ except when the sink is an lstream or a lisp buffer.
+
+ The macros accept the kinds of sources and sinks appropriate for
+ internal and external data representation. See the type_checking_assert
+ macros below for the actual allowed types.
+
+ Since some sources and sinks use one argument (a Lisp_Object) to
+ specify them, while others take a (pointer, length) pair, we use
+ some C preprocessor trickery to allow pair arguments to be specified
+ by parenthesizing them, as in the examples above.
+
+ Anything prefixed by dfc_ (`data format conversion') is private.
+ They are only used to implement these macros.
+
+ Using C_STRING* is appropriate for using with external APIs that take
+ null-terminated strings. For internal data, we should try to be
+ '\0'-clean - i.e. allow arbitrary data to contain embedded '\0'.
+
+ Sometime in the future we might allow output to C_STRING_ALLOCA or
+ C_STRING_MALLOC _only_ with TO_EXTERNAL_FORMAT(), not
+ TO_INTERNAL_FORMAT(). */
+
+#define TO_EXTERNAL_FORMAT(source_type, source, sink_type, sink, coding_system) \
+do { \
+ dfc_conversion_type dfc_simplified_source_type; \
+ dfc_conversion_type dfc_simplified_sink_type; \
+ dfc_conversion_data dfc_source; \
+ dfc_conversion_data dfc_sink; \
+ \
+ type_checking_assert \
+ ((DFC_TYPE_##source_type == DFC_TYPE_DATA || \
+ DFC_TYPE_##source_type == DFC_TYPE_C_STRING || \
+ DFC_TYPE_##source_type == DFC_TYPE_LISP_STRING || \
+ DFC_TYPE_##source_type == DFC_TYPE_LISP_OPAQUE || \
+ DFC_TYPE_##source_type == DFC_TYPE_LISP_LSTREAM) \
+ && \
+ (DFC_TYPE_##sink_type == DFC_TYPE_ALLOCA || \
+ DFC_TYPE_##sink_type == DFC_TYPE_MALLOC || \
+ DFC_TYPE_##sink_type == DFC_TYPE_C_STRING_ALLOCA || \
+ DFC_TYPE_##sink_type == DFC_TYPE_C_STRING_MALLOC || \
+ DFC_TYPE_##sink_type == DFC_TYPE_LISP_LSTREAM || \
+ DFC_TYPE_##sink_type == DFC_TYPE_LISP_OPAQUE)); \
+ \
+ DFC_SOURCE_##source_type##_TO_ARGS (source); \
+ DFC_SINK_##sink_type##_TO_ARGS (sink); \
+ \
+ DFC_CONVERT_TO_EXTERNAL_FORMAT (dfc_simplified_source_type, &dfc_source, \
+ coding_system, \
+ dfc_simplified_sink_type, &dfc_sink); \
+ \
+ DFC_##sink_type##_USE_CONVERTED_DATA (sink); \
+} while (0)
-/* Sometimes strings need to be converted into one or another
- external format, for passing to a library function. (Note
- that we encapsulate and automatically convert the arguments
- of some functions, but not others.) At times this conversion
- also has to go the other way -- i.e. when we get external-
- format strings back from a library function.
-*/
+#define TO_INTERNAL_FORMAT(source_type, source, sink_type, sink, coding_system) \
+do { \
+ dfc_conversion_type dfc_simplified_source_type; \
+ dfc_conversion_type dfc_simplified_sink_type; \
+ dfc_conversion_data dfc_source; \
+ dfc_conversion_data dfc_sink; \
+ \
+ type_checking_assert \
+ ((DFC_TYPE_##source_type == DFC_TYPE_DATA || \
+ DFC_TYPE_##source_type == DFC_TYPE_C_STRING || \
+ DFC_TYPE_##source_type == DFC_TYPE_LISP_OPAQUE || \
+ DFC_TYPE_##source_type == DFC_TYPE_LISP_LSTREAM) \
+ && \
+ (DFC_TYPE_##sink_type == DFC_TYPE_ALLOCA || \
+ DFC_TYPE_##sink_type == DFC_TYPE_MALLOC || \
+ DFC_TYPE_##sink_type == DFC_TYPE_C_STRING_ALLOCA || \
+ DFC_TYPE_##sink_type == DFC_TYPE_C_STRING_MALLOC || \
+ DFC_TYPE_##sink_type == DFC_TYPE_LISP_STRING || \
+ DFC_TYPE_##sink_type == DFC_TYPE_LISP_LSTREAM || \
+ DFC_TYPE_##sink_type == DFC_TYPE_LISP_BUFFER)); \
+ \
+ DFC_SOURCE_##source_type##_TO_ARGS (source); \
+ DFC_SINK_##sink_type##_TO_ARGS (sink); \
+ \
+ DFC_CONVERT_TO_INTERNAL_FORMAT (dfc_simplified_source_type, &dfc_source, \
+ coding_system, \
+ dfc_simplified_sink_type, &dfc_sink); \
+ \
+ DFC_##sink_type##_USE_CONVERTED_DATA (sink); \
+} while (0)
#ifdef FILE_CODING
+#define DFC_CONVERT_TO_EXTERNAL_FORMAT dfc_convert_to_external_format
+#define DFC_CONVERT_TO_INTERNAL_FORMAT dfc_convert_to_internal_format
+#else
+/* ignore coding_system argument */
+#define DFC_CONVERT_TO_EXTERNAL_FORMAT(a, b, coding_system, c, d) \
+ dfc_convert_to_external_format (a, b, c, d)
+#define DFC_CONVERT_TO_INTERNAL_FORMAT(a, b, coding_system, c, d) \
+ dfc_convert_to_internal_format (a, b, c, d)
+#endif
-/* WARNING: These use a static buffer. This can lead to disaster if
- these functions are not used *very* carefully. Under normal
- circumstances, do not call these functions; call the front ends
- below. */
-
-Extbyte *convert_to_external_format (CONST Bufbyte *ptr,
- Bytecount len,
- Extcount *len_out,
- enum external_data_format fmt);
-Bufbyte *convert_from_external_format (CONST Extbyte *ptr,
- Extcount len,
- Bytecount *len_out,
- enum external_data_format fmt);
-
-#else /* ! MULE */
-
-#define convert_to_external_format(ptr, len, len_out, fmt) \
- (*(len_out) = (int) (len), (Extbyte *) (ptr))
-#define convert_from_external_format(ptr, len, len_out, fmt) \
- (*(len_out) = (Bytecount) (len), (Bufbyte *) (ptr))
-
-#endif /* ! MULE */
-
-/* In all of the following macros we use the following general principles:
-
- -- Functions that work with charptr's accept two sorts of charptr's:
-
- a) Pointers to memory with a length specified. The pointer will be
- fundamentally of type `unsigned char *' (although labelled
- as `Bufbyte *' for internal-format data and `Extbyte *' for
- external-format data) and the length will be fundamentally of
- type `int' (although labelled as `Bytecount' for internal-format
- data and `Extcount' for external-format data). The length is
- always a count in bytes.
- b) Zero-terminated pointers; no length specified. The pointer
- is of type `char *', whether the data pointed to is internal-format
- or external-format. These sorts of pointers are available for
- convenience in working with C library functions and literal
- strings. In general you should use these sorts of pointers only
- to interface to library routines and not for general manipulation,
- as you are liable to lose embedded nulls and such. This could
- be a big problem for routines that want Unicode-formatted data,
- which is likely to have lots of embedded nulls in it.
- (In the real world, though, external Unicode data will be UTF-8,
- which will not have embedded nulls and is ASCII-compatible - martin)
-
- -- Functions that work with Lisp strings accept strings as Lisp Objects
- (as opposed to the `struct Lisp_String *' for some of the other
- string accessors). This is for convenience in working with the
- functions, as otherwise you will almost always have to call
- XSTRING() on the object.
-
- -- Functions that work with charptr's are not guaranteed to copy
- their data into alloca()ed space. Functions that work with
- Lisp strings are, however. The reason is that Lisp strings can
- be relocated any time a GC happens, and it could happen at some
- rather unexpected times. The internal-external conversion is
- rarely done in time-critical functions, and so the slight
- extra time required for alloca() and copy is well-worth the
- safety of knowing your string data won't be relocated out from
- under you.
- */
-
-
-/* Maybe convert charptr's data into ext-format and store the result in
- alloca()'ed space.
-
- You may wonder why this is written in this fashion and not as a
- function call. With a little trickery it could certainly be
- written this way, but it won't work because of those DAMN GCC WANKERS
- who couldn't be bothered to handle alloca() properly on the x86
- architecture. (If you put a call to alloca() in the argument to
- a function call, the stack space gets allocated right in the
- middle of the arguments to the function call and you are unbelievably
- hosed.) */
+typedef union
+{
+ struct { const void *ptr; size_t len; } data;
+ Lisp_Object lisp_object;
+} dfc_conversion_data;
-#ifdef MULE
+enum dfc_conversion_type
+{
+ DFC_TYPE_DATA,
+ DFC_TYPE_ALLOCA,
+ DFC_TYPE_MALLOC,
+ DFC_TYPE_C_STRING,
+ DFC_TYPE_C_STRING_ALLOCA,
+ DFC_TYPE_C_STRING_MALLOC,
+ DFC_TYPE_LISP_STRING,
+ DFC_TYPE_LISP_LSTREAM,
+ DFC_TYPE_LISP_OPAQUE,
+ DFC_TYPE_LISP_BUFFER
+};
+typedef enum dfc_conversion_type dfc_conversion_type;
-#define GET_CHARPTR_EXT_DATA_ALLOCA(ptr, len, fmt, ptr_out, len_out) do \
-{ \
- Bytecount gceda_len_in = (Bytecount) (len); \
- Extcount gceda_len_out; \
- CONST Bufbyte *gceda_ptr_in = (ptr); \
- Extbyte *gceda_ptr_out = \
- convert_to_external_format (gceda_ptr_in, gceda_len_in, \
- &gceda_len_out, fmt); \
- /* If the new string is identical to the old (will be the case most \
- of the time), just return the same string back. This saves \
- on alloca()ing, which can be useful on C alloca() machines and \
- on stack-space-challenged environments. */ \
- \
- if (gceda_len_in == gceda_len_out && \
- !memcmp (gceda_ptr_in, gceda_ptr_out, gceda_len_out)) \
- { \
- (ptr_out) = (Extbyte *) gceda_ptr_in; \
- } \
- else \
- { \
- (ptr_out) = (Extbyte *) alloca (1 + gceda_len_out); \
- memcpy ((void *) ptr_out, gceda_ptr_out, 1 + gceda_len_out); \
- } \
- (len_out) = gceda_len_out; \
+/* WARNING: These use a static buffer. This can lead to disaster if
+ these functions are not used *very* carefully. Another reason to only use
+ TO_EXTERNAL_FORMATf() and TO_INTERNAL_FORMAT(). */
+void
+dfc_convert_to_external_format (dfc_conversion_type source_type,
+ dfc_conversion_data *source,
+#ifdef FILE_CODING
+ Lisp_Object coding_system,
+#endif
+ dfc_conversion_type sink_type,
+ dfc_conversion_data *sink);
+void
+dfc_convert_to_internal_format (dfc_conversion_type source_type,
+ dfc_conversion_data *source,
+#ifdef FILE_CODING
+ Lisp_Object coding_system,
+#endif
+ dfc_conversion_type sink_type,
+ dfc_conversion_data *sink);
+/* CPP Trickery */
+#define DFC_CPP_CAR(x,y) (x)
+#define DFC_CPP_CDR(x,y) (y)
+
+/* Convert `source' to args for dfc_convert_to_*_format() */
+#define DFC_SOURCE_DATA_TO_ARGS(val) do { \
+ dfc_source.data.ptr = DFC_CPP_CAR val; \
+ dfc_source.data.len = DFC_CPP_CDR val; \
+ dfc_simplified_source_type = DFC_TYPE_DATA; \
+} while (0)
+#define DFC_SOURCE_C_STRING_TO_ARGS(val) do { \
+ dfc_source.data.len = \
+ strlen ((char *) (dfc_source.data.ptr = (val))); \
+ dfc_simplified_source_type = DFC_TYPE_DATA; \
+} while (0)
+#define DFC_SOURCE_LISP_STRING_TO_ARGS(val) do { \
+ Lisp_Object dfc_slsta = (val); \
+ type_checking_assert (STRINGP (dfc_slsta)); \
+ dfc_source.lisp_object = dfc_slsta; \
+ dfc_simplified_source_type = DFC_TYPE_LISP_STRING; \
+} while (0)
+#define DFC_SOURCE_LISP_LSTREAM_TO_ARGS(val) do { \
+ Lisp_Object dfc_sllta = (val); \
+ type_checking_assert (LSTREAMP (dfc_sllta)); \
+ dfc_source.lisp_object = dfc_sllta; \
+ dfc_simplified_source_type = DFC_TYPE_LISP_LSTREAM; \
+} while (0)
+#define DFC_SOURCE_LISP_OPAQUE_TO_ARGS(val) do { \
+ Lisp_Opaque *dfc_slota = XOPAQUE (val); \
+ dfc_source.data.ptr = OPAQUE_DATA (dfc_slota); \
+ dfc_source.data.len = OPAQUE_SIZE (dfc_slota); \
+ dfc_simplified_source_type = DFC_TYPE_DATA; \
} while (0)
-#else /* ! MULE */
-
-#define GET_CHARPTR_EXT_DATA_ALLOCA(ptr, len, fmt, ptr_out, len_out) do \
-{ \
- (ptr_out) = (Extbyte *) (ptr); \
- (len_out) = (Extcount) (len); \
+/* Convert `sink' to args for dfc_convert_to_*_format() */
+#define DFC_SINK_ALLOCA_TO_ARGS(val) \
+ dfc_simplified_sink_type = DFC_TYPE_DATA
+#define DFC_SINK_C_STRING_ALLOCA_TO_ARGS(val) \
+ dfc_simplified_sink_type = DFC_TYPE_DATA
+#define DFC_SINK_MALLOC_TO_ARGS(val) \
+ dfc_simplified_sink_type = DFC_TYPE_DATA
+#define DFC_SINK_C_STRING_MALLOC_TO_ARGS(val) \
+ dfc_simplified_sink_type = DFC_TYPE_DATA
+#define DFC_SINK_LISP_STRING_TO_ARGS(val) \
+ dfc_simplified_sink_type = DFC_TYPE_DATA
+#define DFC_SINK_LISP_OPAQUE_TO_ARGS(val) \
+ dfc_simplified_sink_type = DFC_TYPE_DATA
+#define DFC_SINK_LISP_LSTREAM_TO_ARGS(val) do { \
+ Lisp_Object dfc_sllta = (val); \
+ type_checking_assert (LSTREAMP (dfc_sllta)); \
+ dfc_sink.lisp_object = dfc_sllta; \
+ dfc_simplified_sink_type = DFC_TYPE_LISP_LSTREAM; \
+} while (0)
+#define DFC_SINK_LISP_BUFFER_TO_ARGS(val) do { \
+ struct buffer *dfc_slbta = XBUFFER (val); \
+ dfc_sink.lisp_object = \
+ make_lisp_buffer_output_stream \
+ (dfc_slbta, BUF_PT (dfc_slbta), 0); \
+ dfc_simplified_sink_type = DFC_TYPE_LISP_LSTREAM; \
} while (0)
-#endif /* ! MULE */
+/* Assign to the `sink' lvalue(s) using the converted data. */
+#define DFC_ALLOCA_USE_CONVERTED_DATA(sink) do { \
+ void * dfc_sink_ret = alloca (dfc_sink.data.len + 1); \
+ memcpy (dfc_sink_ret, dfc_sink.data.ptr, dfc_sink.data.len + 1); \
+ (DFC_CPP_CAR sink) = (unsigned char *) dfc_sink_ret; \
+ (DFC_CPP_CDR sink) = dfc_sink.data.len; \
+} while (0)
+#define DFC_MALLOC_USE_CONVERTED_DATA(sink) do { \
+ void * dfc_sink_ret = xmalloc (dfc_sink.data.len + 1); \
+ memcpy (dfc_sink_ret, dfc_sink.data.ptr, dfc_sink.data.len + 1); \
+ (DFC_CPP_CAR sink) = (unsigned char *) dfc_sink_ret; \
+ (DFC_CPP_CDR sink) = dfc_sink.data.len; \
+} while (0)
+#define DFC_C_STRING_ALLOCA_USE_CONVERTED_DATA(sink) do { \
+ void * dfc_sink_ret = alloca (dfc_sink.data.len + 1); \
+ memcpy (dfc_sink_ret, dfc_sink.data.ptr, dfc_sink.data.len + 1); \
+ (sink) = (char *) dfc_sink_ret; \
+} while (0)
+#define DFC_C_STRING_MALLOC_USE_CONVERTED_DATA(sink) do { \
+ void * dfc_sink_ret = xmalloc (dfc_sink.data.len + 1); \
+ memcpy (dfc_sink_ret, dfc_sink.data.ptr, dfc_sink.data.len + 1); \
+ (sink) = (char *) dfc_sink_ret; \
+} while (0)
+#define DFC_LISP_STRING_USE_CONVERTED_DATA(sink) \
+ sink = make_string ((Bufbyte *) dfc_sink.data.ptr, dfc_sink.data.len)
+#define DFC_LISP_OPAQUE_USE_CONVERTED_DATA(sink) \
+ sink = make_opaque (dfc_sink.data.ptr, dfc_sink.data.len)
+#define DFC_LISP_LSTREAM_USE_CONVERTED_DATA(sink) /* data already used */
+#define DFC_LISP_BUFFER_USE_CONVERTED_DATA(sink) \
+ Lstream_delete (XLSTREAM (dfc_sink.lisp_object))
+
+/* Someday we might want to distinguish between Qnative and Qfile_name
+ by using coding-system aliases, but for now it suffices to have
+ these be identical. Qnative can be used as the coding_system
+ argument to TO_EXTERNAL_FORMAT() and TO_INTERNAL_FORMAT(). */
+#define Qnative Qfile_name
#define GET_C_CHARPTR_EXT_DATA_ALLOCA(ptr, fmt, ptr_out) do \
{ \
#ifdef REL_ALLOC
-char *r_alloc (unsigned char **, unsigned long);
-char *r_re_alloc (unsigned char **, unsigned long);
+char *r_alloc (unsigned char **, size_t);
+char *r_re_alloc (unsigned char **, size_t);
void r_alloc_free (unsigned char **);
#define BUFFER_ALLOC(data, size) \
set_string_char (XSTRING (table), (Charcount) ch1, ch2)
#ifdef MULE
-# define MAKE_MIRROR_TRT_TABLE() make_opaque (256, 0)
+# define MAKE_MIRROR_TRT_TABLE() make_opaque (OPAQUE_CLEAR, 256)
# define MIRROR_TRT_TABLE_AS_STRING(table) ((Bufbyte *) XOPAQUE_DATA (table))
# define MIRROR_TRT_TABLE_CHAR_1(table, ch) \
((Emchar) (MIRROR_TRT_TABLE_AS_STRING (table)[ch]))
#define DOWNCASE(buf, ch) DOWNCASE_TABLE_OF (buf, ch)
-#endif /* _XEMACS_BUFFER_H_ */
+#endif /* INCLUDED_buffer_h_ */
do_varset:
{
Lisp_Object symbol = constants_data[n];
- struct Lisp_Symbol *symbol_ptr = XSYMBOL (symbol);
+ Lisp_Symbol *symbol_ptr = XSYMBOL (symbol);
Lisp_Object old_value = symbol_ptr->value;
Lisp_Object new_value = POP;
if (!SYMBOL_VALUE_MAGIC_P (old_value) || UNBOUNDP (old_value))
do_varbind:
{
Lisp_Object symbol = constants_data[n];
- struct Lisp_Symbol *symbol_ptr = XSYMBOL (symbol);
+ Lisp_Symbol *symbol_ptr = XSYMBOL (symbol);
Lisp_Object old_value = symbol_ptr->value;
Lisp_Object new_value = POP;
if (!SYMBOL_VALUE_MAGIC_P (old_value) || UNBOUNDP (old_value))
program, &program_length, &varbind_count);
f->specpdl_depth = XINT (Flength (f->arglist)) + varbind_count;
f->instructions =
- make_opaque (program_length * sizeof (Opbyte),
- (CONST void *) program);
+ make_opaque (program, program_length * sizeof (Opbyte));
}
assert (OPAQUEP (f->instructions));
}
static const struct lrecord_description compiled_function_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Compiled_Function, instructions), 4 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, instructions) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, constants) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, arglist) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, doc_and_interactive) },
#ifdef COMPILED_FUNCTION_ANNOTATION_HACK
- { XD_LISP_OBJECT, offsetof(struct Lisp_Compiled_Function, annotated), 1 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, annotated) },
#endif
{ XD_END }
};
Jon Reid: some changes for I18N3 (domain, etc), for 19.8.
*/
-#ifndef _XEMACS_BYTECODE_H_
-#define _XEMACS_BYTECODE_H_
+#ifndef INCLUDED_bytecode_h_
+#define INCLUDED_bytecode_h_
/* Meanings of slots in a Lisp_Compiled_Function.
Don't use these! For backward compatibility only. */
neither - : (* 559 0) = 0 = 3530
*/
-#endif /* _XEMACS_BYTECODE_H_ */
+#endif /* INCLUDED_bytecode_h_ */
static Lisp_Object
quotify_args (Lisp_Object expr)
{
- REGISTER Lisp_Object tail;
- REGISTER struct Lisp_Cons *ptr;
+ Lisp_Object tail;
+ Lisp_Cons *ptr;
for (tail = expr; CONSP (tail); tail = ptr->cdr)
{
ptr = XCONS (tail);
#ifdef WINDOWSNT
#define _P_NOWAIT 1 /* from process.h */
-#include <windows.h>
#include "nt.h"
#endif
static Lisp_Object
call_process_cleanup (Lisp_Object fdpid)
{
- int fd = XINT (Fcar (fdpid));
+ int fd = XINT (Fcar (fdpid));
int pid = XINT (Fcdr (fdpid));
-#ifdef WINDOWSNT
- HANDLE pHandle;
-#endif
if (!call_process_exited &&
EMACS_KILLPG (pid, SIGINT) == 0)
message ("Waiting for process to die...(type C-g again to kill it instantly)");
#ifdef WINDOWSNT
- pHandle = OpenProcess(PROCESS_ALL_ACCESS, 0, pid);
- if (pHandle == NULL)
- {
+ {
+ HANDLE pHandle = OpenProcess (PROCESS_ALL_ACCESS, 0, pid);
+ if (pHandle == NULL)
warn_when_safe (Qprocess, Qwarning,
"cannot open process (PID %d) for cleanup", pid);
- }
- wait_for_termination (pHandle);
+ else
+ wait_for_termination (pHandle);
+ }
#else
wait_for_termination (pid);
#endif
if (nread == 0)
break;
+#if 0
#ifdef DOS_NT
/* Until we pull out of MULE things like
make_decoding_input_stream(), we do the following which is
less elegant. --marcpa */
+ /* We did. -- kkm */
{
int lf_count = 0;
if (NILP (Vbinary_process_output)) {
}
}
#endif
+#endif
total_read += nread;
{
char **ep = env;
char *envvar_external;
- Bufbyte *envvar_internal = XSTRING_DATA (XCAR (tail));
- GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA (envvar_internal, envvar_external);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (tail),
+ C_STRING_ALLOCA, envvar_external,
+ Qfile_name);
/* See if envvar_external duplicates any string already in the env.
If so, don't put it in.
char **envp;
Vprocess_environment = Qnil;
for (envp = environ; envp && *envp; envp++)
- {
- Vprocess_environment = Fcons (build_ext_string (*envp, FORMAT_OS),
- Vprocess_environment);
- }
+ Vprocess_environment =
+ Fcons (build_ext_string (*envp, Qfile_name), Vprocess_environment);
}
{
if (STRINGP (obj))
{
- struct Lisp_Char_Table *syntax_table =
- XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
Bufbyte *storage =
alloca_array (Bufbyte, XSTRING_LENGTH (obj) * MAX_EMCHAR_LEN);
Bufbyte *newp = storage;
/* This function can GC */
REGISTER Bufpos i;
Bufpos start, end;
- struct Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
int mccount;
Emchar oldc, c;
int wordp = 0, wordp_prev;
/* Rewritten by MORIOKA Tomohiko <tomo@m17n.org>. */
-#ifndef _XEMACS_CHAR_UCS_H
-#define _XEMACS_CHAR_UCS_H
+#ifndef INCLUDED_char_ucs_h_
+#define INCLUDED_char_ucs_h_
#define valid_char_p(ch) 1
int id;
Lisp_Object name;
- Lisp_Object doc_string, registry, short_name, long_name;
+ Lisp_Object doc_string;
+ Lisp_Object registry;
+ Lisp_Object short_name;
+ Lisp_Object long_name;
Lisp_Object reverse_direction_charset;
/* Offset for each byte */
Emchar byte_offset;
};
+typedef struct Lisp_Charset Lisp_Charset;
-DECLARE_LRECORD (charset, struct Lisp_Charset);
-#define XCHARSET(x) XRECORD (x, charset, struct Lisp_Charset)
+DECLARE_LRECORD (charset, Lisp_Charset);
+#define XCHARSET(x) XRECORD (x, charset, Lisp_Charset)
#define XSETCHARSET(x, p) XSETRECORD (x, p, charset)
#define CHARSETP(x) RECORDP (x, charset)
#define GC_CHARSETP(x) GC_RECORDP (x, charset)
extern Lisp_Object Vcharset_japanese_jisx0208;
extern Lisp_Object Vcharset_japanese_jisx0212;
-#endif /* _XEMACS_CHAR_UCS_H */
+#endif /* INCLUDED_char_ucs_h_ */
static Lisp_Object
mark_char_table_entry (Lisp_Object obj)
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj);
int i;
for (i = 0; i < 96; i++)
static int
char_table_entry_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Char_Table_Entry *cte1 = XCHAR_TABLE_ENTRY (obj1);
- struct Lisp_Char_Table_Entry *cte2 = XCHAR_TABLE_ENTRY (obj2);
+ Lisp_Char_Table_Entry *cte1 = XCHAR_TABLE_ENTRY (obj1);
+ Lisp_Char_Table_Entry *cte2 = XCHAR_TABLE_ENTRY (obj2);
int i;
for (i = 0; i < 96; i++)
static unsigned long
char_table_entry_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj);
return internal_array_hash (cte->level2, 96, depth);
}
static const struct lrecord_description char_table_entry_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table_Entry, level2), 96 },
+ { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table_Entry, level2), 96 },
{ XD_END }
};
0, char_table_entry_equal,
char_table_entry_hash,
char_table_entry_description,
- struct Lisp_Char_Table_Entry);
+ Lisp_Char_Table_Entry);
#endif /* MULE */
static Lisp_Object
mark_char_table (Lisp_Object obj)
{
- struct Lisp_Char_Table *ct = XCHAR_TABLE (obj);
+ Lisp_Char_Table *ct = XCHAR_TABLE (obj);
int i;
for (i = 0; i < NUM_ASCII_CHARS; i++)
static void
print_chartab_charset_row (Lisp_Object charset,
int row,
- struct Lisp_Char_Table_Entry *cte,
+ Lisp_Char_Table_Entry *cte,
Lisp_Object printcharfun)
{
int i;
static void
print_chartab_two_byte_charset (Lisp_Object charset,
- struct Lisp_Char_Table_Entry *cte,
+ Lisp_Char_Table_Entry *cte,
Lisp_Object printcharfun)
{
int i;
static void
print_char_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Char_Table *ct = XCHAR_TABLE (obj);
+ Lisp_Char_Table *ct = XCHAR_TABLE (obj);
char buf[200];
sprintf (buf, "#s(char-table type %s data (",
}
else
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (ann);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (ann);
if (XCHARSET_DIMENSION (charset) == 1)
print_chartab_charset_row (charset, -1, cte, printcharfun);
else
static int
char_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Char_Table *ct1 = XCHAR_TABLE (obj1);
- struct Lisp_Char_Table *ct2 = XCHAR_TABLE (obj2);
+ Lisp_Char_Table *ct1 = XCHAR_TABLE (obj1);
+ Lisp_Char_Table *ct2 = XCHAR_TABLE (obj2);
int i;
if (CHAR_TABLE_TYPE (ct1) != CHAR_TABLE_TYPE (ct2))
static unsigned long
char_table_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Char_Table *ct = XCHAR_TABLE (obj);
+ Lisp_Char_Table *ct = XCHAR_TABLE (obj);
unsigned long hashval = internal_array_hash (ct->ascii, NUM_ASCII_CHARS,
depth);
#ifdef MULE
}
static const struct lrecord_description char_table_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table, ascii), NUM_ASCII_CHARS },
+ { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS },
#ifdef MULE
- { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table, level1), NUM_LEADING_BYTES },
+ { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, level1), NUM_LEADING_BYTES },
#endif
- { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table, mirror_table), 1 },
- { XD_LO_LINK, offsetof(struct Lisp_Char_Table, next_table) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, mirror_table) },
+ { XD_LO_LINK, offsetof (Lisp_Char_Table, next_table) },
{ XD_END }
};
mark_char_table, print_char_table, 0,
char_table_equal, char_table_hash,
char_table_description,
- struct Lisp_Char_Table);
+ Lisp_Char_Table);
DEFUN ("char-table-p", Fchar_table_p, 1, 1, 0, /*
Return non-nil if OBJECT is a char table.
}
void
-fill_char_table (struct Lisp_Char_Table *ct, Lisp_Object value)
+fill_char_table (Lisp_Char_Table *ct, Lisp_Object value)
{
int i;
*/
(table))
{
- struct Lisp_Char_Table *ct;
+ Lisp_Char_Table *ct;
CHECK_CHAR_TABLE (table);
ct = XCHAR_TABLE (table);
*/
(type))
{
- struct Lisp_Char_Table *ct;
+ Lisp_Char_Table *ct;
Lisp_Object obj;
enum char_table_type ty = symbol_to_char_table_type (type);
- ct = alloc_lcrecord_type (struct Lisp_Char_Table, &lrecord_char_table);
+ ct = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table);
ct->type = ty;
if (ty == CHAR_TABLE_TYPE_SYNTAX)
{
{
Lisp_Object obj;
int i;
- struct Lisp_Char_Table_Entry *cte =
- alloc_lcrecord_type (struct Lisp_Char_Table_Entry,
- &lrecord_char_table_entry);
+ Lisp_Char_Table_Entry *cte =
+ alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
for (i = 0; i < 96; i++)
cte->level2[i] = initval;
static Lisp_Object
copy_char_table_entry (Lisp_Object entry)
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (entry);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (entry);
Lisp_Object obj;
int i;
- struct Lisp_Char_Table_Entry *ctenew =
- alloc_lcrecord_type (struct Lisp_Char_Table_Entry,
- &lrecord_char_table_entry);
+ Lisp_Char_Table_Entry *ctenew =
+ alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
for (i = 0; i < 96; i++)
{
*/
(old_table))
{
- struct Lisp_Char_Table *ct, *ctnew;
+ Lisp_Char_Table *ct, *ctnew;
Lisp_Object obj;
int i;
CHECK_CHAR_TABLE (old_table);
ct = XCHAR_TABLE (old_table);
- ctnew = alloc_lcrecord_type (struct Lisp_Char_Table, &lrecord_char_table);
+ ctnew = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table);
ctnew->type = ct->type;
for (i = 0; i < NUM_ASCII_CHARS; i++)
#else /* MULE */
else if (VECTORP (range))
{
- struct Lisp_Vector *vec = XVECTOR (range);
+ Lisp_Vector *vec = XVECTOR (range);
Lisp_Object *elts = vector_data (vec);
if (vector_length (vec) != 2)
signal_simple_error ("Length of charset row vector must be 2",
/* called from CHAR_TABLE_VALUE(). */
Lisp_Object
-get_non_ascii_char_table_value (struct Lisp_Char_Table *ct,
- Charset_ID leading_byte, Emchar c)
+get_non_ascii_char_table_value (Lisp_Char_Table *ct, Charset_ID leading_byte,
+ Emchar c)
{
Lisp_Object val;
#ifdef UTF2000
val = ct->level1[leading_byte - MIN_LEADING_BYTE];
if (CHAR_TABLE_ENTRYP (val))
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
val = cte->level2[byte1 - 32];
if (CHAR_TABLE_ENTRYP (val))
{
#endif /* MULE */
Lisp_Object
-get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
+get_char_table (Emchar ch, Lisp_Char_Table *ct)
{
#ifdef MULE
{
val = ct->level1[lb];
if (CHAR_TABLE_ENTRYP (val))
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
val = cte->level2[byte1 - 32];
if (CHAR_TABLE_ENTRYP (val))
{
*/
(ch, table))
{
- struct Lisp_Char_Table *ct;
+ Lisp_Char_Table *ct;
CHECK_CHAR_TABLE (table);
ct = XCHAR_TABLE (table);
*/
(range, table, multi))
{
- struct Lisp_Char_Table *ct;
+ Lisp_Char_Table *ct;
struct chartab_range rainj;
if (CHAR_OR_CHAR_INTP (range))
/* Assign VAL to all characters in RANGE in char table CT. */
void
-put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
+put_char_table (Lisp_Char_Table *ct, struct chartab_range *range,
Lisp_Object val)
{
switch (range->type)
case CHARTAB_RANGE_ROW:
{
- struct Lisp_Char_Table_Entry *cte;
+ Lisp_Char_Table_Entry *cte;
int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
/* make sure that there is a separate entry for the row. */
if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
ct->ascii[byte1 + 128] = val;
else
{
- struct Lisp_Char_Table_Entry *cte;
+ Lisp_Char_Table_Entry *cte;
int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
/* make sure that there is a separate entry for the row. */
if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
*/
(range, val, table))
{
- struct Lisp_Char_Table *ct;
+ Lisp_Char_Table *ct;
struct chartab_range rainj;
CHECK_CHAR_TABLE (table);
/* Map FN over the ASCII chars in CT. */
static int
-map_over_charset_ascii (struct Lisp_Char_Table *ct,
+map_over_charset_ascii (Lisp_Char_Table *ct,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
void *arg)
/* Map FN over the Control-1 chars in CT. */
static int
-map_over_charset_control_1 (struct Lisp_Char_Table *ct,
+map_over_charset_control_1 (Lisp_Char_Table *ct,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
void *arg)
CTE specifies the char table entry for CHARSET. */
static int
-map_over_charset_row (struct Lisp_Char_Table_Entry *cte,
+map_over_charset_row (Lisp_Char_Table_Entry *cte,
Lisp_Object charset, int row,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
static int
-map_over_other_charset (struct Lisp_Char_Table *ct, Charset_ID lb,
+map_over_other_charset (Lisp_Char_Table *ct, Charset_ID lb,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
void *arg)
}
{
- struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
+ Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
int charset94_p = (XCHARSET_CHARS (charset) == 94);
int start = charset94_p ? 33 : 32;
int stop = charset94_p ? 127 : 128;
becomes the return value of map_char_table(). */
int
-map_char_table (struct Lisp_Char_Table *ct,
+map_char_table (Lisp_Char_Table *ct,
struct chartab_range *range,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
*/
(function, table, range))
{
- struct Lisp_Char_Table *ct;
+ Lisp_Char_Table *ct;
struct slow_map_char_table_arg slarg;
struct gcpro gcpro1, gcpro2;
struct chartab_range rainj;
unsigned int designator, unsigned int not)
{
REGISTER Lisp_Object temp;
- struct Lisp_Char_Table *ctbl;
+ Lisp_Char_Table *ctbl;
#ifdef ERROR_CHECK_TYPECHECK
if (NILP (Fcategory_table_p (table)))
signal_simple_error ("Expected category table", table);
This file was written independently of the FSF implementation,
and is not compatible. */
-#ifndef _MULE_CHARTAB_H
-#define _MULE_CHARTAB_H
+#ifndef INCLUDED_chartab_h_
+#define INCLUDED_chartab_h_
/************************************************************************/
/* Char Tables */
#ifdef MULE
-DECLARE_LRECORD (char_table_entry, struct Lisp_Char_Table_Entry);
-#define XCHAR_TABLE_ENTRY(x) \
- XRECORD (x, char_table_entry, struct Lisp_Char_Table_Entry)
-#define XSETCHAR_TABLE_ENTRY(x, p) XSETRECORD (x, p, char_table_entry)
-#define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry)
-/* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry)
- char table entries should never escape to Lisp */
-
struct Lisp_Char_Table_Entry
{
struct lcrecord_header header;
variable-size and add an offset value into this structure. */
Lisp_Object level2[96];
};
+typedef struct Lisp_Char_Table_Entry Lisp_Char_Table_Entry;
-#endif /* MULE */
-
-DECLARE_LRECORD (char_table, struct Lisp_Char_Table);
-#define XCHAR_TABLE(x) \
- XRECORD (x, char_table, struct Lisp_Char_Table)
-#define XSETCHAR_TABLE(x, p) XSETRECORD (x, p, char_table)
-#define CHAR_TABLEP(x) RECORDP (x, char_table)
-#define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table)
-#define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table)
+DECLARE_LRECORD (char_table_entry, Lisp_Char_Table_Entry);
+#define XCHAR_TABLE_ENTRY(x) \
+ XRECORD (x, char_table_entry, Lisp_Char_Table_Entry)
+#define XSETCHAR_TABLE_ENTRY(x, p) XSETRECORD (x, p, char_table_entry)
+#define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry)
+/* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry)
+ char table entries should never escape to Lisp */
-#define CHAR_TABLE_TYPE(ct) ((ct)->type)
-#define XCHAR_TABLE_TYPE(ct) CHAR_TABLE_TYPE (XCHAR_TABLE (ct))
+#endif /* MULE */
enum char_table_type
{
Lisp_Object mirror_table;
Lisp_Object next_table; /* DO NOT mark through this. */
};
+typedef struct Lisp_Char_Table Lisp_Char_Table;
+
+DECLARE_LRECORD (char_table, Lisp_Char_Table);
+#define XCHAR_TABLE(x) XRECORD (x, char_table, Lisp_Char_Table)
+#define XSETCHAR_TABLE(x, p) XSETRECORD (x, p, char_table)
+#define CHAR_TABLEP(x) RECORDP (x, char_table)
+#define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table)
+#define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table)
+
+#define CHAR_TABLE_TYPE(ct) ((ct)->type)
+#define XCHAR_TABLE_TYPE(ct) CHAR_TABLE_TYPE (XCHAR_TABLE (ct))
#ifdef MULE
-Lisp_Object get_non_ascii_char_table_value (struct Lisp_Char_Table *ct,
- int leading_byte,
- Emchar c);
+Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct,
+ int leading_byte,
+ Emchar c);
INLINE Lisp_Object
-CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (struct Lisp_Char_Table *ct, Emchar ch);
+CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch);
INLINE Lisp_Object
-CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (struct Lisp_Char_Table *ct, Emchar ch)
+CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch)
{
#ifdef UTF2000
Charset_ID lb = CHAR_CHARSET_ID (ch);
int row;
};
-void fill_char_table (struct Lisp_Char_Table *ct, Lisp_Object value);
-void put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
+void fill_char_table (Lisp_Char_Table *ct, Lisp_Object value);
+void put_char_table (Lisp_Char_Table *ct, struct chartab_range *range,
Lisp_Object val);
-Lisp_Object get_char_table (Emchar, struct Lisp_Char_Table *);
-int map_char_table (struct Lisp_Char_Table *ct,
+Lisp_Object get_char_table (Emchar, Lisp_Char_Table *);
+int map_char_table (Lisp_Char_Table *ct,
struct chartab_range *range,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
#endif /* MULE */
-#endif /* _MULE_CHARTAB_H */
+#endif /* INCLUDED_chartab_h_ */
/* #### Chuck -- This file should be deleted. I'm not deleting it yet
because there might be something you want out of it. */
-#ifndef _XEMACS_CM_H_
-#define _XEMACS_CM_H_
+#ifndef INCLUDED_cm_h_
+#define INCLUDED_cm_h_
/* Holds the minimum and maximum costs for the parametrized capabilities. */
struct parmcap
void Wcm_clear (void);
int Wcm_init (void);
-#endif /* _XEMACS_CM_H_ */
+#endif /* INCLUDED_cm_h_ */
REGISTER enum syntaxcode synt;
REGISTER Emchar c2;
Lisp_Object overwrite;
- struct Lisp_Char_Table *syntax_table;
+ Lisp_Char_Table *syntax_table;
struct buffer *buf = current_buffer;
int tab_width;
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_COMMANDS_H_
-#define _XEMACS_COMMANDS_H_
+#ifndef INCLUDED_commands_h_
+#define INCLUDED_commands_h_
#if 0 /* FSFmacs */
#define Ctl(c) ((c)&037)
extern Lisp_Object Vthis_command_keys; /* event-stream.c */
-#endif /* _XEMACS_COMMANDS_H_ */
+#endif /* INCLUDED_commands_h_ */
#undef HAVE_FPATHCONF
#undef HAVE_FREXP
#undef HAVE_FTIME
+#undef HAVE_GETADDRINFO
#undef HAVE_GETHOSTNAME
+#undef HAVE_GETNAMEINFO
#undef HAVE_GETPAGESIZE
#undef HAVE_GETTIMEOFDAY
#undef HAVE_GETWD
/* Check the entire extent structure of a buffer each time an extent
change is done, and do other extent-related checks. */
#undef ERROR_CHECK_EXTENTS
+
/* Make sure that all X... macros are dereferencing the correct type,
and that all XSET... macros (as much as possible) are setting the
correct type of structure. Highly recommended for all
development work. */
#undef ERROR_CHECK_TYPECHECK
+#ifdef ERROR_CHECK_TYPECHECK
+#define type_checking_assert(assertion) assert (assertion)
+#else
+#define type_checking_assert(assertion)
+#endif
+
/* Make sure valid buffer positions are passed to BUF_* macros. */
#undef ERROR_CHECK_BUFPOS
+#ifdef ERROR_CHECK_BUFPOS
+#define bufpos_checking_assert(assertion) assert (assertion)
+#else
+#define bufpos_checking_assert(assertion)
+#endif
+
/* Attempt to catch bugs related to garbage collection (e.g. not GCPRO'ing). */
#undef ERROR_CHECK_GC
+
/* Attempt to catch freeing of a non-malloc()ed block, heap corruption, etc. */
#undef ERROR_CHECK_MALLOC
+
/* Minor sanity checking of the bytecode interpreter. Useful for
debugging the byte compiler. */
#undef ERROR_CHECK_BYTE_CODE
#undef LWLIB_TABS_LUCID
#undef LWLIB_WIDGETS_MOTIF
#undef LWLIB_WIDGETS_ATHENA
+#undef HAVE_ATHENA_3D
/* Other things that can be disabled by configure. */
#undef HAVE_MENUBARS
#include "console-msw.h"
-
DEFINE_CONSOLE_TYPE (mswindows);
+DEFINE_CONSOLE_TYPE (msprinter);
+/************************************************************************/
+/* mswindows console methods */
+/************************************************************************/
static int
mswindows_initially_selected_for_input (struct console *con)
return 1;
}
+static Lisp_Object
+mswindows_canonicalize_console_connection (Lisp_Object connection,
+ Error_behavior errb)
+{
+ /* Do not allow more than one mswindows device, by explicitly
+ requiring that CONNECTION is nil, the only allowed connection in
+ Windows. */
+ if (!NILP (connection))
+ {
+ if (ERRB_EQ (errb, ERROR_ME))
+ signal_simple_error
+ ("Invalid (non-nil) connection for mswindows device/console",
+ connection);
+ else
+ return Qunbound;
+ }
+
+ return Qnil;
+}
+static Lisp_Object
+mswindows_canonicalize_device_connection (Lisp_Object connection,
+ Error_behavior errb)
+{
+ return mswindows_canonicalize_console_connection (connection, errb);
+}
\f
/************************************************************************/
/* CONSOLE_HAS_METHOD (mswindows, mark_console); */
CONSOLE_HAS_METHOD (mswindows, initially_selected_for_input);
/* CONSOLE_HAS_METHOD (mswindows, delete_console); */
-/* CONSOLE_HAS_METHOD (mswindows, canonicalize_console_connection); */
-/* CONSOLE_HAS_METHOD (mswindows, canonicalize_device_connection); */
+ CONSOLE_HAS_METHOD (mswindows, canonicalize_console_connection);
+ CONSOLE_HAS_METHOD (mswindows, canonicalize_device_connection);
/* CONSOLE_HAS_METHOD (mswindows, semi_canonicalize_console_connection); */
/* CONSOLE_HAS_METHOD (mswindows, semi_canonicalize_device_connection); */
+
+ INITIALIZE_CONSOLE_TYPE (msprinter, "msprinter", "console-msprinter-p");
}
void
reinit_console_type_create_mswindows (void)
{
REINITIALIZE_CONSOLE_TYPE (mswindows);
+ REINITIALIZE_CONSOLE_TYPE (msprinter);
}
void
return OPAQUEP (obj) ? OPAQUE_DATA (XOPAQUE (obj)) : NULL;
}
-struct Lisp_Event *
+Lisp_Event *
DEVENT (Lisp_Object obj)
{
return EVENTP (obj) ? XEVENT (obj) : NULL;
}
-struct Lisp_Cons *
+Lisp_Cons *
DCONS (Lisp_Object obj)
{
return CONSP (obj) ? XCONS (obj) : NULL;
}
-struct Lisp_Cons *
+Lisp_Cons *
DCONSCDR (Lisp_Object obj)
{
return (CONSP (obj) && CONSP (XCDR (obj))) ? XCONS (XCDR (obj)) : 0;
return STRINGP (obj) ? XSTRING_DATA (obj) : NULL;
}
-struct Lisp_Vector *
+Lisp_Vector *
DVECTOR (Lisp_Object obj)
{
return VECTORP (obj) ? XVECTOR (obj) : NULL;
}
-struct Lisp_Symbol *
+Lisp_Symbol *
DSYMBOL (Lisp_Object obj)
{
return SYMBOLP (obj) ? XSYMBOL (obj) : NULL;
return SYMBOLP (obj) ? string_data (XSYMBOL (obj)->name) : NULL;
}
-#endif
+#endif /* DEBUG_XEMACS */
Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0.
*/
-#ifndef _XEMACS_CONSOLE_MSW_H_
-#define _XEMACS_CONSOLE_MSW_H_
+#ifndef INCLUDED_console_msw_h_
+#define INCLUDED_console_msw_h_
#include "console.h"
#ifdef CONST /* I suspect this is safe */
int infd, outfd;
};
+DECLARE_CONSOLE_TYPE (msprinter);
/*
* Device
#define MSW_FONTSIZE (LF_FACESIZE*4+12)
-struct mswindows_font_enum
-{
- char fontname[MSW_FONTSIZE];
- struct mswindows_font_enum *next;
-};
-
struct mswindows_device
{
int logpixelsx, logpixelsy;
int horzres, vertres; /* Size in pixels */
int horzsize, vertsize; /* Size in mm */
int bitspixel;
- struct mswindows_font_enum *fontlist;
+ Lisp_Object fontlist; /* List of strings, device fonts */
};
#define DEVICE_MSWINDOWS_DATA(d) DEVICE_TYPE_DATA (d, mswindows)
#define DEVICE_MSWINDOWS_BITSPIXEL(d) (DEVICE_MSWINDOWS_DATA (d)->bitspixel)
#define DEVICE_MSWINDOWS_FONTLIST(d) (DEVICE_MSWINDOWS_DATA (d)->fontlist)
+struct msprinter_device
+{
+ HDC hdc;
+ HANDLE hprinter;
+ Lisp_Object fontlist;
+ char* name;
+ DEVMODE *devmode, *devmode_mirror;
+ size_t devmode_size;
+};
+
+#define DEVICE_MSPRINTER_DATA(d) DEVICE_TYPE_DATA (d, msprinter)
+#define DEVICE_MSPRINTER_HDC(d) (DEVICE_MSPRINTER_DATA (d)->hdc)
+#define DEVICE_MSPRINTER_HPRINTER(d) (DEVICE_MSPRINTER_DATA (d)->hprinter)
+#define DEVICE_MSPRINTER_FONTLIST(d) (DEVICE_MSPRINTER_DATA (d)->fontlist)
+#define DEVICE_MSPRINTER_NAME(d) (DEVICE_MSPRINTER_DATA (d)->name)
+#define DEVICE_MSPRINTER_DEVMODE(d) (DEVICE_MSPRINTER_DATA (d)->devmode)
+#define DEVICE_MSPRINTER_DEVMODE_MIRROR(d) \
+ (DEVICE_MSPRINTER_DATA (d)->devmode_mirror)
+#define DEVICE_MSPRINTER_DEVMODE_SIZE(d) \
+ (DEVICE_MSPRINTER_DATA (d)->devmode_size)
+
+#define CONSOLE_TYPESYM_MSPRINTER_P(typesym) EQ (typesym, Qmsprinter)
+#define DEVICE_MSPRINTER_P(dev) CONSOLE_TYPESYM_MSPRINTER_P (DEVICE_TYPE (dev))
+#define CHECK_MSPRINTER_DEVICE(z) CHECK_DEVICE_TYPE (z, msprinter)
+#define CONCHECK_MSPRINTER_DEVICE(z) CONCHECK_DEVICE_TYPE (z, msprinter)
+
+/* Printer functions */
+DEVMODE* msprinter_get_devmode_copy (struct device *d);
+void msprinter_apply_devmode (struct device *d, DEVMODE *devmode);
/*
* Frame
#define XWL_COUNT 1 /* Number of LONGs that we use */
#define MSWINDOWS_WINDOW_EXTRA_BYTES (XWL_COUNT*4)
+/*
+ * Printer frame, aka printer job
+ */
+
+struct msprinter_frame
+{
+ HDC hcdc; /* Compatoble DC */
+ int left_margin, top_margin, /* All in twips */
+ right_margin, bottom_margin;
+ int charheight, charwidth; /* As per proplist or -1 if not gven */
+ Lisp_Object orientation, duplex; /* nil for printer's default */
+ int job_started : 1;
+};
+
+#define FRAME_MSPRINTER_DATA(f) FRAME_TYPE_DATA (f, msprinter)
+#define FRAME_MSPRINTER_LEFT_MARGIN(f) (FRAME_MSPRINTER_DATA (f)->left_margin)
+#define FRAME_MSPRINTER_RIGHT_MARGIN(f) (FRAME_MSPRINTER_DATA (f)->top_margin)
+#define FRAME_MSPRINTER_TOP_MARGIN(f) (FRAME_MSPRINTER_DATA (f)->right_margin)
+#define FRAME_MSPRINTER_BOTTOM_MARGIN(f) (FRAME_MSPRINTER_DATA (f)->bottom_margin)
+#define FRAME_MSPRINTER_CDC(f) (FRAME_MSPRINTER_DATA (f)->hcdc)
+#define FRAME_MSPRINTER_JOB_STARTED(f) (FRAME_MSPRINTER_DATA (f)->job_started)
+#define FRAME_MSPRINTER_ORIENTATION(f) (FRAME_MSPRINTER_DATA (f)->orientation)
+#define FRAME_MSPRINTER_DUPLEX(f) (FRAME_MSPRINTER_DATA (f)->duplex)
+#define FRAME_MSPRINTER_CHARWIDTH(f) (FRAME_MSPRINTER_DATA (f)->charheight)
+#define FRAME_MSPRINTER_CHARHEIGHT(f) (FRAME_MSPRINTER_DATA (f)->charwidth)
/*
* Events
void mswindows_redraw_exposed_area (struct frame *f, int x, int y,
int width, int height);
void mswindows_size_frame_internal (struct frame* f, XEMACS_RECT_WH* dest);
-void mswindows_enqueue_magic_event (HWND hwnd, UINT message);
+void mswindows_enqueue_magic_event (HWND hwnd, UINT msg);
/* win32 DDE management library */
#define MSWINDOWS_DDE_ITEM_OPEN "Open"
void mswindows_enqueue_misc_user_event (Lisp_Object channel,
Lisp_Object function,
Lisp_Object object);
-Lisp_Object mswindows_cancel_dispatch_event (struct Lisp_Event* event);
+Lisp_Object mswindows_cancel_dispatch_event (Lisp_Event* event);
Lisp_Object mswindows_pump_outstanding_events (void);
Lisp_Object mswindows_protect_modal_loop (Lisp_Object (*bfun) (Lisp_Object barg),
Lisp_Object barg);
void mswindows_unmodalize_signal_maybe (void);
+#ifdef HAVE_TOOLBARS
+Lisp_Object
+mswindows_get_toolbar_button_text ( struct frame* f, int command_id );
+Lisp_Object
+mswindows_handle_toolbar_wm_command (struct frame* f, HWND ctrl, WORD id);
+#endif
+Lisp_Object
+mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, DWORD id);
+COLORREF mswindows_string_to_color (CONST char *name);
+USID emacs_mswindows_create_stream_pair (void* inhandle, void* outhandle,
+ Lisp_Object* instream,
+ Lisp_Object* outstream,
+ int flags);
+USID emacs_mswindows_delete_stream_pair (Lisp_Object instream,
+ Lisp_Object outstream);
+
#ifdef HAVE_WIN32_PROCESSES
-HANDLE get_nt_process_handle (struct Lisp_Process *p);
+HANDLE get_nt_process_handle (Lisp_Process *p);
#endif
extern Lisp_Object Vmswindows_frame_being_created;
extern Lisp_Object mswindows_frame_being_created;
-void mswindows_enumerate_fonts (struct device *d);
+Lisp_Object mswindows_enumerate_fonts (HDC hdc);
+
+Lisp_Object mswindows_get_toolbar_button_text (struct frame* f,
+ int command_id);
+Lisp_Object mswindows_handle_toolbar_wm_command (struct frame* f,
+ HWND ctrl, WORD id);
+Lisp_Object mswindows_handle_gui_wm_command (struct frame* f,
+ HWND ctrl, DWORD id);
-#endif /* _XEMACS_CONSOLE_MSW_H_ */
+#endif /* INCLUDED_console_msw_h_ */
/* Written by Ben Wing. */
-#ifndef _XEMACS_CONSOLE_STREAM_H_
-#define _XEMACS_CONSOLE_STREAM_H_
+#ifndef INCLUDED_console_stream_h_
+#define INCLUDED_console_stream_h_
#include "console.h"
Error_behavior);
Lisp_Object stream_canonicalize_device_connection(Lisp_Object,
Error_behavior);
-#endif /* _XEMACS_CONSOLE_STREAM_H_ */
+#endif /* INCLUDED_console_stream_h_ */
return Qnil;
}
-/* ### Move this function to lisp */
+/* #### Move this function to lisp */
DEFUN ("set-console-tty-coding-system", Fset_console_tty_coding_system,
0, 2, 0, /*
Set the input and output coding systems of tty console CONSOLE to CODESYS.
have more than one device on a TTY console, the output stuff
will have to get separated out. */
-#ifndef _XEMACS_CONSOLE_TTY_H_
-#define _XEMACS_CONSOLE_TTY_H_
+#ifndef INCLUDED_console_tty_h_
+#define INCLUDED_console_tty_h_
#include "console.h"
#include "syssignal.h" /* Always include before systty.h */
Error_behavior errb);
struct console * tty_find_console_from_fd (int fd);
-#endif /* _XEMACS_CONSOLE_TTY_H_ */
+#endif /* INCLUDED_console_tty_h_ */
/* assert: display_arg is only set if we found the display
arg earlier so we can't fail to find it now. */
assert (disp_name != NULL);
- conn = build_ext_string (disp_name, FORMAT_CTEXT);
+ conn = build_ext_string (disp_name, Qctext);
free_argc_argv (argv);
return conn;
}
else
- return build_ext_string (XDisplayName (0), FORMAT_CTEXT);
+ return build_ext_string (XDisplayName (0), Qctext);
}
/* "semi-canonicalize" means convert to a nicer form for printing, but
multi-device work by Chuck Thompson).
*/
-#ifndef _XEMACS_CONSOLE_X_H_
-#define _XEMACS_CONSOLE_X_H_
+#ifndef INCLUDED_console_x_h_
+#define INCLUDED_console_x_h_
#ifdef HAVE_X_WINDOWS
Atom Xatom_WM_TAKE_FOCUS;
Atom Xatom_WM_STATE;
- /* allocated in Xatoms_of_xselect in xselect.c */
+ /* allocated in Xatoms_of_select_x in xselect.c */
Atom Xatom_CLIPBOARD;
Atom Xatom_TIMESTAMP;
Atom Xatom_TEXT;
#define DEVICE_XATOM_WM_TAKE_FOCUS(d) (DEVICE_X_DATA (d)->Xatom_WM_TAKE_FOCUS)
#define DEVICE_XATOM_WM_STATE(d) (DEVICE_X_DATA (d)->Xatom_WM_STATE)
-/* allocated in Xatoms_of_xselect in xselect.c */
+/* allocated in Xatoms_of_select_x in xselect.c */
#define DEVICE_XATOM_CLIPBOARD(d) (DEVICE_X_DATA (d)->Xatom_CLIPBOARD)
#define DEVICE_XATOM_TIMESTAMP(d) (DEVICE_X_DATA (d)->Xatom_TIMESTAMP)
#define DEVICE_XATOM_TEXT(d) (DEVICE_X_DATA (d)->Xatom_TEXT)
void x_handle_selection_clear (XSelectionClearEvent *event);
void x_handle_property_notify (XPropertyEvent *event);
-void Xatoms_of_xselect (struct device *d);
+void Xatoms_of_select_x (struct device *d);
void Xatoms_of_objects_x (struct device *d);
void x_wm_set_shell_iconic_p (Widget shell, int iconic_p);
int start_pixpos, int width, face_index findex,
int cursor, int cursor_start, int cursor_width,
int cursor_height);
-void x_output_x_pixmap (struct frame *f, struct Lisp_Image_Instance *p,
+void x_output_x_pixmap (struct frame *f, Lisp_Image_Instance *p,
int x, int y, int xoffset, int yoffset,
int width, int height,
unsigned long fg, unsigned long bg,
extern Lisp_Object Vx_initial_argv_list; /* #### ugh! */
#endif /* HAVE_X_WINDOWS */
-#endif /* _XEMACS_DEVICE_X_H_ */
+
+#endif /* INCLUDED_console_x_h_ */
sprintf (buf, "#<%s-console", !CONSOLE_LIVE_P (con) ? "dead" :
CONSOLE_TYPE_NAME (con));
write_c_string (buf, printcharfun);
- if (CONSOLE_LIVE_P (con))
+ if (CONSOLE_LIVE_P (con) && !NILP (CONSOLE_CONNECTION (con)))
{
write_c_string (" on ", printcharfun);
print_internal (CONSOLE_CONNECTION (con), printcharfun, 1);
semi_canonicalize_console_connection (struct console_methods *meths,
Lisp_Object name, Error_behavior errb)
{
- return CONTYPE_METH_OR_GIVEN (meths, semi_canonicalize_console_connection,
- (name, errb), name);
+ if (HAS_CONTYPE_METH_P (meths, semi_canonicalize_console_connection))
+ return CONTYPE_METH (meths, semi_canonicalize_console_connection,
+ (name, errb));
+ else
+ return CONTYPE_METH_OR_GIVEN (meths, canonicalize_console_connection,
+ (name, errb), name);
}
static Lisp_Object
canonicalize_console_connection (struct console_methods *meths,
Lisp_Object name, Error_behavior errb)
{
- return CONTYPE_METH_OR_GIVEN (meths, canonicalize_console_connection,
- (name, errb), name);
+ if (HAS_CONTYPE_METH_P (meths, canonicalize_console_connection))
+ return CONTYPE_METH (meths, canonicalize_console_connection,
+ (name, errb));
+ else
+ return CONTYPE_METH_OR_GIVEN (meths, semi_canonicalize_console_connection,
+ (name, errb), name);
}
static Lisp_Object
/* Do it this way so that the console list is in order of creation */
Vconsole_list = nconc2 (Vconsole_list, Fcons (console, Qnil));
- if (CONMETH (con, initially_selected_for_input, (con)))
+ if (CONMETH_OR_GIVEN (con, initially_selected_for_input, (con), 0))
event_stream_select_console (con);
UNGCPRO;
Extcount count;
Extbyte *p;
- GET_STRING_EXT_DATA_ALLOCA (stuffstring, FORMAT_KEYBOARD, p, count);
+ TO_EXTERNAL_FORMAT (LISP_STRING, stuffstring,
+ ALLOCA, (p, count),
+ Qkeyboard);
while (count-- > 0)
stuff_char (XCONSOLE (Vcontrolling_terminal), *p++);
stuff_char (XCONSOLE (Vcontrolling_terminal), '\n');
}
static const struct lrecord_description cte_description_1[] = {
- { XD_LISP_OBJECT, offsetof(console_type_entry, symbol), 1 },
- { XD_STRUCT_PTR, offsetof(console_type_entry, meths), 1, &console_methods_description },
+ { XD_LISP_OBJECT, offsetof (console_type_entry, symbol) },
+ { XD_STRUCT_PTR, offsetof (console_type_entry, meths), 1, &console_methods_description },
{ XD_END }
};
static const struct struct_description cte_description = {
- sizeof(console_type_entry),
+ sizeof (console_type_entry),
cte_description_1
};
static const struct lrecord_description cted_description_1[] = {
- XD_DYNARR_DESC(console_type_entry_dynarr, &cte_description),
+ XD_DYNARR_DESC (console_type_entry_dynarr, &cte_description),
{ XD_END }
};
const struct struct_description cted_description = {
- sizeof(console_type_entry_dynarr),
+ sizeof (console_type_entry_dynarr),
cted_description_1
};
static const struct lrecord_description console_methods_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct console_methods, symbol), 2 },
- { XD_LISP_OBJECT, offsetof(struct console_methods, image_conversion_list), 1 },
+ { XD_LISP_OBJECT, offsetof (struct console_methods, symbol) },
+ { XD_LISP_OBJECT, offsetof (struct console_methods, predicate_symbol) },
+ { XD_LISP_OBJECT, offsetof (struct console_methods, image_conversion_list) },
{ XD_END }
};
const struct struct_description console_methods_description = {
- sizeof(struct console_methods),
+ sizeof (struct console_methods),
console_methods_description_1
};
static const struct lrecord_description console_slots_description_1[] = {
- { XD_LISP_OBJECT, 0, CONSOLE_SLOTS_COUNT },
+ { XD_LISP_OBJECT_ARRAY, 0, CONSOLE_SLOTS_COUNT },
{ XD_END }
};
*/ );
#ifdef HAVE_TTY
- /* ### Should this somehow go to TTY data? How do we make it
+ /* #### Should this somehow go to TTY data? How do we make it
accessible from Lisp, then? */
DEFVAR_CONSOLE_LOCAL ("tty-erase-char", tty_erase_char /*
The ERASE character as set by the user with stty.
/* Written by Ben Wing. */
-#ifndef _XEMACS_CONSOLE_H_
-#define _XEMACS_CONSOLE_H_
+#ifndef INCLUDED_console_h_
+#define INCLUDED_console_h_
/* Devices and consoles are similar entities. The idea is that
a console represents a physical keyboard/mouse/other-input-source
DM_font_menubar, DM_font_dialog, DM_size_cursor, DM_size_scrollbar,
DM_size_menu, DM_size_toolbar, DM_size_toolbar_button,
DM_size_toolbar_border, DM_size_icon, DM_size_icon_small, DM_size_device,
- DM_size_workspace, DM_size_device_mm, DM_device_dpi, DM_num_bit_planes,
- DM_num_color_cells, DM_mouse_buttons, DM_swap_buttons, DM_show_sounds,
- DM_slow_device, DM_security
+ DM_size_workspace, DM_offset_workspace, DM_size_device_mm, DM_device_dpi,
+ DM_num_bit_planes, DM_num_color_cells, DM_mouse_buttons, DM_swap_buttons,
+ DM_show_sounds, DM_slow_device, DM_security
};
extern const struct struct_description cted_description;
int cursor, int cursor_start, int cursor_width,
int cursor_height);
/* color methods */
- int (*initialize_color_instance_method) (struct Lisp_Color_Instance *,
+ int (*initialize_color_instance_method) (Lisp_Color_Instance *,
Lisp_Object name,
Lisp_Object device,
Error_behavior errb);
- void (*mark_color_instance_method) (struct Lisp_Color_Instance *);
- void (*print_color_instance_method) (struct Lisp_Color_Instance *,
+ void (*mark_color_instance_method) (Lisp_Color_Instance *);
+ void (*print_color_instance_method) (Lisp_Color_Instance *,
Lisp_Object printcharfun,
int escapeflag);
- void (*finalize_color_instance_method) (struct Lisp_Color_Instance *);
- int (*color_instance_equal_method) (struct Lisp_Color_Instance *,
- struct Lisp_Color_Instance *,
+ void (*finalize_color_instance_method) (Lisp_Color_Instance *);
+ int (*color_instance_equal_method) (Lisp_Color_Instance *,
+ Lisp_Color_Instance *,
int depth);
- unsigned long (*color_instance_hash_method) (struct Lisp_Color_Instance *,
+ unsigned long (*color_instance_hash_method) (Lisp_Color_Instance *,
int depth);
- Lisp_Object (*color_instance_rgb_components_method)
- (struct Lisp_Color_Instance *);
+ Lisp_Object (*color_instance_rgb_components_method) (Lisp_Color_Instance *);
int (*valid_color_name_p_method) (struct device *, Lisp_Object color);
/* font methods */
- int (*initialize_font_instance_method) (struct Lisp_Font_Instance *,
+ int (*initialize_font_instance_method) (Lisp_Font_Instance *,
Lisp_Object name,
Lisp_Object device,
Error_behavior errb);
- void (*mark_font_instance_method) (struct Lisp_Font_Instance *);
- void (*print_font_instance_method) (struct Lisp_Font_Instance *,
+ void (*mark_font_instance_method) (Lisp_Font_Instance *);
+ void (*print_font_instance_method) (Lisp_Font_Instance *,
Lisp_Object printcharfun,
int escapeflag);
- void (*finalize_font_instance_method) (struct Lisp_Font_Instance *);
- Lisp_Object (*font_instance_truename_method) (struct Lisp_Font_Instance *,
+ void (*finalize_font_instance_method) (Lisp_Font_Instance *);
+ Lisp_Object (*font_instance_truename_method) (Lisp_Font_Instance *,
Error_behavior errb);
- Lisp_Object (*font_instance_properties_method) (struct Lisp_Font_Instance *);
+ Lisp_Object (*font_instance_properties_method) (Lisp_Font_Instance *);
Lisp_Object (*list_fonts_method) (Lisp_Object pattern,
Lisp_Object device);
Lisp_Object (*find_charset_font_method) (Lisp_Object device,
Bytecount length);
/* image methods */
- void (*mark_image_instance_method) (struct Lisp_Image_Instance *);
- void (*print_image_instance_method) (struct Lisp_Image_Instance *,
+ void (*mark_image_instance_method) (Lisp_Image_Instance *);
+ void (*print_image_instance_method) (Lisp_Image_Instance *,
Lisp_Object printcharfun,
int escapeflag);
- void (*finalize_image_instance_method) (struct Lisp_Image_Instance *);
- void (*unmap_subwindow_method) (struct Lisp_Image_Instance *);
- void (*map_subwindow_method) (struct Lisp_Image_Instance *, int x, int y,
+ void (*finalize_image_instance_method) (Lisp_Image_Instance *);
+ void (*unmap_subwindow_method) (Lisp_Image_Instance *);
+ void (*map_subwindow_method) (Lisp_Image_Instance *, int x, int y,
struct display_glyph_area* dga);
- void (*resize_subwindow_method) (struct Lisp_Image_Instance *, int w, int h);
- void (*update_subwindow_method) (struct Lisp_Image_Instance *);
- int (*image_instance_equal_method) (struct Lisp_Image_Instance *,
- struct Lisp_Image_Instance *,
+ void (*resize_subwindow_method) (Lisp_Image_Instance *, int w, int h);
+ void (*update_subwindow_method) (Lisp_Image_Instance *);
+ int (*image_instance_equal_method) (Lisp_Image_Instance *,
+ Lisp_Image_Instance *,
int depth);
- unsigned long (*image_instance_hash_method) (struct Lisp_Image_Instance *,
+ unsigned long (*image_instance_hash_method) (Lisp_Image_Instance *,
int depth);
- void (*init_image_instance_from_eimage_method) (struct Lisp_Image_Instance *ii,
+ void (*init_image_instance_from_eimage_method) (Lisp_Image_Instance *ii,
int width, int height,
int slices,
unsigned char *eimage,
/*
* Constants returned by device_implementation_flags_method
*/
+
/* Set when device uses pixel-based geometry */
-#define XDEVIMPF_PIXEL_GEOMETRY 0x00000001L
+#define XDEVIMPF_PIXEL_GEOMETRY 0x00000001L
+
+/* Indicates that the device is a printer */
+#define XDEVIMPF_IS_A_PRINTER 0x00000002L
+
+/* Do not automatically redisplay this device */
+#define XDEVIMPF_NO_AUTO_REDISPLAY 0x00000004L
+
+/* Do not delete the device when last frame's gone */
+#define XDEVIMPF_FRAMELESS_OK 0x00000008L
#define CONSOLE_TYPE_NAME(c) ((c)->conmeths->name)
#define CONSOLE_HAS_METHOD(type, m) \
(type##_console_methods->m##_method = type##_##m)
+/* Declare that console-type TYPE inherits method M
+ implementation from console-type FROMTYPE */
+#define CONSOLE_INHERITS_METHOD(type, fromtype, m) \
+ (type##_console_methods->m##_method = fromtype##_##m)
+
struct console
{
struct lcrecord_header header;
void set_console_last_nonminibuf_frame (struct console *con,
Lisp_Object frame);
-#endif /* _XEMACS_CONSOLE_H_ */
+#endif /* INCLUDED_console_h_ */
}
static const struct lrecord_description weak_list_description[] = {
- { XD_LISP_OBJECT, offsetof(struct weak_list, list), 1 },
- { XD_LO_LINK, offsetof(struct weak_list, next_weak) },
+ { XD_LISP_OBJECT, offsetof (struct weak_list, list) },
+ { XD_LO_LINK, offsetof (struct weak_list, next_weak) },
{ XD_END }
};
Lisp_Object Qdatabasep;
-struct Lisp_Database;
-typedef struct Lisp_Database Lisp_Database;
-
typedef struct
{
Lisp_Object (*get_subtype) (Lisp_Database *);
status == 0;
status = dbp->seq (dbp, &keydatum, &valdatum, R_NEXT))
{
- /* ### Needs mule-izing */
+ /* #### Needs mule-izing */
key = make_string ((Bufbyte *) keydatum.data, keydatum.size);
val = make_string ((Bufbyte *) valdatum.data, valdatum.size);
call2 (func, key, val);
status = dbp->cursor (dbp, NULL, &dbcp, 0);
#else
status = dbp->cursor (dbp, NULL, &dbcp);
-#endif
+#endif
for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST);
status == 0;
status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
{
- /* ### Needs mule-izing */
+ /* #### Needs mule-izing */
key = make_string ((Bufbyte *) keydatum.data, keydatum.size);
val = make_string ((Bufbyte *) valdatum.data, valdatum.size);
call2 (func, key, val);
file = Fexpand_file_name (file, Qnil);
UNGCPRO;
- GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA (XSTRING_DATA (file), filename);
+ TO_EXTERNAL_FORMAT (LISP_STRING, file,
+ C_STRING_ALLOCA, filename,
+ Qfile_name);
if (NILP (access_))
{
/* This file is only necessary to get INLINE handling correct.
See inline.c */
-#ifndef _XEMACS_DATABASE_H
-#define _XEMACS_DATABASE_H
+#ifndef INCLUDED_database_h_
+#define INCLUDED_database_h_
-DECLARE_LRECORD (database, struct Lisp_Database);
+typedef struct Lisp_Database Lisp_Database;
+DECLARE_LRECORD (database, Lisp_Database);
-#endif
+#endif /* INCLUDED_database_h_ */
/* Written by Chuck Thompson */
-#ifndef _XEMACS_DEBUG_H_
-#define _XEMACS_DEBUG_H_
+#ifndef INCLUDED_debug_h_
+#define INCLUDED_debug_h_
#define DEBUG_STDERR 1
#define DEBUG_ABORT 2
#endif /* !DEBUG_XEMACS */
-#endif /* _XEMACS_DEBUG_H_ */
+#endif /* INCLUDED_debug_h_ */
event-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-msw.h console-tty.h console.h device.h dragdrop.h events-mod.h events.h faces.h frame.h frameslots.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h menubar-msw.h mule-charset.h multibyte.h objects-msw.h objects.h process.h redisplay.h scrollbar-msw.h scrollbar.h select.h specifier.h symeval.h symsinit.h sysdep.h sysfile.h sysproc.h syssignal.h systime.h systty.h syswait.h toolbar.h
frame-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-msw.h console.h device.h elhash.h events.h faces.h frame.h frameslots.h glyphs-msw.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h systime.h toolbar.h window.h winslots.h
glyphs-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-msw.h console.h device.h elhash.h faces.h file-coding.h frame.h frameslots.h glyphs-msw.h glyphs.h gui.h imgproc.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects-msw.h objects.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysfile.h toolbar.h window.h winslots.h
-gui-msw.o: $(LISP_H) conslots.h console-msw.h console.h device.h elhash.h frame.h frameslots.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h
+gui-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-msw.h console.h device.h elhash.h frame.h frameslots.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h
menubar-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h commands.h conslots.h console-msw.h console.h device.h elhash.h events.h frame.h frameslots.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h menubar-msw.h menubar.h mule-charset.h multibyte.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h systime.h toolbar.h window.h winslots.h
objects-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-msw.h console.h device.h hash.h insdel.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects-msw.h objects.h specifier.h symeval.h symsinit.h
redisplay-msw.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-msw.h console.h debug.h device.h events.h faces.h frame.h frameslots.h glyphs-msw.h glyphs.h gui.h gutter.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-ccl.h mule-charset.h multibyte.h objects-msw.h objects.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h systime.h toolbar.h window.h winslots.h
#ifdef HAVE_X_WINDOWS
balloon-x.o: $(LISP_H) balloon_help.h conslots.h console-x.h console.h device.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h xintrinsic.h
console-x.o: $(LISP_H) conslots.h console-x.h console.h lisp-disunion.h lisp-union.h lrecord.h process.h redisplay.h symeval.h symsinit.h xintrinsic.h
-device-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-x.h console.h device.h elhash.h events.h faces.h frame.h frameslots.h glyphs-x.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects-x.h objects.h offix-types.h offix.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h sysfile.h systime.h toolbar.h window.h winslots.h xgccache.h xintrinsic.h xintrinsicp.h xmu.h
+device-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-x.h console.h device.h elhash.h events.h faces.h frame.h frameslots.h glyphs-x.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects-x.h objects.h offix-types.h offix.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h sysdll.h sysfile.h systime.h toolbar.h window.h winslots.h xgccache.h xintrinsic.h xintrinsicp.h xmu.h
dialog-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h commands.h conslots.h console-x.h console.h device.h events.h frame.h frameslots.h glyphs.h gui-x.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h systime.h toolbar.h window.h winslots.h xintrinsic.h
frame-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h EmacsFrameP.h EmacsManager.h EmacsShell.h ExternalShell.h buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-x.h console.h device.h dragdrop.h events-mod.h events.h extents.h faces.h frame.h frameslots.h glyphs-x.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects-x.h objects.h offix-types.h offix.h redisplay.h scrollbar-x.h scrollbar.h specifier.h symeval.h symsinit.h systime.h toolbar.h window.h winslots.h xintrinsic.h xintrinsicp.h xmprimitivep.h xmu.h
glyphs-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h bitmaps.h buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-x.h console.h device.h faces.h file-coding.h frame.h frameslots.h glyphs-x.h glyphs.h gui-x.h gui.h imgproc.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects-x.h objects.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysfile.h toolbar.h window.h winslots.h xintrinsic.h xmu.h
alloca.o: config.h
balloon_help.o: balloon_help.h config.h xintrinsic.h
blocktype.o: $(LISP_H) blocktype.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
-buffer.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h commands.h conslots.h console.h device.h elhash.h extents.h faces.h frame.h frameslots.h glyphs.h gui.h insdel.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h process.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h syntax.h sysdep.h sysfile.h toolbar.h window.h winslots.h
+buffer.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h commands.h conslots.h console.h device.h elhash.h extents.h faces.h file-coding.h frame.h frameslots.h glyphs.h gui.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h process.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h syntax.h sysdep.h sysfile.h toolbar.h window.h winslots.h
bytecode.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h opaque.h symeval.h symsinit.h syntax.h
callint.o: $(LISP_H) buffer.h bufslots.h bytecode.h char-1byte.h char-lb.h char-ucs.h character.h commands.h events.h insdel.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h redisplay.h scrollbar.h symeval.h symsinit.h systime.h window.h winslots.h
callproc.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h commands.h file-coding.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h nt.h process.h redisplay.h scrollbar.h symeval.h symsinit.h sysdep.h sysfile.h sysproc.h syssignal.h systime.h systty.h window.h winslots.h
events.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console-tty.h console-x.h console.h device.h events-mod.h events.h extents.h frame.h frameslots.h glyphs.h gui.h keymap.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h syssignal.h systime.h systty.h toolbar.h window.h winslots.h xintrinsic.h
extents.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console.h debug.h device.h elhash.h extents.h faces.h frame.h frameslots.h glyphs.h gui.h insdel.h keymap.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h opaque.h process.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h
faces.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console.h device.h elhash.h extents.h faces.h frame.h frameslots.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h objects.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h window.h winslots.h
-file-coding.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h elhash.h file-coding.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-ccl.h mule-charset.h multibyte.h symeval.h symsinit.h
+file-coding.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h elhash.h file-coding.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-ccl.h mule-charset.h multibyte.h opaque.h symeval.h symsinit.h
fileio.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console.h device.h events.h file-coding.h frame.h frameslots.h glyphs.h gui.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h ndir.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h sysdir.h sysfile.h sysproc.h syspwd.h systime.h toolbar.h window.h winslots.h
filelock.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h ndir.h paths.h symeval.h symsinit.h sysdir.h sysfile.h syspwd.h syssignal.h
filemode.o: $(LISP_H) lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h sysfile.h
sysdll.o: config.h sysdll.h
termcap.o: $(LISP_H) conslots.h console.h device.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
terminfo.o: config.h
-text-coding.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h elhash.h file-coding.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-ccl.h mule-charset.h multibyte.h symeval.h symsinit.h
+tests.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h opaque.h symeval.h symsinit.h
+text-coding.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h chartab.h elhash.h file-coding.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-ccl.h mule-charset.h multibyte.h opaque.h symeval.h symsinit.h
toolbar.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h conslots.h console.h device.h frame.h frameslots.h glyphs.h gui.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h window.h winslots.h
tooltalk.o: $(LISP_H) buffer.h bufslots.h char-1byte.h char-lb.h char-ucs.h character.h elhash.h lisp-disunion.h lisp-union.h lrecord.h mb-1byte.h mb-lb.h mb-multibyte.h mb-utf-8.h mule-charset.h multibyte.h process.h symeval.h symsinit.h tooltalk.h
tparam.o: config.h
#include "frame.h"
#include "sysdep.h"
+#include <winspool.h>
+
/* win32 DDE management library globals */
#ifdef HAVE_DRAGNDROP
DWORD mswindows_dde_mlid;
/************************************************************************/
static Lisp_Object
-build_syscolor_string (int index)
+build_syscolor_string (int idx)
{
DWORD clr;
char buf[16];
- if (index < 0)
+ if (idx < 0)
return Qnil;
- clr = GetSysColor (index);
+ clr = GetSysColor (idx);
sprintf (buf, "#%02X%02X%02X",
GetRValue (clr),
GetGValue (clr),
index2 < 0 ? Qnil : make_int (GetSystemMetrics (index2)));
}
+static Lisp_Object
+build_devicecaps_cons (HDC hdc, int index1, int index2)
+{
+ return Fcons (index1 < 0 ? Qnil : make_int (GetDeviceCaps (hdc, index1)),
+ index2 < 0 ? Qnil : make_int (GetDeviceCaps (hdc, index2)));
+}
+
\f
/************************************************************************/
-/* methods */
+/* display methods */
/************************************************************************/
static void
DEVICE_MSWINDOWS_HORZSIZE(d) = GetDeviceCaps(hdc, HORZSIZE);
DEVICE_MSWINDOWS_VERTSIZE(d) = GetDeviceCaps(hdc, VERTSIZE);
DEVICE_MSWINDOWS_BITSPIXEL(d) = GetDeviceCaps(hdc, BITSPIXEL);
- DeleteDC (hdc);
+ DEVICE_MSWINDOWS_FONTLIST (d) = mswindows_enumerate_fonts (hdc);
- mswindows_enumerate_fonts (d);
+ DeleteDC (hdc);
/* Register the main window class */
wc.cbSize = sizeof (WNDCLASSEX);
RegisterClassEx (&wc);
#endif
-#ifdef HAVE_TOOLBARS
+#if defined (HAVE_TOOLBARS) || defined (HAVE_WIDGETS)
InitCommonControls ();
#endif
}
static void
mswindows_delete_device (struct device *d)
{
- struct mswindows_font_enum *fontlist, *next;
-
- fontlist = DEVICE_MSWINDOWS_FONTLIST (d);
- while (fontlist)
- {
- next = fontlist->next;
- free (fontlist);
- fontlist = next;
- }
-
#ifdef HAVE_DRAGNDROP
DdeNameService (mswindows_dde_mlid, 0L, 0L, DNS_REGISTER);
DdeUninitialize (mswindows_dde_mlid);
free (d->device_data);
}
+static void
+mswindows_mark_device (struct device *d)
+{
+ mark_object (DEVICE_MSWINDOWS_FONTLIST (d));
+}
+
static Lisp_Object
mswindows_device_system_metrics (struct device *d,
enum device_metrics m)
return Fcons (make_int (DEVICE_MSWINDOWS_HORZRES(d)),
make_int (DEVICE_MSWINDOWS_VERTRES(d)));
break;
+ case DM_device_dpi:
+ return Fcons (make_int (DEVICE_MSWINDOWS_LOGPIXELSX(d)),
+ make_int (DEVICE_MSWINDOWS_LOGPIXELSY(d)));
+ break;
case DM_size_device_mm:
return Fcons (make_int (DEVICE_MSWINDOWS_HORZSIZE(d)),
make_int (DEVICE_MSWINDOWS_VERTSIZE(d)));
\f
/************************************************************************/
+/* printer methods */
+/************************************************************************/
+
+static void
+signal_open_printer_error (struct device *d)
+{
+ signal_simple_error ("Failed to open printer", DEVICE_CONNECTION (d));
+}
+
+static void
+msprinter_init_device (struct device *d, Lisp_Object props)
+{
+ char* printer_name;
+
+ DEVICE_INFD (d) = DEVICE_OUTFD (d) = -1;
+
+ CHECK_STRING (DEVICE_CONNECTION (d));
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, DEVICE_CONNECTION (d),
+ C_STRING_ALLOCA, printer_name,
+ Qctext);
+
+ d->device_data = xnew_and_zero (struct msprinter_device);
+
+ DEVICE_MSPRINTER_NAME(d) = xstrdup (printer_name);
+
+ if (!OpenPrinter (printer_name, &DEVICE_MSPRINTER_HPRINTER (d), NULL))
+ {
+ DEVICE_MSPRINTER_HPRINTER (d) = NULL;
+ signal_open_printer_error (d);
+ }
+
+ DEVICE_MSPRINTER_HDC (d) = CreateDC ("WINSPOOL", printer_name,
+ NULL, NULL);
+ if (DEVICE_MSPRINTER_HDC (d) == NULL)
+ signal_open_printer_error (d);
+
+ /* Determinie DEVMODE size and store the default DEVMODE */
+ DEVICE_MSPRINTER_DEVMODE_SIZE(d) =
+ DocumentProperties (NULL, DEVICE_MSPRINTER_HPRINTER(d),
+ printer_name, NULL, NULL, 0);
+ if (DEVICE_MSPRINTER_DEVMODE_SIZE(d) <= 0)
+ signal_open_printer_error (d);
+
+ DEVICE_MSPRINTER_DEVMODE(d) = xmalloc (DEVICE_MSPRINTER_DEVMODE_SIZE(d));
+ DocumentProperties (NULL, DEVICE_MSPRINTER_HPRINTER(d),
+ printer_name, DEVICE_MSPRINTER_DEVMODE(d),
+ NULL, DM_OUT_BUFFER);
+
+ /* We do not use printer fon list as we do with the display
+ device. Rather, we allow GDI to pick the closest match to the
+ display font. */
+ DEVICE_MSPRINTER_FONTLIST (d) = Qnil;
+
+ DEVICE_CLASS (d) = (GetDeviceCaps (DEVICE_MSPRINTER_HDC (d), BITSPIXEL)
+ * GetDeviceCaps (DEVICE_MSPRINTER_HDC (d), PLANES)
+ > 1) ? Qcolor : Qmono;
+}
+
+static Lisp_Object
+msprinter_device_system_metrics (struct device *d,
+ enum device_metrics m)
+{
+ switch (m)
+ {
+ /* Device sizes - pixel and mm */
+#define FROB(met, index1, index2) \
+ case DM_##met: \
+ return build_devicecaps_cons \
+ (DEVICE_MSPRINTER_HDC(d), index1, index2);
+
+ FROB (size_device, PHYSICALWIDTH, PHYSICALHEIGHT);
+ FROB (size_device_mm, HORZSIZE, VERTSIZE);
+ FROB (size_workspace, HORZRES, VERTRES);
+ FROB (offset_workspace, PHYSICALOFFSETX, PHYSICALOFFSETY);
+ FROB (device_dpi, LOGPIXELSX, LOGPIXELSY);
+#undef FROB
+
+ case DM_num_bit_planes:
+ /* this is what X means by bitplanes therefore we ought to be
+ consistent. num planes is always 1 under mswindows and
+ therefore useless */
+ return make_int (GetDeviceCaps (DEVICE_MSPRINTER_HDC(d), BITSPIXEL));
+
+ case DM_num_color_cells: /* Prnters are non-palette devices */
+ case DM_slow_device: /* Animation would be a really bad idea */
+ case DM_security: /* Not provided by windows */
+ return Qzero;
+ }
+
+ /* Do not know such property */
+ return Qunbound;
+}
+
+static void
+msprinter_delete_device (struct device *d)
+{
+ if (d->device_data)
+ {
+ if (DEVICE_MSPRINTER_HPRINTER (d))
+ ClosePrinter (DEVICE_MSPRINTER_HPRINTER (d));
+ if (DEVICE_MSPRINTER_HDC (d))
+ DeleteDC (DEVICE_MSPRINTER_HDC (d));
+ if (DEVICE_MSPRINTER_NAME (d))
+ free (DEVICE_MSPRINTER_NAME (d));
+ if (DEVICE_MSPRINTER_DEVMODE (d))
+ free (DEVICE_MSPRINTER_DEVMODE (d));
+ if (DEVICE_MSPRINTER_DEVMODE_MIRROR (d))
+ free (DEVICE_MSPRINTER_DEVMODE_MIRROR (d));
+
+ free (d->device_data);
+ }
+}
+
+static void
+msprinter_mark_device (struct device *d)
+{
+ mark_object (DEVICE_MSPRINTER_FONTLIST (d));
+}
+
+static unsigned int
+msprinter_device_implementation_flags (void)
+{
+ return ( XDEVIMPF_PIXEL_GEOMETRY
+ | XDEVIMPF_IS_A_PRINTER
+ | XDEVIMPF_NO_AUTO_REDISPLAY
+ | XDEVIMPF_FRAMELESS_OK );
+}
+
+\f
+/************************************************************************/
+/* printer external functions */
+/************************************************************************/
+
+/*
+ * Return a copy of default DEVMODE. The copy returned is in
+ * a static buffer which will be overwritten by next call.
+ */
+DEVMODE*
+msprinter_get_devmode_copy (struct device *d)
+{
+ assert (DEVICE_MSPRINTER_P (d));
+
+ if (DEVICE_MSPRINTER_DEVMODE_MIRROR(d) == NULL)
+ DEVICE_MSPRINTER_DEVMODE_MIRROR(d) =
+ xmalloc (DEVICE_MSPRINTER_DEVMODE_SIZE(d));
+
+ memcpy (DEVICE_MSPRINTER_DEVMODE_MIRROR(d),
+ DEVICE_MSPRINTER_DEVMODE(d),
+ DEVICE_MSPRINTER_DEVMODE_SIZE(d));
+
+ return DEVICE_MSPRINTER_DEVMODE_MIRROR(d);
+}
+
+/*
+ * Apply settings from the DEVMODE. The settings are considered
+ * incremental to the default DEVMODE, so that changes in the
+ * passed structure supercede parameters of the printer.
+ *
+ * The passed structure is overwritten by the fuction call;
+ * complete printer settings are returned.
+ */
+void
+msprinter_apply_devmode (struct device *d, DEVMODE *devmode)
+{
+ assert (DEVICE_MSPRINTER_P (d));
+
+ DocumentProperties (NULL,
+ DEVICE_MSPRINTER_HPRINTER(d),
+ DEVICE_MSPRINTER_NAME(d),
+ devmode, devmode,
+ DM_IN_BUFFER | DM_OUT_BUFFER);
+
+ ResetDC (DEVICE_MSPRINTER_HDC (d), devmode);
+}
+
+\f
+/************************************************************************/
/* initialization */
/************************************************************************/
{
CONSOLE_HAS_METHOD (mswindows, init_device);
CONSOLE_HAS_METHOD (mswindows, finish_init_device);
-/* CONSOLE_HAS_METHOD (mswindows, mark_device); */
+ CONSOLE_HAS_METHOD (mswindows, mark_device);
CONSOLE_HAS_METHOD (mswindows, delete_device);
CONSOLE_HAS_METHOD (mswindows, device_system_metrics);
CONSOLE_HAS_METHOD (mswindows, device_implementation_flags);
+
+ CONSOLE_HAS_METHOD (msprinter, init_device);
+ CONSOLE_HAS_METHOD (msprinter, mark_device);
+ CONSOLE_HAS_METHOD (msprinter, delete_device);
+ CONSOLE_HAS_METHOD (msprinter, device_system_metrics);
+ CONSOLE_HAS_METHOD (msprinter, device_implementation_flags);
}
+
void
vars_of_device_mswindows (void)
{
#include "sysfile.h"
#include "systime.h"
+#if defined(HAVE_DLOPEN) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
+#include "sysdll.h"
+#endif /* HAVE_DLOPEN and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
+
#ifdef HAVE_OFFIX_DND
#include "offix.h"
#endif
/* */
int best_visual_found = 0;
+#if defined(HAVE_DLOPEN) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
+ /*
+ * In order to avoid the lossage with flat Athena widgets dynamically
+ * linking to one of the ThreeD variants, using the dynamic symbol helpers
+ * to look for symbols that shouldn't be there and refusing to run if they
+ * are seems a less toxic idea than having XEmacs crash when we try and
+ * use a subclass of a widget that has changed size.
+ *
+ * It's ugly, I know, and not going to work everywhere. It seems better to
+ * do our damnedest to try and tell the user what to expect rather than
+ * simply blow up though.
+ *
+ * All the ThreeD variants I have access to define the following function
+ * symbols in the shared library. The flat Xaw library does not define them:
+ *
+ * Xaw3dComputeBottomShadowRGB
+ * Xaw3dComputeTopShadowRGB
+ *
+ * So far only Linux has shown this problem. This seems to be portable to
+ * all the distributions (certainly all the ones I checked - Debian and
+ * Redhat)
+ *
+ * This will only work, sadly, with dlopen() -- the other dynamic linkers
+ * are simply not capable of doing what is needed. :/
+ */
+
+ {
+ /* Get a dll handle to the main process. */
+ dll_handle xaw_dll_handle = dll_open (NULL);
+
+ /* Did that fail? If so, continue without error.
+ * We could die here but, well, that's unfriendly and all -- plus I feel
+ * better about some crashing somewhere rather than preventing a perfectly
+ * good configuration working just because dll_open failed.
+ */
+ if (xaw_dll_handle != NULL)
+ {
+ /* Look for the Xaw3d function */
+ dll_func xaw_function_handle =
+ dll_function (xaw_dll_handle, "Xaw3dComputeTopShadowRGB");
+
+ /* If we found it, warn the user in big, nasty, unfriendly letters */
+ if (xaw_function_handle != NULL)
+ {
+ warn_when_safe (Qdevice, Qerror, "\n"
+"It seems that XEmacs is built dynamically linked to the flat Athena widget\n"
+"library but it finds a 3D Athena variant with the same name at runtime.\n"
+"\n"
+"This WILL cause your XEmacs process to dump core at some point.\n"
+"You should not continue to use this binary without resolving this issue.\n"
+"\n"
+"This can be solved with the xaw-wrappers package under Debian\n"
+"(register XEmacs as incompatible with all 3d widget sets, see\n"
+"update-xaw-wrappers(8) and .../doc/xaw-wrappers/README.packagers). It\n"
+"can be verified by checking the runtime path in /etc/ld.so.conf and by\n"
+"using `ldd /path/to/xemacs' under other Linux distributions. One\n"
+"solution is to use LD_PRELOAD or LD_LIBRARY_PATH to force ld.so to\n"
+"load the flat Athena widget library instead of the aliased 3D widget\n"
+"library (see ld.so(8) for use of these environment variables).\n\n"
+ );
+
+ }
+
+ /* Otherwise release the handle to the library
+ * No error catch here; I can't think of a way to recover anyhow.
+ */
+ dll_close (xaw_dll_handle);
+ }
+ }
+#endif /* HAVE_DLOPEN and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
+
+
XSETDEVICE (device, d);
display = DEVICE_CONNECTION (d);
make_argc_argv (Vx_initial_argv_list, &argc, &argv);
- GET_C_STRING_CTEXT_DATA_ALLOCA (display, disp_name);
+ TO_EXTERNAL_FORMAT (LISP_STRING, display,
+ C_STRING_ALLOCA, disp_name,
+ Qctext);
/*
* Break apart the old XtOpenDisplay call into XOpenDisplay and
if (STRINGP (Vx_emacs_application_class) &&
XSTRING_LENGTH (Vx_emacs_application_class) > 0)
- GET_C_STRING_CTEXT_DATA_ALLOCA (Vx_emacs_application_class, app_class);
+ TO_EXTERNAL_FORMAT (LISP_STRING, Vx_emacs_application_class,
+ C_STRING_ALLOCA, app_class,
+ Qctext);
else
{
app_class = (NILP (Vx_emacs_application_class) &&
if (STRINGP (Vx_app_defaults_directory) &&
XSTRING_LENGTH (Vx_app_defaults_directory) > 0)
{
- GET_C_STRING_FILENAME_DATA_ALLOCA(Vx_app_defaults_directory, data_dir);
+ TO_EXTERNAL_FORMAT (LISP_STRING, Vx_app_defaults_directory,
+ C_STRING_ALLOCA, data_dir,
+ Qfile_name);
path = (char *)alloca (strlen (data_dir) + strlen (locale) + 7);
sprintf (path, "%s%s/Emacs", data_dir, locale);
if (!access (path, R_OK))
}
else if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0)
{
- GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir);
+ TO_EXTERNAL_FORMAT (LISP_STRING, Vdata_directory,
+ C_STRING_ALLOCA, data_dir,
+ Qfile_name);
path = (char *)alloca (strlen (data_dir) + 13 + strlen (locale) + 7);
sprintf (path, "%sapp-defaults/%s/Emacs", data_dir, locale);
if (!access (path, R_OK))
else
{
/* We have to create a matching colormap anyway...
- ### think about using standard colormaps (need the Xmu libs?) */
+ #### think about using standard colormaps (need the Xmu libs?) */
cmap = XCreateColormap(dpy, RootWindow(dpy, screen), visual, AllocNone);
XInstallColormap(dpy, cmap);
}
DEVICE_X_GC_CACHE (d) = make_gc_cache (dpy, XtWindow(app_shell));
DEVICE_X_GRAY_PIXMAP (d) = None;
Xatoms_of_device_x (d);
- Xatoms_of_xselect (d);
+ Xatoms_of_select_x (d);
Xatoms_of_objects_x (d);
x_init_device_class (d);
CONST char *keysym_ext;
CHECK_STRING (keysym);
- GET_C_STRING_CTEXT_DATA_ALLOCA (keysym, keysym_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, keysym,
+ C_STRING_ALLOCA, keysym_ext,
+ Qctext);
return XStringToKeysym (keysym_ext) ? Qt : Qnil;
}
DEFUN ("x-keysym-hash-table", Fx_keysym_hash_table, 0, 1, 0, /*
-Return a hash table which contains a hash key for all keysyms which
-name keys on the keyboard. See `x-keysym-on-keyboard-p'.
+Return a hash table containing a key for all keysyms on DEVICE.
+DEVICE must be an X11 display device. See `x-keysym-on-keyboard-p'.
*/
(device))
{
while (ndirs_return--)
font_path = Fcons (build_ext_string (directories[ndirs_return],
- FORMAT_FILENAME), font_path);
+ Qfile_name),
+ font_path);
return font_path;
}
EXTERNAL_LIST_LOOP (path_entry, font_path)
{
- GET_C_STRING_FILENAME_DATA_ALLOCA (XCAR (path_entry), directories[i++]);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (path_entry),
+ C_STRING_ALLOCA, directories[i++],
+ Qfile_name);
}
expect_x_error (dpy);
Qfont_menubar, Qfont_dialog, Qsize_cursor, Qsize_scrollbar,
Qsize_menu, Qsize_toolbar, Qsize_toolbar_button,
Qsize_toolbar_border, Qsize_icon, Qsize_icon_small, Qsize_device,
- Qsize_workspace, Qsize_device_mm, Qdevice_dpi, Qnum_bit_planes,
- Qnum_color_cells, Qmouse_buttons, Qswap_buttons, Qshow_sounds,
- Qslow_device, Qsecurity;
+ Qsize_workspace, Qoffset_workspace, Qsize_device_mm, Qdevice_dpi,
+ Qnum_bit_planes, Qnum_color_cells, Qmouse_buttons, Qswap_buttons,
+ Qshow_sounds, Qslow_device, Qsecurity;
Lisp_Object Qdevicep, Qdevice_live_p;
Lisp_Object Qcreate_device_hook;
sprintf (buf, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" :
DEVICE_TYPE_NAME (d));
write_c_string (buf, printcharfun);
- if (DEVICE_LIVE_P (d))
+ if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d)))
{
write_c_string (" on ", printcharfun);
print_internal (DEVICE_CONNECTION (d), printcharfun, 1);
semi_canonicalize_device_connection (struct console_methods *meths,
Lisp_Object name, Error_behavior errb)
{
- return CONTYPE_METH_OR_GIVEN (meths, semi_canonicalize_device_connection,
- (name, errb), name);
+ if (HAS_CONTYPE_METH_P (meths, semi_canonicalize_device_connection))
+ return CONTYPE_METH (meths, semi_canonicalize_device_connection,
+ (name, errb));
+ else
+ return CONTYPE_METH_OR_GIVEN (meths, canonicalize_device_connection,
+ (name, errb), name);
}
static Lisp_Object
canonicalize_device_connection (struct console_methods *meths,
Lisp_Object name, Error_behavior errb)
{
- return CONTYPE_METH_OR_GIVEN (meths, canonicalize_device_connection,
- (name, errb), name);
+ if (HAS_CONTYPE_METH_P (meths, canonicalize_device_connection))
+ return CONTYPE_METH (meths, canonicalize_device_connection,
+ (name, errb));
+ else
+ return CONTYPE_METH_OR_GIVEN (meths, semi_canonicalize_device_connection,
+ (name, errb), name);
}
static Lisp_Object
return make_int (DEVICE_BAUD_RATE (decode_device (device)));
}
+DEFUN ("device-printer-p", Fdevice_printer_p, 0, 1, 0, /*
+Return t if DEVICE is a printer, nil if it is a display. DEVICE defaults
+to selected device if omitted, and must be live if specified.
+*/
+ (device))
+{
+ return (MAYBE_INT_DEVMETH (decode_device (device),
+ device_implementation_flags, ())
+ & XDEVIMPF_IS_A_PRINTER) ? Qt : Qnil;
+}
+
DEFUN ("device-system-metric", Fdevice_system_metric, 1, 3, 0, /*
Get a metric for DEVICE as provided by the system.
size-toolbar-border Toolbar border width and height.
size-icon Icon dimensions.
size-icon-small Small icon dimensions.
-size-device Device screen size in pixels.
-size-workspace Workspace size in pixels. This can be less than the
- above if window manager has decorations which
- effectively shrink the area remaining for application
- windows.
+size-device Device screen or paper size in pixels.
+size-workspace Workspace size in pixels. This can be less than or
+ equal to the above. For diplays, this is the area
+ available to applications less window manager
+ decorations. For printers, this is the size of
+ printable area.
+offset-workspace Offset of workspace area from the top left corner
+ of screen or paper.
size-device-mm Device screen size in millimeters.
device-dpi Device resolution, in dots per inch.
num-bit-planes Integer, number of device bit planes.
FROB (size_icon_small);
FROB (size_device);
FROB (size_workspace);
+ FROB (offset_workspace);
FROB (size_device_mm);
FROB (device_dpi);
FROB (num_bit_planes);
FROB (size_icon_small);
FROB (size_device);
FROB (size_workspace);
+ FROB (offset_workspace);
FROB (size_device_mm);
FROB (device_dpi);
FROB (num_bit_planes);
DEFSUBR (Fset_device_baud_rate);
DEFSUBR (Fdevice_baud_rate);
DEFSUBR (Fdomain_device_type);
+ DEFSUBR (Fdevice_printer_p);
defsymbol (&Qdevicep, "devicep");
defsymbol (&Qdevice_live_p, "device-live-p");
defsymbol (&Qsize_icon_small, "size-icon-small");
defsymbol (&Qsize_device, "size-device");
defsymbol (&Qsize_workspace, "size-workspace");
+ defsymbol (&Qoffset_workspace, "offset-workspace");
defsymbol (&Qsize_device_mm, "size-device-mm");
defsymbol (&Qnum_bit_planes, "num-bit-planes");
defsymbol (&Qnum_color_cells, "num-color-cells");
/* Written by Chuck Thompson and Ben Wing. */
-#ifndef _XEMACS_DEVICE_H_
-#define _XEMACS_DEVICE_H_
+#ifndef INCLUDED_device_h_
+#define INCLUDED_device_h_
#include "console.h"
Lisp_Object domain_device_type (Lisp_Object domain);
int window_system_pixelated_geometry (Lisp_Object domain);
-#endif /* _XEMACS_DEVICE_H_ */
+#endif /* INCLUDED_device_h_ */
Charcount length = XSTRING_CHAR_LENGTH (string);
LPWSTR uni_string;
- GET_C_CHARPTR_EXT_DATA_ALLOCA (XSTRING_DATA (string),
- FORMAT_OS, mbcs_string);
+ TO_EXTERNAL_FORMAT (LISP_STRING, string,
+ C_STRING_ALLOCA, mbcs_string,
+ Qnative);
uni_string = alloca_array (WCHAR, length + 1);
length = MultiByteToWideChar (CP_ACP, 0, mbcs_string, -1,
uni_string, sizeof(WCHAR) * (length + 1));
for (i = 0; i < Dynarr_length (dialog_items); ++i)
{
Lisp_Object* gui_item = Dynarr_atp (dialog_items, i);
- struct Lisp_Gui_Item *pgui_item = XGUI_ITEM (*gui_item);
+ Lisp_Gui_Item *pgui_item = XGUI_ITEM (*gui_item);
item_tem.style = (WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON
| (gui_item_active_p (*gui_item) ? 0 : WS_DISABLED));
#include "buffer.h"
#include "regex.h"
-#include "sysdir.h"
#include "sysfile.h"
+#include "sysdir.h"
#include "sysproc.h"
-#include <windows.h>
#include <limits.h>
#include <time.h>
(user))
{
int uniq;
- Lisp_Object completed;
-
- completed = user_name_completion (user, 0, &uniq);
+ Lisp_Object completed = user_name_completion (user, 0, &uniq);
return Fcons (completed, uniq ? Qt : Qnil);
}
return user_name_completion (user, 1, NULL);
}
-struct user_cache {
- Bufbyte **data;
+struct user_name
+{
+ Bufbyte *ptr;
+ size_t len;
+};
+
+struct user_cache
+{
+ struct user_name *user_names;
int length;
int size;
EMACS_TIME last_rebuild_time;
{
int i;
for (i = 0; i < cache->length; i++)
- xfree (cache->data[i]);
- xfree (cache->data);
+ xfree (cache->user_names[i].ptr);
+ xfree (cache->user_names);
+ xzero (*cache);
}
static Lisp_Object
-user_name_completion_unwind (Lisp_Object locative)
+user_name_completion_unwind (Lisp_Object cache_incomplete_p)
{
- int interrupted = !NILP (XCAR (locative));
+ endpwent ();
+ speed_up_interrupts ();
- if (interrupted)
- {
- endpwent ();
- speed_up_interrupts ();
- free_user_cache (&user_cache);
- }
- free_cons (XCONS (locative));
+ if (! NILP (XCAR (cache_incomplete_p)))
+ free_user_cache (&user_cache);
+
+ free_cons (XCONS (cache_incomplete_p));
return Qnil;
}
-#define USER_CACHE_REBUILD (24*60*60) /* 1 day, in seconds */
+#define USER_CACHE_TTL (24*60*60) /* Time to live: 1 day, in seconds */
static Lisp_Object
user_name_completion (Lisp_Object user, int all_flag, int *uniq)
int matchcount = 0;
Lisp_Object bestmatch = Qnil;
Charcount bestmatchsize = 0;
- int speccount = specpdl_depth ();
Charcount user_name_length;
EMACS_TIME t;
int i;
/* Cache user name lookups because it tends to be quite slow.
* Rebuild the cache occasionally to catch changes */
EMACS_GET_TIME (t);
- if (user_cache.data &&
+ if (user_cache.user_names &&
(EMACS_SECS (t) - EMACS_SECS (user_cache.last_rebuild_time)
- > USER_CACHE_REBUILD))
- {
- free_user_cache (&user_cache);
- xzero (user_cache);
- }
+ > USER_CACHE_TTL))
+ free_user_cache (&user_cache);
- if (!user_cache.data)
+ if (!user_cache.user_names)
{
struct passwd *pwd;
- Lisp_Object locative = noseeum_cons (Qt, Qnil);
+ Lisp_Object cache_incomplete_p = noseeum_cons (Qt, Qnil);
+ int speccount = specpdl_depth ();
+
slow_down_interrupts ();
setpwent ();
- record_unwind_protect (user_name_completion_unwind, locative);
+ record_unwind_protect (user_name_completion_unwind, cache_incomplete_p);
while ((pwd = getpwent ()))
{
- Bufbyte *pwuser;
QUIT;
- DO_REALLOC (user_cache.data, user_cache.size,
- user_cache.length + 1, Bufbyte *);
- GET_C_CHARPTR_INT_DATA_ALLOCA (pwd->pw_name, FORMAT_OS, pwuser);
- user_cache.data[user_cache.length++] =
- (Bufbyte *) xstrdup ((char *) pwuser);
+ DO_REALLOC (user_cache.user_names, user_cache.size,
+ user_cache.length + 1, struct user_name);
+ TO_INTERNAL_FORMAT (C_STRING, pwd->pw_name,
+ MALLOC,
+ (user_cache.user_names[user_cache.length].ptr,
+ user_cache.user_names[user_cache.length].len),
+ Qnative);
+ user_cache.length++;
}
- endpwent ();
- speed_up_interrupts ();
- XCAR (locative) = Qnil;
- unbind_to (speccount, Qnil); /* free locative cons */
+ XCAR (cache_incomplete_p) = Qnil;
+ unbind_to (speccount, Qnil);
+
EMACS_GET_TIME (user_cache.last_rebuild_time);
}
for (i = 0; i < user_cache.length; i++)
{
- Bufbyte *u_name = user_cache.data[i];
- Bytecount len = strlen ((char *) u_name);
+ Bufbyte *u_name = user_cache.user_names[i].ptr;
+ Bytecount len = user_cache.user_names[i].len;
/* scmp() works in chars, not bytes, so we have to compute this: */
Charcount cclen = bytecount_to_charcount (u_name, len);
}
/* #### mrb: following STILL completely broken */
- return_me = make_ext_string ((Bufbyte *) buffer, to - buffer, FORMAT_BINARY);
+ return_me = make_ext_string ((Bufbyte *) buffer, to - buffer, Qbinary);
done:
if (buffer != buf) /* We must have allocated buffer above */
else if (COMPILED_FUNCTIONP (fun))
{
Lisp_Object tem;
- struct Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+ Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
if (! (f->flags.documentationp))
return Qnil;
tem = compiled_function_documentation (f);
{
/* Compiled-Function objects sometimes have
slots for it. */
- struct Lisp_Compiled_Function *f =
- XCOMPILED_FUNCTION (fun);
+ Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
/* This compiled-function object must have a
slot for the docstring, since we've found a
kludgily_ignore_lost_doc_p (Lisp_Object sym)
{
# define kludge_prefix "ad-Orig-"
- struct Lisp_String *name = XSYMBOL (sym)->name;
+ Lisp_String *name = XSYMBOL (sym)->name;
return (string_length (name) > (Bytecount) (sizeof (kludge_prefix)) &&
!strncmp ((char *) string_data (name), kludge_prefix,
sizeof (kludge_prefix) - 1));
}
else if (COMPILED_FUNCTIONP (fun))
{
- struct Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+ Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
if (! (f->flags.documentationp))
doc = -1;
else
case '{':
case '<':
{
- /* ### jump to label `subst_string|subst' crosses
+ /* #### jump to label `subst_string|subst' crosses
initialization of `buffer|_buf' */
Lisp_Object buffer;
struct buffer *buf_;
else
{
Lisp_Object obj = largs[spec->argnum - 1];
- struct Lisp_String *ls;
+ Lisp_String *ls;
if (ch == 'S')
{
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_DRAGDROP_H_
-#define _XEMACS_DRAGDROP_H_
+#ifndef INCLUDED_dragdrop_h_
+#define INCLUDED_dragdrop_h_
/* Drag'n'Drop data types known by XEmacs */
extern Lisp_Object Qdragdrop_MIME;
/* emacs interface */
void syms_of_dragdrop (void);
-#endif /* _XEMACS_DRAGDROP_H_ */
+#endif /* INCLUDED_dragdrop_h_ */
Use the following global variable:
Dynarr_min_size
- Minimum allowable size for a dynamic array when it is resized. The
- default is 32 and does not normally need to be changed.
+ Minimum allowable size for a dynamic array when it is resized.
*/
#include <config.h>
#include "lisp.h"
-int Dynarr_min_size = 1;
+static int Dynarr_min_size = 8;
static void
Dynarr_realloc (Dynarr *dy, int new_size)
if ((p = getenv ("NAME")))
/* I don't think it's the right thing to do the ampersand
modification on NAME. Not that it matters anymore... -hniksic */
- Vuser_full_name = build_ext_string (p, FORMAT_OS);
+ Vuser_full_name = build_ext_string (p, Qnative);
else
Vuser_full_name = Fuser_full_name (Qnil);
}
*/
(str))
{
- struct Lisp_String *p;
+ Lisp_String *p;
CHECK_STRING (str);
p = XSTRING (str);
tmpdir = "/tmp";
#endif
- return build_ext_string (tmpdir, FORMAT_FILENAME);
+ return build_ext_string (tmpdir, Qfile_name);
}
DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
/* Fuck me. getpwnam() can call select() and (under IRIX at least)
things get wedged if a SIGIO arrives during this time. */
- GET_C_STRING_OS_DATA_ALLOCA (user_name, user_name_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, user_name,
+ C_STRING_ALLOCA, user_name_ext,
+ Qnative);
slow_down_interrupts ();
pw = (struct passwd *) getpwnam (user_name_ext);
speed_up_interrupts ();
tem = ((!NILP (user) && !pw)
? Qnil
: make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
- FORMAT_OS));
+ Qnative));
#ifdef AMPERSAND_FULL_NAME
if (!NILP (tem))
return tem;
}
-static char *cached_home_directory;
+static Extbyte *cached_home_directory;
void
uncache_home_directory (void)
}
/* Returns the home directory, in external format */
-char *
+Extbyte *
get_home_directory (void)
{
int output_home_warning = 0;
if (cached_home_directory == NULL)
{
- if ((cached_home_directory = getenv("HOME")) == NULL)
+ if ((cached_home_directory = (Extbyte *) getenv("HOME")) == NULL)
{
#if defined(WINDOWSNT) && !defined(__CYGWIN32__)
- char *homedrive, *homepath;
+ char *homedrive, *homepath;
if ((homedrive = getenv("HOMEDRIVE")) != NULL &&
(homepath = getenv("HOMEPATH")) != NULL)
{
cached_home_directory =
- (char *) xmalloc(strlen(homedrive) + strlen(homepath) + 1);
- sprintf(cached_home_directory, "%s%s", homedrive, homepath);
+ (Extbyte *) xmalloc (strlen (homedrive) +
+ strlen (homepath) + 1);
+ sprintf((char *) cached_home_directory, "%s%s",
+ homedrive,
+ homepath);
}
else
{
/*
* This is NT Emacs behavior
*/
- cached_home_directory = "C:\\";
+ cached_home_directory = (Extbyte *) "C:\\";
output_home_warning = 1;
# endif
}
* We probably should try to extract pw_dir from /etc/passwd,
* before falling back to this.
*/
- cached_home_directory = "/";
+ cached_home_directory = (Extbyte *) "/";
output_home_warning = 1;
#endif /* !WINDOWSNT */
}
*/
())
{
- char *path = get_home_directory ();
+ Extbyte *path = get_home_directory ();
return path == NULL ? Qnil :
Fexpand_file_name (Fsubstitute_in_file_name
- (build_ext_string (path, FORMAT_FILENAME)),
+ (build_ext_string ((char *) path, Qfile_name)),
Qnil);
}
(CONST char *) XSTRING_DATA (format_string),
localtime (&value))
|| !*buf)
- return build_ext_string (buf, FORMAT_BINARY);
+ return build_ext_string (buf, Qbinary);
/* If buffer was too small, make it bigger. */
size *= 2;
}
strncpy (buf, tem, 24);
buf[24] = 0;
- return build_ext_string (buf, FORMAT_BINARY);
+ return build_ext_string (buf, Qbinary);
}
#define TM_YEAR_ORIGIN 1900
mc_count = begin_multiple_change (buf, pos, stop);
if (STRINGP (table))
{
- struct Lisp_String *stable = XSTRING (table);
+ Lisp_String *stable = XSTRING (table);
Charcount size = string_char_length (stable);
#ifdef MULE
/* Under Mule, string_char(n) is O(n), so for large tables or
&& (XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_GENERIC
|| XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_CHAR))
{
- struct Lisp_Char_Table *ctable = XCHAR_TABLE (table);
+ Lisp_Char_Table *ctable = XCHAR_TABLE (table);
for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++)
{
/************************************************************************/
static Lisp_Object
-make_ldap (struct Lisp_LDAP *ldap)
+make_ldap (Lisp_LDAP *ldap)
{
Lisp_Object lisp_ldap;
XSETLDAP (lisp_ldap, ldap);
{
char buf[32];
- struct Lisp_LDAP *ldap = XLDAP (obj);
+ Lisp_LDAP *ldap = XLDAP (obj);
if (print_readably)
error ("printing unreadable object #<ldap %s>",
write_c_string (buf, printcharfun);
}
-static struct Lisp_LDAP *
+static Lisp_LDAP *
allocate_ldap (void)
{
- struct Lisp_LDAP *ldap =
- alloc_lcrecord_type (struct Lisp_LDAP, &lrecord_ldap);
+ Lisp_LDAP *ldap = alloc_lcrecord_type (Lisp_LDAP, &lrecord_ldap);
ldap->ld = NULL;
ldap->host = Qnil;
static void
finalize_ldap (void *header, int for_disksave)
{
- struct Lisp_LDAP *ldap = (struct Lisp_LDAP *) header;
+ Lisp_LDAP *ldap = (Lisp_LDAP *) header;
if (for_disksave)
signal_simple_error ("Can't dump an emacs containing LDAP objects",
DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap,
mark_ldap, print_ldap, finalize_ldap,
- NULL, NULL, 0, struct Lisp_LDAP);
+ NULL, NULL, 0, Lisp_LDAP);
(host, plist))
{
/* This function can GC */
- struct Lisp_LDAP *ldap;
+ Lisp_LDAP *ldap;
LDAP *ld;
int ldap_port = 0;
int ldap_auth = LDAP_AUTH_SIMPLE;
else if (EQ (keyword, Qbinddn))
{
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, ldap_binddn);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value,
+ C_STRING_ALLOCA, ldap_binddn,
+ Qnative);
}
/* Password */
else if (EQ (keyword, Qpasswd))
{
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, ldap_passwd);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value,
+ C_STRING_ALLOCA, ldap_passwd,
+ Qnative);
}
/* Deref */
else if (EQ (keyword, Qderef))
*/
(ldap))
{
- struct Lisp_LDAP *lldap;
+ Lisp_LDAP *lldap;
CHECK_LIVE_LDAP (ldap);
lldap = XLDAP (ldap);
ldap_unbind (lldap->ld);
{
Lisp_Object current = XCAR (attrs);
CHECK_STRING (current);
- GET_C_STRING_OS_DATA_ALLOCA (current, ldap_attributes[i]);
+ TO_EXTERNAL_FORMAT (LISP_STRING, current,
+ C_STRING_ALLOCA, ldap_attributes[i],
+ Qnative);
++i;
}
ldap_attributes[i] = NULL;
dn = ldap_get_dn (ld, e);
if (dn == NULL)
signal_ldap_error (ld, e, 0);
- entry = Fcons (build_ext_string (dn, FORMAT_OS), Qnil);
+ entry = Fcons (build_ext_string (dn, Qnative), Qnil);
}
for (a= ldap_first_attribute (ld, e, &ptr);
a != NULL;
a = ldap_next_attribute (ld, e, ptr) )
{
- list = Fcons (build_ext_string (a, FORMAT_OS), Qnil);
+ list = Fcons (build_ext_string (a, Qnative), Qnil);
unwind.vals = ldap_get_values_len (ld, e, a);
if (unwind.vals != NULL)
{
{
list = Fcons (make_ext_string (unwind.vals[i]->bv_val,
unwind.vals[i]->bv_len,
- FORMAT_OS),
+ Qnative),
list);
}
}
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _XEMACS_ELDAP_H_
-#define _XEMACS_ELDAP_H_
+#ifndef INCLUDED_eldap_h_
+#define INCLUDED_eldap_h_
#include <lber.h>
#include <ldap.h>
/* Name of the host we connected to */
Lisp_Object host;
};
+typedef struct Lisp_LDAP Lisp_LDAP;
-DECLARE_LRECORD (ldap, struct Lisp_LDAP);
-#define XLDAP(x) XRECORD (x, ldap, struct Lisp_LDAP)
+DECLARE_LRECORD (ldap, Lisp_LDAP);
+#define XLDAP(x) XRECORD (x, ldap, Lisp_LDAP)
#define XSETLDAP(x, p) XSETRECORD (x, p, ldap)
#define LDAPP(x) RECORDP (x, ldap)
#define CHECK_LDAP(x) CHECK_RECORD (x, ldap)
Lisp_Object attrsonly,
Lisp_Object withdn);
-#endif /* _XEMACS_ELDAP_H_ */
+#endif /* INCLUDED_eldap_h_ */
Lisp_Object next_weak; /* Used to chain together all of the weak
hash tables. Don't mark through this. */
};
-typedef struct Lisp_Hash_Table Lisp_Hash_Table;
#define HENTRY_CLEAR_P(hentry) ((*(EMACS_UINT*)(&((hentry)->key))) == 0)
#define CLEAR_HENTRY(hentry) \
}
static const struct lrecord_description hentry_description_1[] = {
- { XD_LISP_OBJECT, offsetof(hentry, key), 2 },
+ { XD_LISP_OBJECT, offsetof (hentry, key) },
+ { XD_LISP_OBJECT, offsetof (hentry, value) },
{ XD_END }
};
static const struct struct_description hentry_description = {
- sizeof(hentry),
+ sizeof (hentry),
hentry_description_1
};
const struct lrecord_description hash_table_description[] = {
- { XD_SIZE_T, offsetof(Lisp_Hash_Table, size) },
- { XD_STRUCT_PTR, offsetof(Lisp_Hash_Table, hentries), XD_INDIRECT(0, 1), &hentry_description },
- { XD_LO_LINK, offsetof(Lisp_Hash_Table, next_weak) },
+ { XD_SIZE_T, offsetof (Lisp_Hash_Table, size) },
+ { XD_STRUCT_PTR, offsetof (Lisp_Hash_Table, hentries), XD_INDIRECT(0, 1), &hentry_description },
+ { XD_LO_LINK, offsetof (Lisp_Hash_Table, next_weak) },
{ XD_END }
};
static void
resize_hash_table (Lisp_Hash_Table *ht, size_t new_size)
{
- hentry *old_entries, *new_entries, *old_sentinel, *new_sentinel, *e;
+ hentry *old_entries, *new_entries, *sentinel, *e;
size_t old_size;
old_size = ht->size;
old_entries = ht->hentries;
- ht->hentries = xnew_array (hentry, new_size + 1);
+ ht->hentries = xnew_array_and_zero (hentry, new_size + 1);
new_entries = ht->hentries;
- old_sentinel = old_entries + old_size;
- new_sentinel = new_entries + new_size;
-
- for (e = new_entries; e <= new_sentinel; e++)
- CLEAR_HENTRY (e);
-
compute_hash_table_derived_values (ht);
- for (e = old_entries; e < old_sentinel; e++)
+ for (e = old_entries, sentinel = e + old_size; e < sentinel; e++)
if (!HENTRY_CLEAR_P (e))
{
hentry *probe = new_entries + HASH_CODE (e->key, ht);
xfree (old_entries);
}
+/* After a hash table has been saved to disk and later restored by the
+ portable dumper, it contains the same objects, but their addresses
+ and thus their HASH_CODEs have changed. */
void
-reorganize_hash_table (Lisp_Hash_Table *ht)
+pdump_reorganize_hash_table (Lisp_Object hash_table)
{
- resize_hash_table (ht, ht->size);
+ CONST Lisp_Hash_Table *ht = xhash_table (hash_table);
+ hentry *new_entries = xnew_array_and_zero (hentry, ht->size + 1);
+ hentry *e, *sentinel;
+
+ for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++)
+ if (!HENTRY_CLEAR_P (e))
+ {
+ hentry *probe = new_entries + HASH_CODE (e->key, ht);
+ LINEAR_PROBING_LOOP (probe, new_entries, ht->size)
+ ;
+ *probe = *e;
+ }
+
+ memcpy (ht->hentries, new_entries, ht->size * sizeof (hentry));
+
+ xfree (new_entries);
}
static void
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_ELHASH_H_
-#define _XEMACS_ELHASH_H_
+#ifndef INCLUDED_elhash_h_
+#define INCLUDED_elhash_h_
-DECLARE_LRECORD (hash_table, struct Lisp_Hash_Table);
+typedef struct Lisp_Hash_Table Lisp_Hash_Table;
-#define XHASH_TABLE(x) XRECORD (x, hash_table, struct Lisp_Hash_Table)
+DECLARE_LRECORD (hash_table, Lisp_Hash_Table);
+
+#define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table)
#define XSETHASH_TABLE(x, p) XSETRECORD (x, p, hash_table)
#define HASH_TABLEP(x) RECORDP (x, hash_table)
#define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table)
typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value,
void* extra_arg);
-struct Lisp_Hash_Table;
-
Lisp_Object make_general_lisp_hash_table (enum hash_table_test test,
size_t size,
double rehash_size,
int finish_marking_weak_hash_tables (void);
void prune_weak_hash_tables (void);
-void reorganize_hash_table (struct Lisp_Hash_Table *ht);
+void pdump_reorganize_hash_table (Lisp_Object);
-#endif /* _XEMACS_ELHASH_H_ */
+#endif /* INCLUDED_elhash_h_ */
#include TT_C_H_PATH
#endif
-#ifdef APOLLO
-#ifndef APOLLO_SR10
-#include <default_acl.h>
-#endif
-#endif
-
#if defined (WINDOWSNT)
#include <windows.h>
#endif
/* Do not trust to what crt0 has stuffed into argv[0] */
char full_exe_path [MAX_PATH];
GetModuleFileName (NULL, full_exe_path, MAX_PATH);
- result = Fcons (build_ext_string (full_exe_path, FORMAT_FILENAME),
+ result = Fcons (build_ext_string (full_exe_path, Qfile_name),
result);
#if defined(HAVE_SHLIB)
(void)dll_init(full_exe_path);
}
else
#endif
- result = Fcons (build_ext_string (argv [i], FORMAT_FILENAME), result);
+ result = Fcons (build_ext_string (argv [i], Qfile_name),
+ result);
}
}
return result;
CONST char *temp;
CHECK_STRING (XCAR (next));
- GET_C_STRING_EXT_DATA_ALLOCA (XCAR (next), FORMAT_OS, temp);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (next),
+ C_STRING_ALLOCA, temp,
+ Qnative);
(*argv) [i] = xstrdup (temp);
}
(*argv) [n] = 0;
clearerr (stdin);
-#ifdef APOLLO
-#ifndef APOLLO_SR10
- /* If USE_DOMAIN_ACLS environment variable exists,
- use ACLs rather than UNIX modes. */
- if (egetenv ("USE_DOMAIN_ACLS"))
- default_acl (USE_DEFACL);
-#endif
-#endif /* APOLLO */
-
#if defined (HAVE_MMAP) && defined (REL_ALLOC)
/* ralloc can only be used if using the GNU memory allocator. */
init_ralloc ();
syms_of_abbrev ();
syms_of_alloc ();
-#ifdef HAVE_X_WINDOWS
- syms_of_balloon_x ();
-#endif
syms_of_buffer ();
syms_of_bytecode ();
syms_of_callint ();
syms_of_data ();
#ifdef DEBUG_XEMACS
syms_of_debug ();
+ syms_of_tests ();
#endif /* DEBUG_XEMACS */
syms_of_device ();
#ifdef HAVE_DIALOGS
#endif
#ifdef HAVE_X_WINDOWS
+ syms_of_balloon_x ();
syms_of_device_x ();
#ifdef HAVE_DIALOGS
syms_of_dialog_x ();
#ifdef HAVE_MENUBARS
syms_of_menubar_x ();
#endif
- syms_of_xselect ();
+ syms_of_select_x ();
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
syms_of_gui_x ();
#endif
syms_of_objects_mswindows ();
syms_of_select_mswindows ();
syms_of_glyphs_mswindows ();
+ syms_of_gui_mswindows ();
#ifdef HAVE_MENUBARS
syms_of_menubar_mswindows ();
#endif
vars_of_abbrev ();
vars_of_alloc ();
-#ifdef HAVE_X_WINDOWS
- vars_of_balloon_x ();
-#endif
vars_of_buffer ();
vars_of_bytecode ();
vars_of_callint ();
vars_of_data ();
#ifdef DEBUG_XEMACS
vars_of_debug ();
+ vars_of_tests ();
#endif
vars_of_console_stream ();
vars_of_device ();
vars_of_module ();
#endif
#ifdef WINDOWSNT
+ vars_of_nt ();
vars_of_ntproc ();
#endif
vars_of_objects ();
#endif
#ifdef HAVE_X_WINDOWS
+ vars_of_balloon_x ();
vars_of_device_x ();
#ifdef HAVE_DIALOGS
vars_of_dialog_x ();
vars_of_menubar_x ();
#endif
vars_of_objects_x ();
- vars_of_xselect ();
+ vars_of_select_x ();
#ifdef HAVE_SCROLLBARS
vars_of_scrollbar_x ();
#endif
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
vars_of_gui_x ();
#endif
-#endif
+#endif /* HAVE_X_WINDOWS */
#ifdef HAVE_MS_WINDOWS
vars_of_device_mswindows ();
earlier. The second may also depend on the first. */
complex_vars_of_mule_charset ();
#endif
-#if defined(FILE_CODING)
+#ifdef FILE_CODING
complex_vars_of_file_coding ();
#endif
#ifdef PDUMP
} else if (!restart) {
reinit_alloc_once_early ();
+ reinit_symbols_once_early ();
reinit_opaque_once_early ();
reinit_console_type_create_stream ();
reinit_vars_of_print ();
reinit_vars_of_redisplay ();
reinit_vars_of_search ();
- reinit_vars_of_scrollbar_x ();
reinit_vars_of_undo ();
reinit_vars_of_window ();
#ifdef HAVE_X_WINDOWS
reinit_vars_of_device_x ();
-#endif
#ifdef HAVE_SCROLLBARS
reinit_vars_of_scrollbar_x ();
+#endif
#ifdef HAVE_MENUBARS
reinit_vars_of_menubar_x ();
#endif
- reinit_vars_of_xselect ();
+ reinit_vars_of_select_x ();
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
reinit_vars_of_gui_x ();
#endif
-#endif
+#endif /* HAVE_X_WINDOWS */
#if defined(MULE) && defined(HAVE_WNN)
reinit_vars_of_mule_wnn ();
reinit_complex_vars_of_buffer ();
reinit_complex_vars_of_console ();
reinit_complex_vars_of_minibuf ();
-#endif
+#endif /* PDUMP */
}
/* Need to convert the orig_invoc_name and all of the arguments
to external format. */
- GET_STRING_EXT_DATA_ALLOCA (orig_invoc_name, FORMAT_OS, wampum,
- namesize);
+ TO_EXTERNAL_FORMAT (LISP_STRING, orig_invoc_name,
+ ALLOCA, (wampum, namesize),
+ Qnative);
namesize++;
for (ac = 0, total_len = namesize; ac < nargs; ac++)
{
CHECK_STRING (args[ac]);
- GET_STRING_EXT_DATA_ALLOCA (args[ac], FORMAT_OS,
- wampum_all[ac],
- wampum_all_len[ac]);
+ TO_EXTERNAL_FORMAT (LISP_STRING, args[ac],
+ ALLOCA, (wampum_all[ac], wampum_all_len[ac]),
+ Qnative);
wampum_all_len[ac]++;
total_len += wampum_all_len[ac];
}
\f
#ifndef CANNOT_DUMP
-/* Nothing like this can be implemented on an Apollo.
- What a loss! */
+#if !defined(PDUMP) || !defined(SYSTEM_MALLOC)
extern char my_edata[];
+#endif
#ifdef HAVE_SHM
char *intoname_ext;
char *symname_ext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (intoname, intoname_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, intoname,
+ C_STRING_ALLOCA, intoname_ext,
+ Qfile_name);
+
if (STRINGP (symname))
- GET_C_STRING_FILENAME_DATA_ALLOCA (symname, symname_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, symname,
+ C_STRING_ALLOCA, symname_ext,
+ Qfile_name);
else
symname_ext = 0;
}
/* The same as the above, except PATH is an external C string (it is
- converted as FORMAT_FILENAME), and sepchar is hardcoded to SEPCHAR
+ converted using Qfile_name), and sepchar is hardcoded to SEPCHAR
(':' or whatever). */
Lisp_Object
decode_path (CONST char *path)
{
- int len;
+ Bytecount newlen;
Bufbyte *newpath;
if (!path)
return Qnil;
- GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (path, newpath);
+ TO_INTERNAL_FORMAT (C_STRING, path, ALLOCA, (newpath, newlen), Qfile_name);
- len = strlen ((const char *) newpath);
/* #### Does this make sense? It certainly does for
decode_env_path(), but it looks dubious here. Does any code
depend on decode_path("") returning nil instead of an empty
string? */
- if (!len)
+ if (!newlen)
return Qnil;
- return split_string_by_emchar_1 (newpath, (Bytecount)len, SEPCHAR);
+ return split_string_by_emchar_1 (newpath, newlen, SEPCHAR);
}
Lisp_Object
* not previously loaded.
*/
if (modules == (emodules_list *)0)
- modules = (emodules_list *)xmalloc (sizeof(emodules_list));
+ modules = (emodules_list *) xmalloc (sizeof (emodules_list));
modnum++;
- modules = (emodules_list *) xrealloc (modules, modnum * sizeof(emodules_list));
+ modules = (emodules_list *) xrealloc (modules, modnum * sizeof (emodules_list));
fs = modnum - 1;
memset (&modules[fs], 0, sizeof(emodules_list));
{
Bytecount len = strlen (symname);
Lisp_Object sym = oblookup (Vobarray, (CONST Bufbyte *)symname, len);
- struct Lisp_Subr *subr;
+ Lisp_Subr *subr;
if (SYMBOLP(sym))
{
#endif /* EMODULES_GATHER_VERSION */
#endif /* EMODULES_HDR */
-
}
static const struct lrecord_description subr_description[] = {
- { XD_DOC_STRING, offsetof(Lisp_Subr, doc) },
+ { XD_DOC_STRING, offsetof (Lisp_Subr, doc) },
{ XD_END }
};
static Lisp_Object
condition_bind_unwind (Lisp_Object loser)
{
- struct Lisp_Cons *victim;
+ Lisp_Cons *victim;
/* ((handler-fun . handler-args) ... other handlers) */
Lisp_Object tem = XCAR (loser);
static Lisp_Object
condition_case_unwind (Lisp_Object loser)
{
- struct Lisp_Cons *victim;
+ Lisp_Cons *victim;
/* ((<unbound> . clauses) ... other handlers */
victim = XCONS (XCAR (loser));
/* Attempt to avoid consing identical (string=) pure strings. */
file = Fsymbol_name (Fintern (file, Qnil));
}
-
+
return Ffset (function, Fcons (Qautoload, list4 (file,
docstring,
interactive,
else
{
wrong_number_of_arguments:
- val = signal_wrong_number_of_arguments_error (fun, nargs);
+ val = signal_wrong_number_of_arguments_error (original_fun, nargs);
}
}
else if (COMPILED_FUNCTIONP (fun))
{
Lisp_Object current = Fcurrent_buffer ();
Lisp_Object symbol = specpdl_ptr->symbol;
- struct Lisp_Cons *victim = XCONS (ovalue);
+ Lisp_Cons *victim = XCONS (ovalue);
Lisp_Object buf = get_buffer (victim->car, 0);
ovalue = victim->cdr;
{
/* We checked symbol for validity when we specbound it,
so only need to call Fset if symbol has magic value. */
- struct Lisp_Symbol *sym = XSYMBOL (specpdl_ptr->symbol);
+ Lisp_Symbol *sym = XSYMBOL (specpdl_ptr->symbol);
if (!SYMBOL_VALUE_MAGIC_P (sym->value))
sym->value = specpdl_ptr->old_value;
else
static Lisp_Object x_keysym_to_emacs_keysym (KeySym keysym, int simple_p);
void emacs_Xt_mapping_action (Widget w, XEvent *event);
-void debug_process_finalization (struct Lisp_Process *p);
+void debug_process_finalization (Lisp_Process *p);
void emacs_Xt_event_handler (Widget wid, XtPointer closure, XEvent *event,
Boolean *continue_to_dispatch);
use a pop-up-window instead.)
*/
+/* For every key on the keyboard that has a known character correspondence,
+ we define the ascii-character property of the keysym, and make the
+ default binding for the key be self-insert-command.
+
+ The following magic is basically intimate knowledge of X11/keysymdef.h.
+ The keysym mappings defined by X11 are based on the iso8859 standards,
+ except for Cyrillic and Greek.
+
+ In a non-Mule world, a user can still have a multi-lingual editor, by doing
+ (set-face-font "...-iso8859-2" (current-buffer))
+ for all their Latin-2 buffers, etc. */
+
+static Lisp_Object
+x_keysym_to_character (KeySym keysym)
+{
+#ifdef MULE
+ Lisp_Object charset = Qzero;
+#define USE_CHARSET(var,cs) \
+ ((var) = CHARSET_BY_LEADING_BYTE (LEADING_BYTE_##cs))
+#else
+#define USE_CHARSET(var,lb)
+#endif /* MULE */
+ int code = 0;
+
+ if ((keysym & 0xff) < 0xa0)
+ return Qnil;
+
+ switch (keysym >> 8)
+ {
+ case 0: /* ASCII + Latin1 */
+ USE_CHARSET (charset, LATIN_ISO8859_1);
+ code = keysym & 0x7f;
+ break;
+ case 1: /* Latin2 */
+ USE_CHARSET (charset, LATIN_ISO8859_2);
+ code = keysym & 0x7f;
+ break;
+ case 2: /* Latin3 */
+ USE_CHARSET (charset, LATIN_ISO8859_3);
+ code = keysym & 0x7f;
+ break;
+ case 3: /* Latin4 */
+ USE_CHARSET (charset, LATIN_ISO8859_4);
+ code = keysym & 0x7f;
+ break;
+ case 4: /* Katakana */
+ USE_CHARSET (charset, KATAKANA_JISX0201);
+ if ((keysym & 0xff) > 0xa0)
+ code = keysym & 0x7f;
+ break;
+ case 5: /* Arabic */
+ USE_CHARSET (charset, ARABIC_ISO8859_6);
+ code = keysym & 0x7f;
+ break;
+ case 6: /* Cyrillic */
+ {
+ static unsigned char const cyrillic[] = /* 0x20 - 0x7f */
+ {0x00, 0x72, 0x73, 0x71, 0x74, 0x75, 0x76, 0x77,
+ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x00, 0x7e, 0x7f,
+ 0x70, 0x22, 0x23, 0x21, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x00, 0x2e, 0x2f,
+ 0x6e, 0x50, 0x51, 0x66, 0x54, 0x55, 0x64, 0x53,
+ 0x65, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e,
+ 0x5f, 0x6f, 0x60, 0x61, 0x62, 0x63, 0x56, 0x52,
+ 0x6c, 0x6b, 0x57, 0x68, 0x6d, 0x69, 0x67, 0x6a,
+ 0x4e, 0x30, 0x31, 0x46, 0x34, 0x35, 0x44, 0x33,
+ 0x45, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e,
+ 0x3f, 0x4f, 0x40, 0x41, 0x42, 0x43, 0x36, 0x32,
+ 0x4c, 0x4b, 0x37, 0x48, 0x4d, 0x49, 0x47, 0x4a};
+ USE_CHARSET (charset, CYRILLIC_ISO8859_5);
+ code = cyrillic[(keysym & 0x7f) - 0x20];
+ break;
+ }
+ case 7: /* Greek */
+ {
+ static unsigned char const greek[] = /* 0x20 - 0x7f */
+ {0x00, 0x36, 0x38, 0x39, 0x3a, 0x5a, 0x00, 0x3c,
+ 0x3e, 0x5b, 0x00, 0x3f, 0x00, 0x00, 0x35, 0x2f,
+ 0x00, 0x5c, 0x5d, 0x5e, 0x5f, 0x7a, 0x40, 0x7c,
+ 0x7d, 0x7b, 0x60, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x53, 0x00, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+ 0x70, 0x71, 0x73, 0x72, 0x74, 0x75, 0x76, 0x77,
+ 0x78, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+ USE_CHARSET (charset, GREEK_ISO8859_7);
+ code = greek[(keysym & 0x7f) - 0x20];
+ break;
+ }
+ case 8: /* Technical */
+ break;
+ case 9: /* Special */
+ break;
+ case 10: /* Publishing */
+ break;
+ case 11: /* APL */
+ break;
+ case 12: /* Hebrew */
+ USE_CHARSET (charset, HEBREW_ISO8859_8);
+ code = keysym & 0x7f;
+ break;
+ case 13: /* Thai */
+ /* #### This needs to deal with character composition. */
+ USE_CHARSET (charset, THAI_TIS620);
+ code = keysym & 0x7f;
+ break;
+ case 14: /* Korean Hangul */
+ break;
+ case 19: /* Latin 9 - ISO8859-15 - unsupported charset. */
+ break;
+ case 32: /* Currency */
+ break;
+ default:
+ break;
+ }
+
+ if (code == 0)
+ return Qnil;
+
+#ifdef MULE
+ return make_char (MAKE_CHAR (charset, code, 0));
+#else
+ return make_char (code + 0x80);
+#endif
+}
+
+/* #### The way that keysym correspondence to characters should work:
+ - a Lisp_Event should contain a keysym AND a character slot.
+ - keybindings are tried with the keysym. If no binding can be found,
+ and there is a corresponding character, call self-insert-command.
+
+ #### Nuke x-iso8859-1.el.
+ #### Nuke the Qascii_character property.
+ #### Nuke Vcharacter_set_property.
+*/
+static void
+maybe_define_x_key_as_self_inserting_character (KeySym keysym, Lisp_Object symbol)
+{
+ Lisp_Object character = x_keysym_to_character (keysym);
+
+ if (CHARP (character))
+ {
+ extern Lisp_Object Vcurrent_global_map;
+ extern Lisp_Object Qascii_character;
+ Fput (symbol, Qascii_character, character);
+ if (NILP (Flookup_key (Vcurrent_global_map, symbol, Qnil)))
+ Fdefine_key (Vcurrent_global_map, symbol, Qself_insert_command);
+ }
+}
+
+static void
+x_has_keysym (KeySym keysym, Lisp_Object hash_table, int with_modifiers)
+{
+ KeySym upper_lower[2];
+ int j;
+
+ if (keysym < 0x80) /* Optimize for ASCII keysyms */
+ return;
+ /* If you do: xmodmap -e 'keysym NN = scaron'
+ and then press (Shift scaron), X11 will return the different
+ keysym Scaron, but xmodmap -pke might not even mention Scaron.
+ So we `register' both scaron and Scaron. */
+ XConvertCase (keysym, &upper_lower[0], &upper_lower[1]);
+
+ for (j = 0; j < (upper_lower[0] == upper_lower[1] ? 1 : 2); j++)
+ {
+ char *name;
+ keysym = upper_lower[j];
+
+ name = XKeysymToString (keysym);
+ if (name)
+ {
+ /* X guarantees NAME to be in the Host Portable Character Encoding */
+ Lisp_Object sym = x_keysym_to_emacs_keysym (keysym, 0);
+ Lisp_Object new_value = with_modifiers ? Qt : Qsans_modifiers;
+ Lisp_Object old_value = Fgethash (sym, hash_table, Qnil);
+
+ if (! EQ (old_value, new_value)
+ && ! (EQ (old_value, Qsans_modifiers) &&
+ EQ (new_value, Qt)))
+ {
+ maybe_define_x_key_as_self_inserting_character (keysym, sym);
+ Fputhash (build_ext_string (name, Qbinary), new_value, hash_table);
+ Fputhash (sym, new_value, hash_table);
+ }
+ }
+ }
+}
+
static void
x_reset_key_mapping (struct device *d)
{
if (keysym[0] == NoSymbol)
continue;
- {
- char *name = XKeysymToString (keysym[0]);
- Lisp_Object sym = x_keysym_to_emacs_keysym (keysym[0], 0);
- if (name)
- {
- Fputhash (build_string (name), Qsans_modifiers, hash_table);
- Fputhash (sym, Qsans_modifiers, hash_table);
- }
- }
+ x_has_keysym (keysym[0], hash_table, 0);
for (j = 1; j < keysyms_per_code; j++)
{
if (keysym[j] != keysym[0] &&
keysym[j] != NoSymbol)
- {
- char *name = XKeysymToString (keysym[j]);
- Lisp_Object sym = x_keysym_to_emacs_keysym (keysym[j], 0);
- if (name && NILP (Fgethash (sym, hash_table, Qnil)))
- {
- Fputhash (build_string (name), Qt, hash_table);
- Fputhash (sym, Qt, hash_table);
- }
- }
+ x_has_keysym (keysym[j], hash_table, 1);
}
}
}
Lstream *istr;
struct gcpro gcpro1, gcpro2;
- fb_instream =
- make_fixed_buffer_input_stream ((unsigned char *) bufptr, len);
+ fb_instream = make_fixed_buffer_input_stream (bufptr, len);
- /* ### Use Fget_coding_system (Vcomposed_input_coding_system) */
+ /* #### Use Fget_coding_system (Vcomposed_input_coding_system) */
instream =
make_decoding_input_stream (XLSTREAM (fb_instream),
Fget_coding_system (Qundecided));
while ((ch = Lstream_get_emchar (istr)) != EOF)
{
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event *ev = XEVENT (emacs_event);
+ Lisp_Event *ev = XEVENT (emacs_event);
ev->channel = DEVICE_CONSOLE (d);
ev->event_type = key_press_event;
ev->timestamp = event->time;
}
static int
-x_event_to_emacs_event (XEvent *x_event, struct Lisp_Event *emacs_event)
+x_event_to_emacs_event (XEvent *x_event, Lisp_Event *emacs_event)
{
Display *display = x_event->xany.display;
struct device *d = get_device_from_display (display);
make_string ((Bufbyte *)"8bit", 4),
make_ext_string ((Extbyte *)data,
strlen((char *)data),
- FORMAT_CTEXT) ) );
+ Qctext) ) );
break;
case DndMIME:
/* we have to parse this in some way to extract
l_type = Qdragdrop_MIME;
l_dndlist = list1 ( make_ext_string ((Extbyte *)data,
strlen((char *)data),
- FORMAT_BINARY) );
+ Qbinary) );
break;
case DndFile:
case DndDir:
and escaping again will break them (cause % is unsave) */
l_dndlist = list1 ( make_ext_string ((Extbyte *)data,
strlen ((char *)data),
- FORMAT_FILENAME) );
+ Qfile_name) );
l_type = Qdragdrop_URL;
break;
default: /* Unknown, RawData and any other type */
make_string ((Bufbyte *)"8bit", 4),
make_ext_string ((Extbyte *)data,
size,
- FORMAT_BINARY) ) );
+ Qbinary) ) );
l_type = Qdragdrop_MIME;
break;
}
}
static void
-emacs_Xt_handle_magic_event (struct Lisp_Event *emacs_event)
+emacs_Xt_handle_magic_event (Lisp_Event *emacs_event)
{
/* This function can GC */
XEvent *event = &emacs_event->event.magic.underlying_x_event;
}
static void
-Xt_timeout_to_emacs_event (struct Lisp_Event *emacs_event)
+Xt_timeout_to_emacs_event (Lisp_Event *emacs_event)
{
struct Xt_timeout *timeout = completed_timeouts;
assert (timeout);
}
static void
-emacs_Xt_select_process (struct Lisp_Process *p)
+emacs_Xt_select_process (Lisp_Process *p)
{
Lisp_Object process;
int infd = event_stream_unixoid_select_process (p);
}
static void
-emacs_Xt_unselect_process (struct Lisp_Process *p)
+emacs_Xt_unselect_process (Lisp_Process *p)
{
int infd = event_stream_unixoid_unselect_process (p);
If we've still got pointers to it in this file, we're gonna lose hard.
*/
void
-debug_process_finalization (struct Lisp_Process *p)
+debug_process_finalization (Lisp_Process *p)
{
#if 0 /* #### */
int i;
}
static void
-Xt_process_to_emacs_event (struct Lisp_Event *emacs_event)
+Xt_process_to_emacs_event (Lisp_Event *emacs_event)
{
int i;
to be deleted.) */
static int
-Xt_tty_to_emacs_event (struct Lisp_Event *emacs_event)
+Xt_tty_to_emacs_event (Lisp_Event *emacs_event)
{
int i;
char *buf = alloca_array (char, XSTRING_LENGTH (f->name) + 4);
sprintf (buf, " \"%s\"", XSTRING_DATA (f->name));
write_string_to_stdio_stream (stderr, 0, (Bufbyte *) buf, 0,
- strlen (buf), FORMAT_TERMINAL);
+ strlen (buf), Qterminal);
}
stderr_out ("\n");
}
}
static void
-emacs_Xt_next_event (struct Lisp_Event *emacs_event)
+emacs_Xt_next_event (Lisp_Event *emacs_event)
{
we_didnt_get_an_event:
the '#if 0'. Note, however, that I got "unknown structure"
errors when I tried this. */
XtConvertArgRec Const colorConvertArgs[] = {
- {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen),
- sizeof(Screen *)},
- {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.colormap),
- sizeof(Colormap)}
+ { XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen),
+ sizeof (Screen *) },
+ { XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.colormap),
+ sizeof (Colormap) }
};
#endif
{
defsymbol (&Qkey_mapping, "key-mapping");
defsymbol (&Qsans_modifiers, "sans-modifiers");
+ defsymbol (&Qself_insert_command, "self-insert-command");
}
void
/* Timer ID used for button2 emulation */
#define BUTTON_2_TIMER_ID 1
-extern Lisp_Object
-mswindows_get_toolbar_button_text (struct frame* f, int command_id);
-extern Lisp_Object
-mswindows_handle_toolbar_wm_command (struct frame* f, HWND ctrl, WORD id);
-extern Lisp_Object
-mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, WORD id);
-
static Lisp_Object mswindows_find_frame (HWND hwnd);
static Lisp_Object mswindows_find_console (HWND hwnd);
static Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, int mods,
/************************************************************************/
static int
-mswindows_user_event_p (struct Lisp_Event* sevt)
+mswindows_user_event_p (Lisp_Event* sevt)
{
return (sevt->event_type == key_press_event
|| sevt->event_type == button_press_event
Lisp_Object object)
{
Lisp_Object event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event* e = XEVENT (event);
+ Lisp_Event* e = XEVENT (event);
e->event_type = misc_user_event;
e->channel = channel;
+ e->timestamp = GetTickCount ();
e->event.misc.function = function;
e->event.misc.object = object;
}
void
-mswindows_enqueue_magic_event (HWND hwnd, UINT message)
+mswindows_enqueue_magic_event (HWND hwnd, UINT msg)
{
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event* event = XEVENT (emacs_event);
+ Lisp_Event* event = XEVENT (emacs_event);
event->channel = hwnd ? mswindows_find_frame (hwnd) : Qnil;
event->timestamp = GetMessageTime();
event->event_type = magic_event;
- EVENT_MSWINDOWS_MAGIC_TYPE (event) = message;
+ EVENT_MSWINDOWS_MAGIC_TYPE (event) = msg;
mswindows_enqueue_dispatch_event (emacs_event);
}
static void
-mswindows_enqueue_process_event (struct Lisp_Process* p)
+mswindows_enqueue_process_event (Lisp_Process* p)
{
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event* event = XEVENT (emacs_event);
+ Lisp_Event* event = XEVENT (emacs_event);
Lisp_Object process;
XSETPROCESS (process, p);
}
static void
-mswindows_enqueue_mouse_button_event (HWND hwnd, UINT message, POINTS where, DWORD when)
+mswindows_enqueue_mouse_button_event (HWND hwnd, UINT msg, POINTS where, DWORD when)
{
/* We always use last message time, because mouse button
recognition will fail */
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event* event = XEVENT(emacs_event);
+ Lisp_Event* event = XEVENT(emacs_event);
event->channel = mswindows_find_frame(hwnd);
event->timestamp = when;
event->event.button.button =
- (message==WM_LBUTTONDOWN || message==WM_LBUTTONUP) ? 1 :
- ((message==WM_RBUTTONDOWN || message==WM_RBUTTONUP) ? 3 : 2);
+ (msg==WM_LBUTTONDOWN || msg==WM_LBUTTONUP) ? 1 :
+ ((msg==WM_RBUTTONDOWN || msg==WM_RBUTTONUP) ? 3 : 2);
event->event.button.x = where.x;
event->event.button.y = where.y;
event->event.button.modifiers = mswindows_modifier_state (NULL, 0);
- if (message==WM_LBUTTONDOWN || message==WM_MBUTTONDOWN ||
- message==WM_RBUTTONDOWN)
+ if (msg==WM_LBUTTONDOWN || msg==WM_MBUTTONDOWN ||
+ msg==WM_RBUTTONDOWN)
{
event->event_type = button_press_event;
SetCapture (hwnd);
mswindows_enqueue_keypress_event (HWND hwnd, Lisp_Object keysym, int mods)
{
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event* event = XEVENT(emacs_event);
+ Lisp_Event* event = XEVENT(emacs_event);
event->channel = mswindows_find_console(hwnd);
event->timestamp = GetMessageTime();
mswindows_dequeue_dispatch_event ()
{
Lisp_Object event;
- struct Lisp_Event* sevt;
+ Lisp_Event* sevt;
assert (!NILP(mswindows_u_dispatch_event_queue) ||
!NILP(mswindows_s_dispatch_event_queue));
*/
Lisp_Object
-mswindows_cancel_dispatch_event (struct Lisp_Event *match)
+mswindows_cancel_dispatch_event (Lisp_Event *match)
{
Lisp_Object event;
Lisp_Object previous_event = Qnil;
EVENT_CHAIN_LOOP (event, *head)
{
- struct Lisp_Event *e = XEVENT (event);
+ Lisp_Event *e = XEVENT (event);
if ((e->event_type == match->event_type) &&
((e->event_type == timeout_event) ?
(e->event.timeout.interval_id == match->event.timeout.interval_id) :
return result;
}
+/*
+ * KEYBOARD_ONLY_P is set to non-zero when we are called from
+ * QUITP, and are interesting in keyboard messages only.
+ */
static void
-mswindows_drain_windows_queue ()
+mswindows_drain_windows_queue (int keyboard_only_till_quit_char_p)
{
MSG msg;
- while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+
+ /* Minimize the hassle of misordered events by not fetching
+ past quit char if called from QUITP; */
+ while (!(keyboard_only_till_quit_char_p &&
+ mswindows_quit_chars_count > 0) &&
+ PeekMessage (&msg, NULL,
+ keyboard_only_till_quit_char_p ? WM_KEYFIRST : 0,
+ keyboard_only_till_quit_char_p ? WM_KEYLAST : 0,
+ PM_REMOVE))
{
- /* we have to translate messages that are not sent to the main
- window. this is so that key presses work ok in things like
- edit fields. however, we *musn't* translate message for the
+ /* We have to translate messages that are not sent to the main
+ window. This is so that key presses work ok in things like
+ edit fields. However, we *musn't* translate message for the
main window as this is handled in the wnd proc. */
- if ( GetWindowLong (msg.hwnd, GWL_STYLE) & WS_CHILD )
+ if (GetWindowLong (msg.hwnd, GWL_STYLE) & WS_CHILD)
{
TranslateMessage (&msg);
}
return;
}
+#if 0
/* Have to drain Windows message queue first, otherwise, we may miss
quit char when called from quit_p */
+ /* #### This is, ehm, not quite true -- this function is not
+ called from quit_p. --kkm */
mswindows_drain_windows_queue ();
+#endif
while (NILP (mswindows_u_dispatch_event_queue)
&& NILP (mswindows_s_dispatch_event_queue))
{
if (FD_ISSET (windows_fd, &temp_mask))
{
- mswindows_drain_windows_queue ();
+ mswindows_drain_windows_queue (0);
}
#ifdef HAVE_TTY
/* Look for a TTY event */
{
struct console *c = tty_find_console_from_fd (i);
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event* event = XEVENT (emacs_event);
+ Lisp_Event* event = XEVENT (emacs_event);
assert (c);
if (read_event_from_tty_or_stream_desc (event, c, i))
{
if (FD_ISSET (i, &process_only_mask))
{
- struct Lisp_Process *p =
+ Lisp_Process *p =
get_process_from_usid (FD_TO_USID(i));
mswindows_enqueue_process_event (p);
else if (active == WAIT_OBJECT_0 + mswindows_waitable_count)
{
/* Got your message, thanks */
- mswindows_drain_windows_queue ();
+ mswindows_drain_windows_queue (0);
}
else
{
int ix = active - WAIT_OBJECT_0;
/* First, try to find which process' output has signaled */
- struct Lisp_Process *p =
+ Lisp_Process *p =
get_process_from_usid (HANDLE_TO_USID (mswindows_waitable_handles[ix]));
if (p != NULL)
{
mswindows_wm_timer_callback (HWND hwnd, UINT umsg, UINT id_timer, DWORD dwtime)
{
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
- struct Lisp_Event *event = XEVENT (emacs_event);
+ Lisp_Event *event = XEVENT (emacs_event);
if (KillTimer (NULL, id_timer))
--mswindows_pending_timers_count;
Lisp_Object l_dndlist = Qnil;
Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
Lisp_Object frmcons, devcons, concons;
- struct Lisp_Event *event = XEVENT (emacs_event);
+ Lisp_Event *event = XEVENT (emacs_event);
DdeGetData (hdata, cmd, len, 0);
cmd[len] = '\0';
#endif
/*
+ * Returns 1 if a key is a real modifier or special key, which
+ * is better handled by DefWindowProc
+ */
+static int
+key_needs_default_processing_p (UINT vkey)
+{
+ if (mswindows_meta_activates_menu && vkey == VK_MENU)
+ return 1;
+
+ return 0;
+}
+
+/*
* The windows procedure for the window class XEMACS_CLASS
*/
LRESULT WINAPI
Lisp_Object emacs_event = Qnil;
Lisp_Object fobj = Qnil;
- struct Lisp_Event *event;
+ Lisp_Event *event;
struct frame *frame;
struct mswindows_frame* msframe;
SetKeyboardState (keymap);
}
};
- goto defproc;
+ if (key_needs_default_processing_p (wParam))
+ goto defproc;
+ else
+ break;
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
/* Clear control and alt modifiers unless AltGr is pressed */
keymap [VK_RCONTROL] = 0;
keymap [VK_LMENU] = 0;
- if (!has_AltGr || !(keymap [VK_LCONTROL] & 0x80) || !(keymap [VK_RMENU] & 0x80))
+ if (!has_AltGr || !(keymap [VK_LCONTROL] & 0x80)
+ || !(keymap [VK_RMENU] & 0x80))
{
keymap [VK_LCONTROL] = 0;
keymap [VK_CONTROL] = 0;
SetKeyboardState (keymap_orig);
} /* else */
}
- /* F10 causes menu activation by default. We do not want this */
- if (wParam != VK_F10 && (mswindows_meta_activates_menu || wParam != VK_MENU))
+ if (key_needs_default_processing_p (wParam))
goto defproc;
- break;
+ else
+ break;
case WM_MBUTTONDOWN:
case WM_MBUTTONUP:
{
/* I think this is safe since the text will only go away
when the toolbar does...*/
- GET_C_STRING_EXT_DATA_ALLOCA (btext, FORMAT_OS,
- tttext->lpszText);
+ TO_EXTERNAL_FORMAT (LISP_STRING, btext,
+ C_STRING_ALLOCA, tttext->lpszText,
+ Qnative);
}
#endif
}
else if (nmhdr->code == TCN_SELCHANGE)
{
TC_ITEM item;
- int index = SendMessage (nmhdr->hwndFrom, TCM_GETCURSEL, 0, 0);
+ int idx = SendMessage (nmhdr->hwndFrom, TCM_GETCURSEL, 0, 0);
frame = XFRAME (mswindows_find_frame (hwnd));
item.mask = TCIF_PARAM;
- SendMessage (nmhdr->hwndFrom, TCM_GETITEM, (WPARAM)index,
+ SendMessage (nmhdr->hwndFrom, TCM_GETITEM, (WPARAM)idx,
(LPARAM)&item);
mswindows_handle_gui_wm_command (frame, 0, item.lParam);
static void
emacs_mswindows_remove_timeout (int id)
{
- struct Lisp_Event match_against;
+ Lisp_Event match_against;
Lisp_Object emacs_event;
if (KillTimer (NULL, id))
* Return the next event
*/
static void
-emacs_mswindows_next_event (struct Lisp_Event *emacs_event)
+emacs_mswindows_next_event (Lisp_Event *emacs_event)
{
Lisp_Object event, event2;
* Handle a magic event off the dispatch queue.
*/
static void
-emacs_mswindows_handle_magic_event (struct Lisp_Event *emacs_event)
+emacs_mswindows_handle_magic_event (Lisp_Event *emacs_event)
{
switch (EVENT_MSWINDOWS_MAGIC_TYPE(emacs_event))
{
#ifndef HAVE_MSG_SELECT
static HANDLE
-get_process_input_waitable (struct Lisp_Process *process)
+get_process_input_waitable (Lisp_Process *process)
{
Lisp_Object instr, outstr, p;
XSETPROCESS (p, process);
}
static void
-emacs_mswindows_select_process (struct Lisp_Process *process)
+emacs_mswindows_select_process (Lisp_Process *process)
{
HANDLE hev = get_process_input_waitable (process);
}
static void
-emacs_mswindows_unselect_process (struct Lisp_Process *process)
+emacs_mswindows_unselect_process (Lisp_Process *process)
{
/* Process handle is removed in the event loop as soon
as it is signaled, so don't bother here about it */
static void
emacs_mswindows_quit_p (void)
{
- MSG msg;
-
/* Quit cannot happen in modal loop: all program
input is dedicated to Windows. */
if (mswindows_in_modal_loop)
return;
- /* Drain windows queue. This sets up number of quit characters in the queue
- * (and also processes wm focus change, move, resize, etc messages).
- * We don't want to process WM_PAINT messages because this function can be
- * called from almost anywhere and the windows' states may be changing. */
- while (PeekMessage (&msg, NULL, 0, WM_PAINT-1, PM_REMOVE) ||
- PeekMessage (&msg, NULL, WM_PAINT+1, WM_USER-1, PM_REMOVE))
- DispatchMessage (&msg);
+ /* Drain windows queue. This sets up number of quit characters in
+ the queue */
+ mswindows_drain_windows_queue (1);
if (mswindows_quit_chars_count > 0)
{
/* Yes there's a hidden one... Throw it away */
- struct Lisp_Event match_against;
+ Lisp_Event match_against;
Lisp_Object emacs_event;
+ int critical_p = 0;
match_against.event_type = key_press_event;
match_against.event.key.modifiers = FAKE_MOD_QUIT;
- emacs_event = mswindows_cancel_dispatch_event (&match_against);
- assert (!NILP (emacs_event));
+ while (mswindows_quit_chars_count-- > 0)
+ {
+ emacs_event = mswindows_cancel_dispatch_event (&match_against);
+ assert (!NILP (emacs_event));
+
+ if (XEVENT(emacs_event)->event.key.modifiers & MOD_SHIFT)
+ critical_p = 1;
- Vquit_flag = (XEVENT(emacs_event)->event.key.modifiers & MOD_SHIFT
- ? Qcritical : Qt);
+ Fdeallocate_event(emacs_event);
+ }
- Fdeallocate_event(emacs_event);
- --mswindows_quit_chars_count;
+ Vquit_flag = critical_p ? Qcritical : Qt;
}
}
If we've still got pointers to it in this file, we're gonna lose hard.
*/
void
-debug_process_finalization (struct Lisp_Process *p)
+debug_process_finalization (Lisp_Process *p)
{
#if 0 /* #### */
Lisp_Object instr, outstr;
mswindows_event_stream->unselect_console_cb = emacs_mswindows_unselect_console;
#ifdef HAVE_MSG_SELECT
mswindows_event_stream->select_process_cb =
- (void (*)(struct Lisp_Process*))event_stream_unixoid_select_process;
+ (void (*)(Lisp_Process*))event_stream_unixoid_select_process;
mswindows_event_stream->unselect_process_cb =
- (void (*)(struct Lisp_Process*))event_stream_unixoid_unselect_process;
+ (void (*)(Lisp_Process*))event_stream_unixoid_unselect_process;
mswindows_event_stream->create_stream_pair_cb = event_stream_unixoid_create_stream_pair;
mswindows_event_stream->delete_stream_pair_cb = event_stream_unixoid_delete_stream_pair;
#else
}
static int
-maybe_read_quit_event (struct Lisp_Event *event)
+maybe_read_quit_event (Lisp_Event *event)
{
/* A C-g that came from `sigint_happened' will always come from the
controlling terminal. If that doesn't exist, however, then the
}
void
-event_stream_next_event (struct Lisp_Event *event)
+event_stream_next_event (Lisp_Event *event)
{
Lisp_Object event_obj;
}
void
-event_stream_handle_magic_event (struct Lisp_Event *event)
+event_stream_handle_magic_event (Lisp_Event *event)
{
check_event_stream_ok (EVENT_STREAM_READ);
event_stream->handle_magic_event_cb (event);
}
void
-event_stream_select_process (struct Lisp_Process *proc)
+event_stream_select_process (Lisp_Process *proc)
{
check_event_stream_ok (EVENT_STREAM_PROCESS);
if (!get_process_selected_p (proc))
}
void
-event_stream_unselect_process (struct Lisp_Process *proc)
+event_stream_unselect_process (Lisp_Process *proc)
{
check_event_stream_ok (EVENT_STREAM_PROCESS);
if (get_process_selected_p (proc))
}
else if (CHARP (traduit))
{
- struct Lisp_Event ev2;
+ Lisp_Event ev2;
/* This used to call Fcharacter_to_event() directly into EVENT,
but that can eradicate timestamps and other such stuff.
static Lisp_Object
mark_timeout (Lisp_Object obj)
{
- struct Lisp_Timeout *tm = XTIMEOUT (obj);
+ Lisp_Timeout *tm = XTIMEOUT (obj);
mark_object (tm->function);
return tm->object;
}
static void
print_timeout (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- CONST struct Lisp_Timeout *t = XTIMEOUT (obj);
+ CONST Lisp_Timeout *t = XTIMEOUT (obj);
char buf[64];
sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (timeout) 0x%lx>",
}
static const struct lrecord_description timeout_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Timeout, function), 2 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Timeout, function) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Timeout, object) },
{ XD_END }
};
DEFINE_LRECORD_IMPLEMENTATION ("timeout", timeout,
mark_timeout, print_timeout,
- 0, 0, 0, timeout_description, struct Lisp_Timeout);
+ 0, 0, 0, timeout_description, Lisp_Timeout);
/* Generate a timeout and return its ID. */
int async_p)
{
Lisp_Object op = allocate_managed_lcrecord (Vtimeout_free_list);
- struct Lisp_Timeout *timeout = XTIMEOUT (op);
+ Lisp_Timeout *timeout = XTIMEOUT (op);
EMACS_TIME current_time;
EMACS_TIME interval;
Lisp_Object *function, Lisp_Object *object)
{
Lisp_Object op = Qnil, rest;
- struct Lisp_Timeout *timeout;
+ Lisp_Timeout *timeout;
Lisp_Object *timeout_list;
struct gcpro gcpro1;
int id;
void
event_stream_disable_wakeup (int id, int async_p)
{
- struct Lisp_Timeout *timeout = 0;
+ Lisp_Timeout *timeout = 0;
Lisp_Object rest;
Lisp_Object *timeout_list;
static int
event_stream_wakeup_pending_p (int id, int async_p)
{
- struct Lisp_Timeout *timeout;
+ Lisp_Timeout *timeout;
Lisp_Object rest;
Lisp_Object timeout_list;
int found = 0;
}
else
{
- struct Lisp_Event *e = XEVENT (target_event);
+ Lisp_Event *e = XEVENT (target_event);
/* The command_event_queue was empty. Wait for an event. */
event_stream_next_event (e);
case timeout_event:
{
- struct Lisp_Event *e = XEVENT (event);
+ Lisp_Event *e = XEVENT (event);
if (!NILP (e->event.timeout.function))
call1 (e->event.timeout.function,
e->event.timeout.object);
|| (CHAR_OR_CHAR_INTP (key->keysym)
&& ((c = XCHAR_OR_CHAR_INT (key->keysym)), c >= 'A' && c <= 'Z')))
{
- struct Lisp_Event terminal_copy = *XEVENT (terminal);
+ Lisp_Event terminal_copy = *XEVENT (terminal);
if (key->modifiers & MOD_SHIFT)
key->modifiers &= (~ MOD_SHIFT);
if (EVENTP (recent)
&& event_matches_key_specifier_p (XEVENT (recent), Vmeta_prefix_char))
{
- struct Lisp_Event *e;
+ Lisp_Event *e;
/* When we see a sequence like "ESC x", pretend we really saw "M-x".
DoubleThink the recent-keys and this-command-keys as well. */
}
else if (!NILP (Vquit_flag)) {
Lisp_Object quit_event = Fmake_event(Qnil, Qnil);
- struct Lisp_Event *e = XEVENT (quit_event);
+ Lisp_Event *e = XEVENT (quit_event);
/* if quit happened during menu acceleration, pretend we read it */
struct console *con = XCONSOLE (Fselected_console ());
int ch = CONSOLE_QUIT_CHAR (con);
#if 0
/* If the last command deleted the frame, `win' might be nil.
It seems safest to do nothing in this case. */
- /* ### This doesn't really fix the problem,
+ /* #### This doesn't really fix the problem,
if delete-frame is called by some hook */
if (NILP (win))
return;
{
/* This function can GC */
struct command_builder *command_builder;
- struct Lisp_Event *ev;
+ Lisp_Event *ev;
Lisp_Object console;
Lisp_Object channel;
recent_keys_ring_index = 0;
recent_keys_ring_size = 100;
num_input_chars = 0;
- Vtimeout_free_list = make_lcrecord_list (sizeof (struct Lisp_Timeout),
+ Vtimeout_free_list = make_lcrecord_list (sizeof (Lisp_Timeout),
&lrecord_timeout);
staticpro_nodump (&Vtimeout_free_list);
the_low_level_timeout_blocktype =
}
static void
-tty_timeout_to_emacs_event (struct Lisp_Event *emacs_event)
+tty_timeout_to_emacs_event (Lisp_Event *emacs_event)
{
emacs_event->event_type = timeout_event;
/* timeout events have nil as channel */
}
static void
-emacs_tty_next_event (struct Lisp_Event *emacs_event)
+emacs_tty_next_event (Lisp_Event *emacs_event)
{
while (1)
{
if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &process_only_mask))
{
Lisp_Object process;
- struct Lisp_Process *p =
- get_process_from_usid (FD_TO_USID(i));
+ Lisp_Process *p = get_process_from_usid (FD_TO_USID(i));
assert (p);
XSETPROCESS (process, p);
}
static void
-emacs_tty_handle_magic_event (struct Lisp_Event *emacs_event)
+emacs_tty_handle_magic_event (Lisp_Event *emacs_event)
{
/* Nothing to do currently */
}
\f
static void
-emacs_tty_select_process (struct Lisp_Process *process)
+emacs_tty_select_process (Lisp_Process *process)
{
event_stream_unixoid_select_process (process);
}
static void
-emacs_tty_unselect_process (struct Lisp_Process *process)
+emacs_tty_unselect_process (Lisp_Process *process)
{
event_stream_unixoid_unselect_process (process);
}
int fake_event_occurred;
int
-read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
+read_event_from_tty_or_stream_desc (Lisp_Event *event,
struct console *con, int fd)
{
unsigned char ch;
}
static int
-get_process_infd (struct Lisp_Process *p)
+get_process_infd (Lisp_Process *p)
{
Lisp_Object instr, outstr;
get_process_streams (p, &instr, &outstr);
}
int
-event_stream_unixoid_select_process (struct Lisp_Process *proc)
+event_stream_unixoid_select_process (Lisp_Process *proc)
{
int infd = get_process_infd (proc);
}
int
-event_stream_unixoid_unselect_process (struct Lisp_Process *proc)
+event_stream_unixoid_unselect_process (Lisp_Process *proc)
{
int infd = get_process_infd (proc);
deinitialize_event (Lisp_Object ev)
{
int i;
- struct Lisp_Event *event = XEVENT (ev);
+ Lisp_Event *event = XEVENT (ev);
- for (i = 0; i < (int) (sizeof (struct Lisp_Event) / sizeof (int)); i++)
+ for (i = 0; i < (int) (sizeof (Lisp_Event) / sizeof (int)); i++)
((int *) event) [i] = 0xdeadbeef;
event->event_type = dead_event;
event->channel = Qnil;
/* Set everything to zero or nil so that it's predictable. */
void
-zero_event (struct Lisp_Event *e)
+zero_event (Lisp_Event *e)
{
xzero (*e);
set_lheader_implementation (&(e->lheader), &lrecord_event);
static Lisp_Object
mark_event (Lisp_Object obj)
{
- struct Lisp_Event *event = XEVENT (obj);
+ Lisp_Event *event = XEVENT (obj);
switch (event->event_type)
{
static int
event_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Event *e1 = XEVENT (obj1);
- struct Lisp_Event *e2 = XEVENT (obj2);
+ Lisp_Event *e1 = XEVENT (obj1);
+ Lisp_Event *e2 = XEVENT (obj2);
if (e1->event_type != e2->event_type) return 0;
if (!EQ (e1->channel, e2->channel)) return 0;
if (CONSOLE_MSWINDOWS_P (con))
return (!memcmp(&e1->event.magic.underlying_mswindows_event,
&e2->event.magic.underlying_mswindows_event,
- sizeof(union magic_data)));
+ sizeof (union magic_data)));
#endif
+ abort ();
return 1; /* not reached */
}
static unsigned long
event_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Event *e = XEVENT (obj);
+ Lisp_Event *e = XEVENT (obj);
unsigned long hash;
hash = HASH2 (e->event_type, LISP_HASH (e->channel));
if (CONSOLE_MSWINDOWS_P (con))
return HASH2 (hash, e->event.magic.underlying_mswindows_event);
#endif
+ abort ();
+ return 0;
}
case empty_event:
DEFINE_BASIC_LRECORD_IMPLEMENTATION ("event", event,
mark_event, print_event, 0, event_equal,
- event_hash, 0, struct Lisp_Event);
+ event_hash, 0, Lisp_Event);
\f
DEFUN ("make-event", Fmake_event, 0, 2, 0, /*
{
Lisp_Object tail, keyword, value;
Lisp_Object event = Qnil;
- struct Lisp_Event *e;
+ Lisp_Event *e;
EMACS_INT coord_x = 0, coord_y = 0;
struct gcpro gcpro1;
void
-character_to_event (Emchar c, struct Lisp_Event *event, struct console *con,
+character_to_event (Emchar c, Lisp_Event *event, struct console *con,
int use_console_meta_flag, int do_backspace_mapping)
{
Lisp_Object k = Qnil;
event->event.key.modifiers = m;
}
-
/* This variable controls what character name -> character code mapping
we are using. Window-system-specific code sets this to some symbol,
and we use that symbol as the plist key to convert keysyms into 8-bit
codes. In this way one can have several character sets predefined and
switch them by changing this.
+
+ #### This is utterly bogus and should be removed.
*/
Lisp_Object Vcharacter_set_property;
Emchar
-event_to_character (struct Lisp_Event *event,
+event_to_character (Lisp_Event *event,
int allow_extra_modifiers,
int allow_meta,
int allow_non_ascii)
}
void
-format_event_object (char *buf, struct Lisp_Event *event, int brief)
+format_event_object (char *buf, Lisp_Event *event, int brief)
{
int mouse_p = 0;
int mod = 0;
}
else
{
- struct Lisp_String *name = XSYMBOL (key)->name;
+ Lisp_String *name = XSYMBOL (key)->name;
memcpy (buf, string_data (name), string_length (name) + 1);
str += string_length (name);
}
*/
(event))
{
- struct Lisp_Event *e;
+ Lisp_Event *e;
CHECK_LIVE_EVENT (event);
return XEVENT_NEXT (event);
(event))
{
Lisp_Object props = Qnil;
- struct Lisp_Event *e;
+ Lisp_Event *e;
struct gcpro gcpro1;
CHECK_LIVE_EVENT (event);
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_EVENTS_H_
-#define _XEMACS_EVENTS_H_
+#ifndef INCLUDED_events_h_
+#define INCLUDED_events_h_
#include "systime.h"
multiple heterogeneous machines, X11 and SunView, or X11 and NeXT, for
example, then it will be necessary to construct an event_stream structure
that can cope with the given types. Currently, the only implemented
- event_streams are for dumb-ttys, and for X11 plus dumb-ttys.
+ event_streams are for dumb-ttys, and for X11 plus dumb-ttys,
+ and for mswindows.
To implement this for one window system is relatively simple.
To implement this for multiple window systems is trickier and may
The Create stream pair function is passed two void* values, which identify
process-dependent 'handles'. The process implementation uses these handles
to communicate with child processes. The function must be prepared to receive
- handle types of any process implementation. Since there only one process
+ handle types of any process implementation. Since only one process
implementation exists in a particular XEmacs configuration, preprocessing
- is a mean of compiling in the support for the code which deals with particular
+ is a means of compiling in the support for the code which deals with particular
handle types.
For example, a unixoid type loop, which relies on file descriptors, may be
#define USID_DONTHASH ((USID)0)
\f
-struct Lisp_Event;
-struct Lisp_Process;
-
struct event_stream
{
int (*event_pending_p) (int);
- void (*next_event_cb) (struct Lisp_Event *);
- void (*handle_magic_event_cb) (struct Lisp_Event *);
+ void (*next_event_cb) (Lisp_Event *);
+ void (*handle_magic_event_cb) (Lisp_Event *);
int (*add_timeout_cb) (EMACS_TIME);
void (*remove_timeout_cb) (int);
void (*select_console_cb) (struct console *);
void (*unselect_console_cb) (struct console *);
- void (*select_process_cb) (struct Lisp_Process *);
- void (*unselect_process_cb) (struct Lisp_Process *);
+ void (*select_process_cb) (Lisp_Process *);
+ void (*unselect_process_cb) (Lisp_Process *);
void (*quit_p_cb) (void);
USID (*create_stream_pair_cb) (void* /* inhandle*/, void* /*outhandle*/ ,
Lisp_Object* /* instream */,
should the one after that
occur? */
};
+typedef struct Lisp_Timeout Lisp_Timeout;
-DECLARE_LRECORD (timeout, struct Lisp_Timeout);
-#define XTIMEOUT(x) XRECORD (x, timeout, struct Lisp_Timeout)
+DECLARE_LRECORD (timeout, Lisp_Timeout);
+#define XTIMEOUT(x) XRECORD (x, timeout, Lisp_Timeout)
#define XSETTIMEOUT(x, p) XSETRECORD (x, p, timeout)
#define TIMEOUTP(x) RECORDP (x, timeout)
#define CHECK_TIMEOUT(x) CHECK_RECORD (x, timeout)
} event;
};
-DECLARE_LRECORD (event, struct Lisp_Event);
-#define XEVENT(x) XRECORD (x, event, struct Lisp_Event)
+DECLARE_LRECORD (event, Lisp_Event);
+#define XEVENT(x) XRECORD (x, event, Lisp_Event)
#define XSETEVENT(x, p) XSETRECORD (x, p, event)
#define EVENTP(x) RECORDP (x, event)
#define CHECK_EVENT(x) CHECK_RECORD (x, event)
#define KEYSYM(x) (intern (x))
/* from events.c */
-void format_event_object (char *buf, struct Lisp_Event *e, int brief);
-void character_to_event (Emchar c, struct Lisp_Event *event,
+void format_event_object (char *buf, Lisp_Event *e, int brief);
+void character_to_event (Emchar c, Lisp_Event *event,
struct console *con,
int use_console_meta_flag,
int do_backspace_mapping);
-void zero_event (struct Lisp_Event *e);
+void zero_event (Lisp_Event *e);
void deallocate_event_chain (Lisp_Object event);
Lisp_Object event_chain_tail (Lisp_Object event);
void enqueue_event (Lisp_Object event, Lisp_Object *head, Lisp_Object *tail);
/* True if this is a non-internal event
(keyboard press, menu, scrollbar, mouse button) */
int command_event_p (Lisp_Object event);
+void define_self_inserting_symbol (Lisp_Object, Lisp_Object);
+Emchar event_to_character (Lisp_Event *, int, int, int);
struct console *event_console_or_selected (Lisp_Object event);
/* from event-stream.c */
Lisp_Object allocate_command_builder (Lisp_Object console);
void enqueue_magic_eval_event (void (*fun) (Lisp_Object), Lisp_Object object);
-void event_stream_next_event (struct Lisp_Event *event);
-void event_stream_handle_magic_event (struct Lisp_Event *event);
+void event_stream_next_event (Lisp_Event *event);
+void event_stream_handle_magic_event (Lisp_Event *event);
void event_stream_select_console (struct console *con);
void event_stream_unselect_console (struct console *con);
-void event_stream_select_process (struct Lisp_Process *proc);
-void event_stream_unselect_process (struct Lisp_Process *proc);
+void event_stream_select_process (Lisp_Process *proc);
+void event_stream_unselect_process (Lisp_Process *proc);
USID event_stream_create_stream_pair (void* inhandle, void* outhandle,
Lisp_Object* instream, Lisp_Object* outstream, int flags);
USID event_stream_delete_stream_pair (Lisp_Object instream, Lisp_Object outstream);
int event_stream_unixoid_select_console (struct console *con);
int event_stream_unixoid_unselect_console (struct console *con);
-int event_stream_unixoid_select_process (struct Lisp_Process *proc);
-int event_stream_unixoid_unselect_process (struct Lisp_Process *proc);
-int read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
+int event_stream_unixoid_select_process (Lisp_Process *proc);
+int event_stream_unixoid_unselect_process (Lisp_Process *proc);
+int read_event_from_tty_or_stream_desc (Lisp_Event *event,
struct console *con, int fd);
USID event_stream_unixoid_create_stream_pair (void* inhandle, void* outhandle,
Lisp_Object* instream,
#endif /* emacs */
-#endif /* _XEMACS_EVENTS_H_ */
+#endif /* INCLUDED_events_h_ */
allocate_extent_list (void)
{
Extent_List *el = xnew (Extent_List);
- el->start = make_gap_array (sizeof(EXTENT));
- el->end = make_gap_array (sizeof(EXTENT));
+ el->start = make_gap_array (sizeof (EXTENT));
+ el->end = make_gap_array (sizeof (EXTENT));
el->markers = 0;
return el;
}
static Lisp_Object extent_plist (Lisp_Object obj);
static const struct lrecord_description extent_description[] = {
- { XD_LISP_OBJECT, offsetof(struct extent, object), 2 },
- { XD_LISP_OBJECT, offsetof(struct extent, plist), 1 },
+ { XD_LISP_OBJECT, offsetof (struct extent, object) },
+ { XD_LISP_OBJECT, offsetof (struct extent, flags.face) },
+ { XD_LISP_OBJECT, offsetof (struct extent, plist) },
{ XD_END }
};
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_EXTENTS_H_
-#define _XEMACS_EXTENTS_H_
+#ifndef INCLUDED_extents_h_
+#define INCLUDED_extents_h_
DECLARE_LRECORD (extent, struct extent);
#define XEXTENT(x) XRECORD (x, extent, struct extent)
#endif /* emacs */
-#endif /* _XEMACS_EXTENTS_H_ */
+#endif /* INCLUDED_extents_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _EXTW_XLIB_H_
-#define _EXTW_XLIB_H_
+#ifndef INCLUDED_extw_Xlib_h_
+#define INCLUDED_extw_Xlib_h_
#define extw_shell_send 0
#define extw_client_send 1
void extw_send_notify_3(Display *display, Window win, en_extw_notify type,
long data0, long data1, long data2);
-#endif /* _EXTW_XLIB_H_ */
+#endif /* INCLUDED_extw_Xlib_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _EXTW_XT_H_
-#define _EXTW_XT_H_
+#ifndef INCLUDED_extw_Xt_h_
+#define INCLUDED_extw_Xt_h_
#include "extw-Xlib.h"
en_extw_notify type, unsigned long timeout);
-#endif /* _EXTW_XT_H_ */
+#endif /* INCLUDED_extw_Xt_h_ */
Lisp_Object Vleft_margin_face, Vright_margin_face, Vtext_cursor_face;
Lisp_Object Vpointer_face, Vvertical_divider_face, Vtoolbar_face, Vwidget_face;
-/* Qdefault, Qhighlight defined in general.c */
-Lisp_Object Qmodeline, Qgui_element, Qleft_margin, Qright_margin, Qtext_cursor;
-Lisp_Object Qvertical_divider;
+/* Qdefault, Qhighlight, Qleft_margin, Qright_margin defined in general.c */
+Lisp_Object Qmodeline, Qgui_element, Qtext_cursor, Qvertical_divider;
/* In the old implementation Vface_list was a list of the face names,
not the faces themselves. We now distinguish between permanent and
static Lisp_Object
mark_face (Lisp_Object obj)
{
- struct Lisp_Face *face = XFACE (obj);
+ Lisp_Face *face = XFACE (obj);
mark_object (face->name);
mark_object (face->doc_string);
static void
print_face (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Face *face = XFACE (obj);
+ Lisp_Face *face = XFACE (obj);
if (print_readably)
{
static int
face_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Face *f1 = XFACE (obj1);
- struct Lisp_Face *f2 = XFACE (obj2);
+ Lisp_Face *f1 = XFACE (obj1);
+ Lisp_Face *f2 = XFACE (obj2);
depth++;
static unsigned long
face_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Face *f = XFACE (obj);
+ Lisp_Face *f = XFACE (obj);
depth++;
static Lisp_Object
face_getprop (Lisp_Object obj, Lisp_Object prop)
{
- struct Lisp_Face *f = XFACE (obj);
+ Lisp_Face *f = XFACE (obj);
return
(EQ (prop, Qforeground) ? f->foreground :
static int
face_putprop (Lisp_Object obj, Lisp_Object prop, Lisp_Object value)
{
- struct Lisp_Face *f = XFACE (obj);
+ Lisp_Face *f = XFACE (obj);
if (EQ (prop, Qforeground) ||
EQ (prop, Qbackground) ||
static int
face_remprop (Lisp_Object obj, Lisp_Object prop)
{
- struct Lisp_Face *f = XFACE (obj);
+ Lisp_Face *f = XFACE (obj);
if (EQ (prop, Qforeground) ||
EQ (prop, Qbackground) ||
static Lisp_Object
face_plist (Lisp_Object obj)
{
- struct Lisp_Face *face = XFACE (obj);
+ Lisp_Face *face = XFACE (obj);
Lisp_Object result = face->plist;
result = cons3 (Qreverse, face->reverse, result);
}
static const struct lrecord_description face_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Face, name), 2 },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Face, foreground), 13 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, doc_string) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, foreground) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, background) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, font) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, display_table) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, background_pixmap) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, underline) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, strikethru) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, highlight) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, dim) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, blinking) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, reverse) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, plist) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Face, charsets_warned_about) },
{ XD_END }
};
mark_face, print_face, 0, face_equal,
face_hash, face_description, face_getprop,
face_putprop, face_remprop,
- face_plist, struct Lisp_Face);
+ face_plist, Lisp_Face);
\f
/************************************************************************/
/* face read syntax */
****************************************************************************/
static void
-reset_face (struct Lisp_Face *f)
+reset_face (Lisp_Face *f)
{
f->name = Qnil;
f->doc_string = Qnil;
f->charsets_warned_about = Qnil;
}
-static struct Lisp_Face *
+static Lisp_Face *
allocate_face (void)
{
- struct Lisp_Face *result =
- alloc_lcrecord_type (struct Lisp_Face, &lrecord_face);
+ Lisp_Face *result = alloc_lcrecord_type (Lisp_Face, &lrecord_face);
reset_face (result);
return result;
(name, doc_string, temporary))
{
/* This function can GC if initialized is non-zero */
- struct Lisp_Face *f;
+ Lisp_Face *f;
Lisp_Object face;
CHECK_SYMBOL (name);
{
Lisp_Object charset = CHARSET_BY_LEADING_BYTE (i + MIN_LEADING_BYTE);
Lisp_Object font_instance = FACE_CACHEL_FONT (cachel, charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_instance);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font_instance);
assert (CHARSETP (charset));
assert (FONT_INSTANCEP (font_instance));
*/
(old_face, new_name, locale, tag_set, exact_p, how_to_add))
{
- struct Lisp_Face *fold, *fnew;
+ Lisp_Face *fold, *fnew;
Lisp_Object new_face = Qnil;
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
void
syms_of_faces (void)
{
- /* Qdefault & Qwidget defined in general.c */
+ /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */
defsymbol (&Qmodeline, "modeline");
defsymbol (&Qgui_element, "gui-element");
- defsymbol (&Qleft_margin, "left-margin");
- defsymbol (&Qright_margin, "right-margin");
defsymbol (&Qtext_cursor, "text-cursor");
defsymbol (&Qvertical_divider, "vertical-divider");
bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
#endif
#ifdef HAVE_MS_WINDOWS
+ fg_fb = acons (list1 (Qmsprinter), build_string ("black"), fg_fb);
+ bg_fb = acons (list1 (Qmsprinter), build_string ("white"), bg_fb);
fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
bg_fb = acons (list1 (Qmswindows), build_string ("white"), bg_fb);
#endif
inst_list);
#endif /* HAVE_TTY */
#ifdef HAVE_MS_WINDOWS
+ /* Fixedsys does not exist for printers */
+ inst_list = Fcons (Fcons (list1 (Qmsprinter),
+ build_string ("Courier:Regular:10::Western")), inst_list);
+ inst_list = Fcons (Fcons (list1 (Qmsprinter),
+ build_string ("Courier New:Regular:10::Western")), inst_list);
+
inst_list = Fcons (Fcons (list1 (Qmswindows),
build_string ("Fixedsys:Regular:9::Western")), inst_list);
inst_list = Fcons (Fcons (list1 (Qmswindows),
bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
#endif
#ifdef HAVE_MS_WINDOWS
+ fg_fb = acons (list1 (Qmsprinter), build_string ("black"), fg_fb);
+ bg_fb = acons (list1 (Qmsprinter), build_string ("white"), bg_fb);
fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
bg_fb = acons (list1 (Qmswindows), build_string ("Gray75"), bg_fb);
#endif
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_FACES_H_
-#define _XEMACS_FACES_H_
+#ifndef INCLUDED_faces_h_
+#define INCLUDED_faces_h_
#include "buffer.h" /* for NUM_LEADING_BYTES */
-/* a struct Lisp_Face is the C object corresponding to a face. There
- is one of these per face. It basically contains all of the specifiers
- for the built-in face properties, plus the plist of user-specified
+/* a Lisp_Face is the C object corresponding to a face. There is one
+ of these per face. It basically contains all of the specifiers for
+ the built-in face properties, plus the plist of user-specified
properties. */
struct Lisp_Face
unsigned char font_updated[NUM_LEADING_BYTES];
};
-DECLARE_LRECORD (face, struct Lisp_Face);
-#define XFACE(x) XRECORD (x, face, struct Lisp_Face)
+DECLARE_LRECORD (face, Lisp_Face);
+#define XFACE(x) XRECORD (x, face, Lisp_Face)
#define XSETFACE(x, p) XSETRECORD (x, p, face)
#define FACEP(x) RECORDP (x, face)
#define CHECK_FACE(x) CHECK_RECORD (x, face)
FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero)
#define FACE_UNDERLINE_P(face, domain) \
(!NILP (FACE_PROPERTY_INSTANCE (face, Qunderline, domain, 0, Qzero)))
+#define FACE_STRIKETHRU_P(face, domain) \
+ (!NILP (FACE_PROPERTY_INSTANCE (face, Qstrikethru, domain, 0, Qzero)))
#define FACE_HIGHLIGHT_P(face, domain) \
(!NILP (FACE_PROPERTY_INSTANCE (face, Qhighlight, domain, 0, Qzero)))
#define FACE_DIM_P(face, domain) \
#define FACE_REVERSE_P(face, domain) \
(!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero)))
-#endif /* _XEMACS_FACES_H_ */
+#endif /* INCLUDED_faces_h_ */
#include "elhash.h"
#include "insdel.h"
#include "lstream.h"
+#include "opaque.h"
#ifdef MULE
#include "mule-ccl.h"
#include "chartab.h"
This describes a permutation of the possible coding categories. */
int coding_category_by_priority[CODING_CATEGORY_LAST + 1];
-#ifndef UTF2000
+#if defined(MULE) && !defined(UTF2000)
Lisp_Object ucs_to_mule_table[65536];
#endif
} *fcd;
static const struct lrecord_description fcd_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct file_coding_dump, coding_category_system), CODING_CATEGORY_LAST + 1 },
-#ifndef UTF2000
- { XD_LISP_OBJECT, offsetof(struct file_coding_dump, ucs_to_mule_table), 65536 },
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct file_coding_dump, coding_category_system), CODING_CATEGORY_LAST + 1 },
+#if defined(MULE) && !defined(UTF2000)
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct file_coding_dump, ucs_to_mule_table), 65536 },
#endif
{ XD_END }
};
static const struct struct_description fcd_description = {
- sizeof(struct file_coding_dump),
+ sizeof (struct file_coding_dump),
fcd_description_1
};
Lisp_Object Qforce_g2_on_output, Qforce_g3_on_output;
Lisp_Object Qno_iso6429;
Lisp_Object Qinput_charset_conversion, Qoutput_charset_conversion;
-Lisp_Object Qctext, Qescape_quoted;
+Lisp_Object Qescape_quoted;
Lisp_Object Qshort, Qno_ascii_eol, Qno_ascii_cntl, Qseven, Qlock_shift;
#endif
Lisp_Object Qencode, Qdecode;
} codesys_prop_dynarr;
static const struct lrecord_description codesys_prop_description_1[] = {
- { XD_LISP_OBJECT, offsetof(codesys_prop, sym), 1 },
+ { XD_LISP_OBJECT, offsetof (codesys_prop, sym) },
{ XD_END }
};
static const struct struct_description codesys_prop_description = {
- sizeof(codesys_prop),
+ sizeof (codesys_prop),
codesys_prop_description_1
};
static const struct lrecord_description codesys_prop_dynarr_description_1[] = {
- XD_DYNARR_DESC(codesys_prop_dynarr, &codesys_prop_description),
+ XD_DYNARR_DESC (codesys_prop_dynarr, &codesys_prop_description),
{ XD_END }
};
static const struct struct_description codesys_prop_dynarr_description = {
- sizeof(codesys_prop_dynarr),
+ sizeof (codesys_prop_dynarr),
codesys_prop_dynarr_description_1
};
#ifdef MULE
static const struct lrecord_description ccs_description_1[] = {
- { XD_LISP_OBJECT, offsetof(charset_conversion_spec, from_charset), 2 },
+ { XD_LISP_OBJECT, offsetof (charset_conversion_spec, from_charset) },
+ { XD_LISP_OBJECT, offsetof (charset_conversion_spec, to_charset) },
{ XD_END }
};
static const struct struct_description ccs_description = {
- sizeof(charset_conversion_spec),
+ sizeof (charset_conversion_spec),
ccs_description_1
};
static const struct lrecord_description ccsd_description_1[] = {
- XD_DYNARR_DESC(charset_conversion_spec_dynarr, &ccs_description),
+ XD_DYNARR_DESC (charset_conversion_spec_dynarr, &ccs_description),
{ XD_END }
};
static const struct struct_description ccsd_description = {
- sizeof(charset_conversion_spec_dynarr),
+ sizeof (charset_conversion_spec_dynarr),
ccsd_description_1
};
#endif
static const struct lrecord_description coding_system_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, name), 2 },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, mnemonic), 3 },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, eol_lf), 3 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, doc_string) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, mnemonic) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, post_read_conversion) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, pre_write_conversion) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, eol_lf) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, eol_crlf) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, eol_cr) },
#ifdef MULE
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, iso2022.initial_charset), 4 },
- { XD_STRUCT_PTR, offsetof(struct Lisp_Coding_System, iso2022.input_conv), 1, &ccsd_description },
- { XD_STRUCT_PTR, offsetof(struct Lisp_Coding_System, iso2022.output_conv), 1, &ccsd_description },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, ccl.decode), 2 },
+ { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Coding_System, iso2022.initial_charset), 4 },
+ { XD_STRUCT_PTR, offsetof (Lisp_Coding_System, iso2022.input_conv), 1, &ccsd_description },
+ { XD_STRUCT_PTR, offsetof (Lisp_Coding_System, iso2022.output_conv), 1, &ccsd_description },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, ccl.decode) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, ccl.encode) },
#endif
{ XD_END }
};
mark_coding_system, print_coding_system,
finalize_coding_system,
0, 0, coding_system_description,
- struct Lisp_Coding_System);
+ Lisp_Coding_System);
static Lisp_Object
mark_coding_system (Lisp_Object obj)
*/
(coding_system_or_name))
{
- if (CODING_SYSTEMP (coding_system_or_name))
- return coding_system_or_name;
-
if (NILP (coding_system_or_name))
coding_system_or_name = Qbinary;
+ else if (CODING_SYSTEMP (coding_system_or_name))
+ return coding_system_or_name;
else
CHECK_SYMBOL (coding_system_or_name);
- return Fgethash (coding_system_or_name, Vcoding_system_hash_table, Qnil);
+ while (1)
+ {
+ coding_system_or_name =
+ Fgethash (coding_system_or_name, Vcoding_system_hash_table, Qnil);
+
+ if (CODING_SYSTEMP (coding_system_or_name) || NILP (coding_system_or_name))
+ return coding_system_or_name;
+ }
}
DEFUN ("get-coding-system", Fget_coding_system, 1, 1, 0, /*
return new_coding_system;
}
+DEFUN ("coding-system-canonical-name-p", Fcoding_system_canonical_name_p, 1, 1, 0, /*
+Return t if OBJECT names a coding system, and is not a coding system alias.
+*/
+ (object))
+{
+ return CODING_SYSTEMP (Fgethash (object, Vcoding_system_hash_table, Qnil))
+ ? Qt : Qnil;
+}
+
+DEFUN ("coding-system-alias-p", Fcoding_system_alias_p, 1, 1, 0, /*
+Return t if OBJECT is a coding system alias.
+All coding system aliases are created by `define-coding-system-alias'.
+*/
+ (object))
+{
+ return SYMBOLP (Fgethash (object, Vcoding_system_hash_table, Qzero))
+ ? Qt : Qnil;
+}
+
+DEFUN ("coding-system-aliasee", Fcoding_system_aliasee, 1, 1, 0, /*
+Return the coding-system symbol for which symbol ALIAS is an alias.
+*/
+ (alias))
+{
+ Lisp_Object aliasee = Fgethash (alias, Vcoding_system_hash_table, Qnil);
+ if (SYMBOLP (aliasee))
+ return aliasee;
+ else
+ signal_simple_error ("Symbol is not a coding system alias", alias);
+}
+
+static Lisp_Object
+append_suffix_to_symbol (Lisp_Object symbol, const char *ascii_string)
+{
+ return Fintern (concat2 (Fsymbol_name (symbol), build_string (ascii_string)),
+ Qnil);
+}
+
+/* A maphash function, for removing dangling coding system aliases. */
+static int
+dangling_coding_system_alias_p (Lisp_Object alias,
+ Lisp_Object aliasee,
+ void *dangling_aliases)
+{
+ if (SYMBOLP (aliasee)
+ && NILP (Fgethash (aliasee, Vcoding_system_hash_table, Qnil)))
+ {
+ (*(int *) dangling_aliases)++;
+ return 1;
+ }
+ else
+ return 0;
+}
+
DEFUN ("define-coding-system-alias", Fdefine_coding_system_alias, 2, 2, 0, /*
-Define symbol ALIAS as an alias for coding system CODING-SYSTEM.
+Define symbol ALIAS as an alias for coding system ALIASEE.
+
+You can use this function to redefine an alias that has already been defined,
+but you cannot redefine a name which is the canonical name for a coding system.
+\(a canonical name of a coding system is what is returned when you call
+`coding-system-name' on a coding system).
+
+ALIASEE itself can be an alias, which allows you to define nested aliases.
+
+You are forbidden, however, from creating alias loops or `dangling' aliases.
+These will be detected, and an error will be signaled if you attempt to do so.
+
+If ALIASEE is nil, then ALIAS will simply be undefined.
+
+See also `coding-system-alias-p', `coding-system-aliasee',
+and `coding-system-canonical-name-p'.
*/
- (alias, coding_system))
+ (alias, aliasee))
{
+ Lisp_Object real_coding_system, probe;
+
CHECK_SYMBOL (alias);
- if (!NILP (Ffind_coding_system (alias)))
- signal_simple_error ("Symbol already names a coding system", alias);
- coding_system = Fget_coding_system (coding_system);
- Fputhash (alias, coding_system, Vcoding_system_hash_table);
- /* Set up aliases for subsidiaries. */
- if (XCODING_SYSTEM_EOL_TYPE (coding_system) == EOL_AUTODETECT)
+ if (!NILP (Fcoding_system_canonical_name_p (alias)))
+ signal_simple_error
+ ("Symbol is the canonical name of a coding system and cannot be redefined",
+ alias);
+
+ if (NILP (aliasee))
{
- Lisp_Object str;
- XSETSTRING (str, symbol_name (XSYMBOL (alias)));
-#define FROB(type, name) \
- do { \
- Lisp_Object subsidiary = XCODING_SYSTEM_EOL_##type (coding_system); \
- if (!NILP (subsidiary)) \
- Fdefine_coding_system_alias \
- (Fintern (concat2 (str, build_string (name)), Qnil), subsidiary); \
- } while (0)
- FROB (LF, "-unix");
- FROB (CRLF, "-dos");
- FROB (CR, "-mac");
-#undef FROB
+ Lisp_Object subsidiary_unix = append_suffix_to_symbol (alias, "-unix");
+ Lisp_Object subsidiary_dos = append_suffix_to_symbol (alias, "-dos");
+ Lisp_Object subsidiary_mac = append_suffix_to_symbol (alias, "-mac");
+
+ Fremhash (alias, Vcoding_system_hash_table);
+
+ /* Undefine subsidiary aliases,
+ presumably created by a previous call to this function */
+ if (! NILP (Fcoding_system_alias_p (subsidiary_unix)) &&
+ ! NILP (Fcoding_system_alias_p (subsidiary_dos)) &&
+ ! NILP (Fcoding_system_alias_p (subsidiary_mac)))
+ {
+ Fdefine_coding_system_alias (subsidiary_unix, Qnil);
+ Fdefine_coding_system_alias (subsidiary_dos, Qnil);
+ Fdefine_coding_system_alias (subsidiary_mac, Qnil);
+ }
+
+ /* Undefine dangling coding system aliases. */
+ {
+ int dangling_aliases;
+
+ do {
+ dangling_aliases = 0;
+ elisp_map_remhash (dangling_coding_system_alias_p,
+ Vcoding_system_hash_table,
+ &dangling_aliases);
+ } while (dangling_aliases > 0);
+ }
+
+ return Qnil;
}
+
+ if (CODING_SYSTEMP (aliasee))
+ aliasee = XCODING_SYSTEM_NAME (aliasee);
+
+ /* Checks that aliasee names a coding-system */
+ real_coding_system = Fget_coding_system (aliasee);
+
+ /* Check for coding system alias loops */
+ if (EQ (alias, aliasee))
+ alias_loop: signal_simple_error_2
+ ("Attempt to create a coding system alias loop", alias, aliasee);
+
+ for (probe = aliasee;
+ SYMBOLP (probe);
+ probe = Fgethash (probe, Vcoding_system_hash_table, Qzero))
+ {
+ if (EQ (probe, alias))
+ goto alias_loop;
+ }
+
+ Fputhash (alias, aliasee, Vcoding_system_hash_table);
+
+ /* Set up aliases for subsidiaries.
+ #### There must be a better way to handle subsidiary coding systems. */
+ {
+ static const char *suffixes[] = { "-unix", "-dos", "-mac" };
+ int i;
+ for (i = 0; i < countof (suffixes); i++)
+ {
+ Lisp_Object alias_subsidiary =
+ append_suffix_to_symbol (alias, suffixes[i]);
+ Lisp_Object aliasee_subsidiary =
+ append_suffix_to_symbol (aliasee, suffixes[i]);
+
+ if (! NILP (Ffind_coding_system (aliasee_subsidiary)))
+ Fdefine_coding_system_alias (alias_subsidiary, aliasee_subsidiary);
+ }
+ }
/* FSF return value is a vector of [ALIAS-unix ALIAS-dos ALIAS-mac],
but it doesn't look intentional, so I'd rather return something
meaningful or nothing at all. */
}
\f
-/************************************************************************/
-/* Simple internal/external functions */
-/************************************************************************/
-
-static Extbyte_dynarr *conversion_out_dynarr;
-static Bufbyte_dynarr *conversion_in_dynarr;
-
-/* Determine coding system from coding format */
-
-/* #### not correct for all values of `fmt'! */
-static Lisp_Object
-external_data_format_to_coding_system (enum external_data_format fmt)
-{
- switch (fmt)
- {
- case FORMAT_FILENAME:
- case FORMAT_TERMINAL:
- if (EQ (Vfile_name_coding_system, Qnil) ||
- EQ (Vfile_name_coding_system, Qbinary))
- return Qnil;
- else
- return Fget_coding_system (Vfile_name_coding_system);
-#ifdef MULE
- case FORMAT_CTEXT:
- return Fget_coding_system (Qctext);
-#endif
- default:
- return Qnil;
- }
-}
-
-Extbyte *
-convert_to_external_format (CONST Bufbyte *ptr,
- Bytecount len,
- Extcount *len_out,
- enum external_data_format fmt)
-{
- Lisp_Object coding_system = external_data_format_to_coding_system (fmt);
-
- if (!conversion_out_dynarr)
- conversion_out_dynarr = Dynarr_new (Extbyte);
- else
- Dynarr_reset (conversion_out_dynarr);
-
- if (NILP (coding_system))
- {
- CONST Bufbyte *end = ptr + len;
-
- for (; ptr < end;)
- {
-#ifdef UTF2000
- Bufbyte c =
- (*ptr < 0xc0) ? *ptr :
- ((*ptr & 0x1f) << 6) | (*(ptr+1) & 0x3f);
-#else
- Bufbyte c =
- (BYTE_ASCII_P (*ptr)) ? *ptr :
- (*ptr == LEADING_BYTE_CONTROL_1) ? (*(ptr+1) - 0x20) :
- (*ptr == LEADING_BYTE_LATIN_ISO8859_1) ? (*(ptr+1)) :
- '~';
-#endif
- Dynarr_add (conversion_out_dynarr, (Extbyte) c);
- INC_CHARPTR (ptr);
- }
-#ifdef ERROR_CHECK_BUFPOS
- assert (ptr == end);
-#endif
- }
- else
- {
- Lisp_Object instream, outstream, da_outstream;
- Lstream *istr, *ostr;
- struct gcpro gcpro1, gcpro2, gcpro3;
- char tempbuf[1024]; /* some random amount */
-
- instream = make_fixed_buffer_input_stream ((unsigned char *) ptr, len);
- da_outstream = make_dynarr_output_stream
- ((unsigned_char_dynarr *) conversion_out_dynarr);
- outstream =
- make_encoding_output_stream (XLSTREAM (da_outstream), coding_system);
- istr = XLSTREAM (instream);
- ostr = XLSTREAM (outstream);
- GCPRO3 (instream, outstream, da_outstream);
- while (1)
- {
- ssize_t size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
- if (!size_in_bytes)
- break;
- Lstream_write (ostr, tempbuf, size_in_bytes);
- }
- Lstream_close (istr);
- Lstream_close (ostr);
- UNGCPRO;
- Lstream_delete (istr);
- Lstream_delete (ostr);
- Lstream_delete (XLSTREAM (da_outstream));
- }
-
- *len_out = Dynarr_length (conversion_out_dynarr);
- Dynarr_add (conversion_out_dynarr, 0); /* remember to zero-terminate! */
- return Dynarr_atp (conversion_out_dynarr, 0);
-}
-
-Bufbyte *
-convert_from_external_format (CONST Extbyte *ptr,
- Extcount len,
- Bytecount *len_out,
- enum external_data_format fmt)
-{
- Lisp_Object coding_system = external_data_format_to_coding_system (fmt);
-
- if (!conversion_in_dynarr)
- conversion_in_dynarr = Dynarr_new (Bufbyte);
- else
- Dynarr_reset (conversion_in_dynarr);
-
- if (NILP (coding_system))
- {
- CONST Extbyte *end = ptr + len;
- for (; ptr < end; ptr++)
- {
- Extbyte c = *ptr;
- DECODE_ADD_BINARY_CHAR (c, conversion_in_dynarr);
- }
- }
- else
- {
- Lisp_Object instream, outstream, da_outstream;
- Lstream *istr, *ostr;
- struct gcpro gcpro1, gcpro2, gcpro3;
- char tempbuf[1024]; /* some random amount */
-
- instream = make_fixed_buffer_input_stream ((unsigned char *) ptr, len);
- da_outstream = make_dynarr_output_stream
- ((unsigned_char_dynarr *) conversion_in_dynarr);
- outstream =
- make_decoding_output_stream (XLSTREAM (da_outstream), coding_system);
- istr = XLSTREAM (instream);
- ostr = XLSTREAM (outstream);
- GCPRO3 (instream, outstream, da_outstream);
- while (1)
- {
- ssize_t size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
- if (!size_in_bytes)
- break;
- Lstream_write (ostr, tempbuf, size_in_bytes);
- }
- Lstream_close (istr);
- Lstream_close (ostr);
- UNGCPRO;
- Lstream_delete (istr);
- Lstream_delete (ostr);
- Lstream_delete (XLSTREAM (da_outstream));
- }
-
- *len_out = Dynarr_length (conversion_in_dynarr);
- Dynarr_add (conversion_in_dynarr, 0); /* remember to zero-terminate! */
- return Dynarr_atp (conversion_in_dynarr, 0);
-}
-
-\f
/************************************************************************/
/* Initialization */
/************************************************************************/
DEFSUBR (Fcoding_system_name);
DEFSUBR (Fmake_coding_system);
DEFSUBR (Fcopy_coding_system);
+ DEFSUBR (Fcoding_system_canonical_name_p);
+ DEFSUBR (Fcoding_system_alias_p);
+ DEFSUBR (Fcoding_system_aliasee);
DEFSUBR (Fdefine_coding_system_alias);
DEFSUBR (Fsubsidiary_coding_system);
defsymbol (&Qdecode, "decode");
#ifdef MULE
- defsymbol (&Qctext, "ctext");
defsymbol (&coding_category_symbol[CODING_CATEGORY_SHIFT_JIS],
"shift-jis");
defsymbol (&coding_category_symbol[CODING_CATEGORY_BIG5],
Vterminal_coding_system = Qnil;
DEFVAR_LISP ("coding-system-for-read", &Vcoding_system_for_read /*
-Overriding coding system used when writing a file or process.
-You should *bind* this, not set it. If this is non-nil, it specifies
-the coding system that will be used when a file or process is read
-in, and overrides `buffer-file-coding-system-for-read',
+Overriding coding system used when reading from a file or process.
+You should bind this variable with `let', but do not set it globally.
+If this is non-nil, it specifies the coding system that will be used
+to decode input on read operations, such as from a file or process.
+It overrides `buffer-file-coding-system-for-read',
`insert-file-contents-pre-hook', etc. Use those variables instead of
-this one for permanent changes to the environment.
-*/ );
+this one for permanent changes to the environment. */ );
Vcoding_system_for_read = Qnil;
DEFVAR_LISP ("coding-system-for-write",
&Vcoding_system_for_write /*
-Overriding coding system used when writing a file or process.
-You should *bind* this, not set it. If this is non-nil, it specifies
-the coding system that will be used when a file or process is wrote
-in, and overrides `buffer-file-coding-system',
-`write-region-pre-hook', etc. Use those variables instead of this one
-for permanent changes to the environment.
-*/ );
+Overriding coding system used when writing to a file or process.
+You should bind this variable with `let', but do not set it globally.
+If this is non-nil, it specifies the coding system that will be used
+to encode output for write operations, such as to a file or process.
+It overrides `buffer-file-coding-system', `write-region-pre-hook', etc.
+Use those variables instead of this one for permanent changes to the
+environment. */ );
Vcoding_system_for_write = Qnil;
DEFVAR_LISP ("file-name-coding-system", &Vfile_name_coding_system /*
Fdefine_coding_system_alias (Qno_conversion, Qraw_text);
+ Fdefine_coding_system_alias (Qfile_name, Qbinary);
+
+ Fdefine_coding_system_alias (Qterminal, Qbinary);
+ Fdefine_coding_system_alias (Qkeyboard, Qbinary);
+
/* Need this for bootstrapping */
fcd->coding_category_system[CODING_CATEGORY_NO_CONVERSION] =
Fget_coding_system (Qraw_text);
}
staticpro (&mule_to_ucs_table);
mule_to_ucs_table = Fmake_char_table(Qgeneric);
-#endif /* MULE */
+#endif /* defined(MULE) && !defined(UTF2000) */
}
/* 91.10.09 written by K.Handa <handa@etl.go.jp> */
/* Rewritten by Ben Wing <ben@xemacs.org>. */
-#ifndef _XEMACS_MULE_CODING_H_
-#define _XEMACS_MULE_CODING_H_
+#ifndef INCLUDED_file_coding_h_
+#define INCLUDED_file_coding_h_
struct decoding_stream;
struct encoding_stream;
/* Coding system types. These go into the TYPE field of a
- struct Lisp_Coding_System. */
+ Lisp_Coding_System. */
enum coding_system_type
{
struct lcrecord_header header;
/* Name and doc string of this coding system. */
- Lisp_Object name, doc_string;
+ Lisp_Object name;
+ Lisp_Object doc_string;
/* This is the major type of the coding system -- one of Big5, ISO2022,
Shift-JIS, etc. See the constants above. */
system is active for a particular buffer. */
Lisp_Object mnemonic;
- Lisp_Object post_read_conversion, pre_write_conversion;
+ Lisp_Object post_read_conversion;
+ Lisp_Object pre_write_conversion;
eol_type_t eol_type;
/* Subsidiary coding systems that specify a particular type of EOL
marking, rather than autodetecting it. These will only be non-nil
if (eol_type == EOL_AUTODETECT). */
- Lisp_Object eol_lf, eol_crlf, eol_cr;
+ Lisp_Object eol_lf;
+ Lisp_Object eol_crlf;
+ Lisp_Object eol_cr;
#ifdef MULE
struct
{
{
/* For a CCL coding system, these specify the CCL programs used for
decoding (input) and encoding (output). */
- Lisp_Object decode, encode;
+ Lisp_Object decode;
+ Lisp_Object encode;
} ccl;
#endif
#ifdef UTF2000
};
typedef struct Lisp_Coding_System Lisp_Coding_System;
-DECLARE_LRECORD (coding_system, struct Lisp_Coding_System);
-#define XCODING_SYSTEM(x) XRECORD (x, coding_system, struct Lisp_Coding_System)
+DECLARE_LRECORD (coding_system, Lisp_Coding_System);
+#define XCODING_SYSTEM(x) XRECORD (x, coding_system, Lisp_Coding_System)
#define XSETCODING_SYSTEM(x, p) XSETRECORD (x, p, coding_system)
#define CODING_SYSTEMP(x) RECORDP (x, coding_system)
#define CHECK_CODING_SYSTEM(x) CHECK_RECORD (x, coding_system)
extern Lisp_Object Qucs4, Qutf8;
extern Lisp_Object Qbig5, Qccl, Qcharset_g0;
extern Lisp_Object Qcharset_g1, Qcharset_g2, Qcharset_g3, Qcoding_system_error;
-extern Lisp_Object Qcoding_systemp, Qcr, Qcrlf, Qctext, Qdecode, Qencode;
+extern Lisp_Object Qcoding_systemp, Qcr, Qcrlf, Qdecode, Qencode;
extern Lisp_Object Qeol_cr, Qeol_crlf, Qeol_lf, Qeol_type, Qescape_quoted;
extern Lisp_Object Qforce_g0_on_output, Qforce_g1_on_output;
extern Lisp_Object Qforce_g2_on_output, Qforce_g3_on_output;
#define BUFBYTE_FIRST_BYTE_P(c) ((c) < 0xA0)
#define BUFBYTE_LEADING_BYTE_P(c) BYTE_C1_P (c)
#endif /* not MULE */
-#endif /* _XEMACS_MULE_CODING_H_ */
+
+#endif /* INCLUDED_file_coding_h_ */
#ifdef WINDOWSNT
#define NOMINMAX 1
-#include <windows.h>
#include <direct.h>
#include <fcntl.h>
#include <stdlib.h>
Lisp_Object
lisp_strerror (int errnum)
{
- return build_ext_string (strerror (errnum), FORMAT_NATIVE);
+ return build_ext_string (strerror (errnum), Qnative);
}
static Lisp_Object
static int
directory_file_name (CONST char *src, char *dst)
{
- long slen;
-
- slen = strlen (src);
+ long slen = strlen (src);
/* Process as Unix format: just remove any final slash.
But leave "/" unchanged; do not change it to "". */
strcpy (dst, src);
-#ifdef APOLLO
- /* Handle // as root for apollo's. */
- if ((slen > 2 && dst[slen - 1] == '/')
- || (slen > 1 && dst[0] != '/' && dst[slen - 1] == '/'))
- dst[slen - 1] = 0;
-#else
if (slen > 1
&& IS_DIRECTORY_SEP (dst[slen - 1])
#ifdef WINDOWSNT
#endif /* WINDOWSNT */
)
dst[slen - 1] = 0;
-#endif /* APOLLO */
return 1;
}
if (IS_DIRECTORY_SEP (nm[1])
|| nm[1] == 0) /* ~ by itself */
{
- char * newdir_external = get_home_directory ();
+ Extbyte *newdir_external = get_home_directory ();
if (newdir_external == NULL)
newdir = (Bufbyte *) "";
else
- GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (newdir_external, newdir);
+ TO_INTERNAL_FORMAT (C_STRING, newdir_external,
+ C_STRING_ALLOCA, (* ((char **) &newdir)),
+ Qfile_name);
nm++;
#ifdef WINDOWSNT
char resolved_path[MAXPATHLEN];
Extbyte *path;
Extbyte *p;
- Extcount elen = XSTRING_LENGTH (expanded_name);
+ Extcount elen;
- GET_STRING_FILENAME_DATA_ALLOCA (expanded_name,path,elen);
+ TO_EXTERNAL_FORMAT (LISP_STRING, expanded_name,
+ ALLOCA, (path, elen),
+ Qfile_name);
p = path;
if (elen > MAXPATHLEN)
goto toolong;
resolved_path[rlen + 1] = 0;
rlen = rlen + 1;
}
- return make_ext_string ((Bufbyte *) resolved_path, rlen, FORMAT_BINARY);
+ return make_ext_string ((Bufbyte *) resolved_path, rlen, Qbinary);
}
toolong:
for (p = nm; p != endp; p++)
{
if ((p[0] == '~'
-#if defined (APOLLO) || defined (WINDOWSNT) || defined (__CYGWIN32__)
- /* // at start of file name is meaningful in Apollo and
- WindowsNT systems */
+#if defined (WINDOWSNT) || defined (__CYGWIN32__)
+ /* // at start of file name is meaningful in WindowsNT systems */
|| (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)
-#else /* not (APOLLO || WINDOWSNT || __CYGWIN32__) */
+#else /* not (WINDOWSNT || __CYGWIN32__) */
|| IS_DIRECTORY_SEP (p[0])
-#endif /* not (APOLLO || WINDOWSNT || __CYGWIN32__) */
+#endif /* not (WINDOWSNT || __CYGWIN32__) */
)
&& p != nm
&& (IS_DIRECTORY_SEP (p[-1])))
for (p = xnm; p != x; p++)
if ((p[0] == '~'
-#if defined (APOLLO) || defined (WINDOWSNT)
+#if defined (WINDOWSNT)
|| (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)
-#else /* not (APOLLO || WINDOWSNT) */
+#else /* not WINDOWSNT */
|| IS_DIRECTORY_SEP (p[0])
-#endif /* APOLLO || WINDOWSNT */
+#endif /* not WINDOWSNT */
)
/* don't do p[-1] if that would go off the beginning --jwz */
&& p != nm && p > xnm && IS_DIRECTORY_SEP (p[-1]))
(path, login))
{
int netresult;
+ const char *path_ext;
+ const char *login_ext;
CHECK_STRING (path);
CHECK_STRING (login);
/* netunam, being a strange-o system call only used once, is not
encapsulated. */
- {
- char *path_ext;
- char *login_ext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (path, path_ext);
- GET_C_STRING_EXT_DATA_ALLOCA (login, FORMAT_OS, login_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, path, C_STRING_ALLOCA, path_ext, Qfile_name);
+ TO_EXTERNAL_FORMAT (LISP_STRING, login, C_STRING_ALLOCA, login_ext, Qnative);
- netresult = netunam (path_ext, login_ext);
- }
+ netresult = netunam (path_ext, login_ext);
- if (netresult == -1)
- return Qnil;
- else
- return Qt;
+ return netresult == -1 ? Qnil : Qt;
}
#endif /* HPUX_NET */
\f
fd = -1;
- if (
-#ifndef APOLLO
- (stat ((char *) XSTRING_DATA (filename), &st) < 0)
-#else /* APOLLO */
- /* Don't even bother with interruptible_open. APOLLO sucks. */
- ((fd = open ((char *) XSTRING_DATA (filename), O_RDONLY | OPEN_BINARY, 0)) < 0
- || fstat (fd, &st) < 0)
-#endif /* APOLLO */
- )
+ if (stat ((char *) XSTRING_DATA (filename), &st) < 0)
{
if (fd >= 0) close (fd);
badopen:
{
if (!EQ (buf->undo_list, Qt))
buf->undo_list = Qnil;
-#ifdef APOLLO
- stat ((char *) XSTRING_DATA (filename), &st);
-#endif
if (NILP (handler))
{
buf->modtime = st.st_mtime;
}
#endif /* HAVE_FSYNC */
- /* Spurious "file has changed on disk" warnings have been
- observed on Suns as well.
- It seems that `close' can change the modtime, under nfs.
-
- (This has supposedly been fixed in Sunos 4,
- but who knows about all the other machines with NFS?) */
- /* On VMS and APOLLO, must do the stat after the close
- since closing changes the modtime. */
- /* As it does on Windows too - kkm */
- /* The spurious warnings appear on Linux too. Rather than handling
- this on a per-system basis, unconditionally do the stat after the close - cgw */
-
-#if 0 /* !defined (WINDOWSNT) */ /* !defined (VMS) && !defined (APOLLO) */
- fstat (desc, &st);
-#endif
+ /* Spurious "file has changed on disk" warnings used to be seen on
+ systems where close() can change the modtime. This is known to
+ happen on various NFS file systems, on Windows, and on Linux.
+ Rather than handling this on a per-system basis, we
+ unconditionally do the stat() after the close(). */
/* NFS can report a write failure now. */
if (close (desc) < 0)
unbind_to (speccount, Qnil);
}
- /* # if defined (WINDOWSNT) */ /* defined (VMS) || defined (APOLLO) */
stat ((char *) XSTRING_DATA (fn), &st);
- /* #endif */
#ifdef CLASH_DETECTION
if (!auto_saving)
CONST Extbyte *auto_save_file_name_ext;
Extcount auto_save_file_name_ext_len;
- GET_STRING_FILENAME_DATA_ALLOCA
- (b->auto_save_file_name,
- auto_save_file_name_ext,
- auto_save_file_name_ext_len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, b->auto_save_file_name,
+ ALLOCA, (auto_save_file_name_ext,
+ auto_save_file_name_ext_len),
+ Qfile_name);
if (!NILP (b->filename))
{
CONST Extbyte *filename_ext;
Extcount filename_ext_len;
- GET_STRING_FILENAME_DATA_ALLOCA (b->filename,
- filename_ext,
- filename_ext_len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, b->filename,
+ ALLOCA, (filename_ext,
+ filename_ext_len),
+ Qfile_name);
write (listdesc, filename_ext, filename_ext_len);
}
write (listdesc, "\n", 1);
DEFINE_BASIC_LRECORD_IMPLEMENTATION ("float", float,
mark_float, print_float, 0, float_equal,
float_hash, float_description,
- struct Lisp_Float);
+ Lisp_Float);
\f
/* Extract a Lisp number as a `double', or signal an error. */
print_bit_vector (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
size_t i;
- struct Lisp_Bit_Vector *v = XBIT_VECTOR (obj);
+ Lisp_Bit_Vector *v = XBIT_VECTOR (obj);
size_t len = bit_vector_length (v);
size_t last = len;
static int
bit_vector_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Bit_Vector *v1 = XBIT_VECTOR (obj1);
- struct Lisp_Bit_Vector *v2 = XBIT_VECTOR (obj2);
+ Lisp_Bit_Vector *v1 = XBIT_VECTOR (obj1);
+ Lisp_Bit_Vector *v2 = XBIT_VECTOR (obj2);
return ((bit_vector_length (v1) == bit_vector_length (v2)) &&
!memcmp (v1->bits, v2->bits,
static unsigned long
bit_vector_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Bit_Vector *v = XBIT_VECTOR (obj);
+ Lisp_Bit_Vector *v = XBIT_VECTOR (obj);
return HASH2 (bit_vector_length (v),
memory_hash (v->bits,
BIT_VECTOR_LONG_STORAGE (bit_vector_length (v)) *
}
static const struct lrecord_description bit_vector_description[] = {
- { XD_LISP_OBJECT, offsetof(Lisp_Bit_Vector, next), 1 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Bit_Vector, next) },
{ XD_END }
};
mark_bit_vector, print_bit_vector, 0,
bit_vector_equal, bit_vector_hash,
bit_vector_description,
- struct Lisp_Bit_Vector);
+ Lisp_Bit_Vector);
\f
DEFUN ("identity", Fidentity, 1, 1, 0, /*
Return the argument unchanged.
return XINT (Flength (seq));
else
{
- struct Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (seq);
+ Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (seq);
return (f->flags.interactivep ? COMPILED_INTERACTIVE :
f->flags.domainp ? COMPILED_DOMAIN :
(s1, s2))
{
Bytecount len;
- struct Lisp_String *p1, *p2;
+ Lisp_String *p1, *p2;
if (SYMBOLP (s1))
p1 = XSYMBOL (s1)->name;
*/
(s1, s2))
{
- struct Lisp_String *p1, *p2;
+ Lisp_String *p1, *p2;
Charcount end, len2;
int i;
*/
(string))
{
- struct Lisp_String *s;
+ Lisp_String *s;
CHECK_STRING (string);
s = XSTRING (string);
void
bump_string_modiff (Lisp_Object str)
{
- struct Lisp_String *s = XSTRING (str);
+ Lisp_String *s = XSTRING (str);
Lisp_Object *ptr = &s->plist;
#ifdef I18N3
static Lisp_Object *
-string_plist_ptr (struct Lisp_String *s)
+string_plist_ptr (Lisp_String *s)
{
Lisp_Object *ptr = &s->plist;
}
static Lisp_Object
-string_getprop (struct Lisp_String *s, Lisp_Object property,
+string_getprop (Lisp_String *s, Lisp_Object property,
Lisp_Object default_)
{
Lisp_Object val = external_plist_get (string_plist_ptr (s), property, 0,
}
static void
-string_putprop (struct Lisp_String *s, Lisp_Object property,
+string_putprop (Lisp_String *s, Lisp_Object property,
Lisp_Object value)
{
external_plist_put (string_plist_ptr (s), property, value, 0, ERROR_ME);
}
static int
-string_remprop (struct Lisp_String *s, Lisp_Object property)
+string_remprop (Lisp_String *s, Lisp_Object property)
{
return external_remprop (string_plist_ptr (s), property, 0, ERROR_ME);
}
static Lisp_Object
-string_plist (struct Lisp_String *s)
+string_plist (Lisp_String *s)
{
return *string_plist_ptr (s);
}
retry:
if (STRINGP (array))
{
- struct Lisp_String *s = XSTRING (array);
+ Lisp_String *s = XSTRING (array);
Bytecount old_bytecount = string_length (s);
Bytecount new_bytecount;
Bytecount item_bytecount;
}
else if (BIT_VECTORP (array))
{
- struct Lisp_Bit_Vector *v = XBIT_VECTOR (array);
+ Lisp_Bit_Vector *v = XBIT_VECTOR (array);
int len = bit_vector_length (v);
int bit;
CHECK_BIT (item);
}
else if (BIT_VECTORP (sequence))
{
- struct Lisp_Bit_Vector *v = XBIT_VECTOR (sequence);
+ Lisp_Bit_Vector *v = XBIT_VECTOR (sequence);
for (i = 0; i < leni; i++)
{
args[1] = make_int (bit_vector_bit (v, i));
find_context (struct buffer *buf, Bufpos pt)
{
/* This function can GC */
- struct Lisp_Char_Table *mirrortab =
- XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
Lisp_Object syntaxtab = buf->syntax_table;
Emchar prev_c, c;
Bufpos target = pt;
/* Default properties to use when creating frames. */
Lisp_Object Vdefault_mswindows_frame_plist;
+Lisp_Object Vdefault_msprinter_frame_plist;
Lisp_Object Vmswindows_use_system_frame_size_defaults;
/* This does not need to be GC protected, as it holds a
frame Lisp_Object already protected by Fmake_frame */
Lisp_Object Vmswindows_frame_being_created;
+/*---------------------------------------------------------------------*/
+/*----- DISPLAY FRAME -----*/
+/*---------------------------------------------------------------------*/
+
static void
mswindows_init_frame_1 (struct frame *f, Lisp_Object props)
{
bugs (and is more consistent with X) so I am going to reenable it.
--andyp */
if ( FRAME_PIXWIDTH (f) && FRAME_PIXHEIGHT (f)
- && (width_specified_p || height_specified_p || x_specified_p || y_specified_p))
+ && (width_specified_p || height_specified_p
+ || x_specified_p || y_specified_p))
{
XEMACS_RECT_WH dest = { x, y, width, height };
return IsZoomed (FRAME_MSWINDOWS_HANDLE (f));
}
+/*---------------------------------------------------------------------*/
+/*----- PRINTER FRAME -----*/
+/*---------------------------------------------------------------------*/
+
+EXFUN (Fset_frame_properties, 2);
+
+static void
+error_frame_unsizable (struct frame *f)
+{
+ Lisp_Object frame;
+ XSETFRAME (frame, f);
+ signal_simple_error ("Cannot resize frame (margins)"
+ " after print job has started.", frame);
+}
+
+static void
+maybe_error_if_job_active (struct frame *f)
+{
+ if (FRAME_MSPRINTER_JOB_STARTED (f))
+ error_frame_unsizable (f);
+}
+
+static void
+msprinter_init_frame_1 (struct frame *f, Lisp_Object props)
+{
+ HDC hdc = DEVICE_MSPRINTER_HDC (XDEVICE (FRAME_DEVICE (f)));
+ Lisp_Object frame_obj = Qnil;
+
+ /* Make sure this is the only frame on device. Windows printer can
+ handle only one job at a time. */
+ if (!NILP (DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f)))))
+ error ("Only one frame (print job) at a time is allowed on "
+ "this printer device.");
+
+ f->frame_data = xnew_and_zero (struct msprinter_frame);
+
+ /* Default margin size is 1" = 1440 twips */
+ FRAME_MSPRINTER_TOP_MARGIN(f) = 1440;
+ FRAME_MSPRINTER_BOTTOM_MARGIN(f) = 1440;
+ FRAME_MSPRINTER_LEFT_MARGIN(f) = 1440;
+ FRAME_MSPRINTER_RIGHT_MARGIN(f) = 1440;
+
+ /* Negative for "uinspecified" */
+ FRAME_MSPRINTER_CHARWIDTH(f) = -1;
+ FRAME_MSPRINTER_CHARHEIGHT(f) = -1;
+
+ /* nil is for "system default" for these properties. */
+ FRAME_MSPRINTER_ORIENTATION(f) = Qnil;
+ FRAME_MSPRINTER_DUPLEX(f) = Qnil;
+}
+
+static void
+msprinter_init_frame_3 (struct frame *f)
+{
+ DOCINFO di;
+ struct device *device = XDEVICE (FRAME_DEVICE (f));
+ HDC hdc = DEVICE_MSPRINTER_HDC (device);
+ int frame_left, frame_top, frame_width, frame_height;
+
+ /* Change printer parameters */
+ {
+ DEVMODE* devmode = msprinter_get_devmode_copy (device);
+ devmode->dmFields = 0;
+
+ if (!NILP (FRAME_MSPRINTER_ORIENTATION(f)))
+ {
+ devmode->dmFields = DM_ORIENTATION;
+ if (EQ (FRAME_MSPRINTER_ORIENTATION(f), Qportrait))
+ devmode->dmOrientation = DMORIENT_PORTRAIT;
+ else if (EQ (FRAME_MSPRINTER_ORIENTATION(f), Qlandscape))
+ devmode->dmOrientation = DMORIENT_LANDSCAPE;
+ else
+ abort();
+ }
+
+ if (!NILP (FRAME_MSPRINTER_DUPLEX(f)))
+ {
+ devmode->dmFields = DM_DUPLEX;
+ if (EQ (FRAME_MSPRINTER_DUPLEX(f), Qnone))
+ devmode->dmDuplex = DMDUP_SIMPLEX;
+ if (EQ (FRAME_MSPRINTER_DUPLEX(f), Qvertical))
+ devmode->dmDuplex = DMDUP_VERTICAL;
+ if (EQ (FRAME_MSPRINTER_DUPLEX(f), Qhorizontal))
+ devmode->dmDuplex = DMDUP_HORIZONTAL;
+ else
+ abort();
+ }
+
+ msprinter_apply_devmode (device, devmode);
+ }
+
+ /* Compute geometry properties */
+ frame_left = (MulDiv (GetDeviceCaps (hdc, LOGPIXELSX),
+ FRAME_MSPRINTER_LEFT_MARGIN(f), 1440)
+ - GetDeviceCaps (hdc, PHYSICALOFFSETX));
+
+ if (FRAME_MSPRINTER_CHARWIDTH(f) > 0)
+ {
+ char_to_real_pixel_size (f, FRAME_MSPRINTER_CHARWIDTH(f), 0,
+ &frame_width, NULL);
+ FRAME_MSPRINTER_RIGHT_MARGIN(f) =
+ MulDiv (GetDeviceCaps (hdc, PHYSICALWIDTH)
+ - (frame_left + frame_width), 1440,
+ GetDeviceCaps (hdc, LOGPIXELSX));
+ }
+ else
+ frame_width = (GetDeviceCaps (hdc, PHYSICALWIDTH)
+ - frame_left
+ - MulDiv (GetDeviceCaps (hdc, LOGPIXELSX),
+ FRAME_MSPRINTER_RIGHT_MARGIN(f), 1440));
+
+ frame_top = (MulDiv (GetDeviceCaps (hdc, LOGPIXELSY),
+ FRAME_MSPRINTER_TOP_MARGIN(f), 1440)
+ - GetDeviceCaps (hdc, PHYSICALOFFSETY));
+
+ if (FRAME_MSPRINTER_CHARHEIGHT(f) > 0)
+ {
+ char_to_real_pixel_size (f, 0, FRAME_MSPRINTER_CHARHEIGHT(f),
+ NULL, &frame_height);
+
+ FRAME_MSPRINTER_BOTTOM_MARGIN(f) =
+ MulDiv (GetDeviceCaps (hdc, PHYSICALHEIGHT)
+ - (frame_top + frame_height), 1440,
+ GetDeviceCaps (hdc, LOGPIXELSY));
+ }
+ else
+ frame_height = (GetDeviceCaps (hdc, PHYSICALHEIGHT)
+ - frame_top
+ - MulDiv (GetDeviceCaps (hdc, LOGPIXELSY),
+ FRAME_MSPRINTER_BOTTOM_MARGIN(f), 1440));
+
+ /* Geometry sanity checks */
+ if (!frame_pixsize_valid_p (f, frame_width, frame_height))
+ error ("Area inside print margins has shrunk to naught.");
+
+ if (frame_left < 0
+ || frame_top < 0
+ || frame_left + frame_width > GetDeviceCaps (hdc, HORZRES)
+ || frame_top + frame_height > GetDeviceCaps (hdc, VERTRES))
+ error ("Print area is ouside of the printer's hardware printable area.");
+
+ /* Apply XEmacs frame geometry and layout windows */
+ {
+ int rows, columns;
+ FRAME_PIXWIDTH(f) = frame_width;
+ FRAME_PIXHEIGHT(f) = frame_height;
+ pixel_to_char_size (f, frame_width, frame_height, &columns, &rows);
+ change_frame_size (f, rows, columns, 0);
+ }
+
+ /* Apply DC geometry */
+ SetTextAlign (hdc, TA_BASELINE | TA_LEFT | TA_NOUPDATECP);
+ SetViewportOrgEx (hdc, frame_left, frame_top, NULL);
+ SetWindowOrgEx (hdc, 0, 0, NULL);
+
+ /* Start print job */
+ di.cbSize = sizeof (di);
+ di.lpszDocName = (STRINGP(f->name)
+ ? (char*) XSTRING_DATA(f->name)
+ : "XEmacs print document");
+ di.lpszOutput = NULL;
+ di.lpszDatatype = NULL;
+ di.fwType = 0;
+
+ if (StartDoc (hdc, &di) <= 0)
+ error ("Cannot start print job");
+
+ /* Finish frame setup */
+ FRAME_MSPRINTER_CDC(f) = CreateCompatibleDC (hdc);
+ FRAME_MSPRINTER_JOB_STARTED (f) = 1;
+ FRAME_VISIBLE_P(f) = 0;
+}
+
+static void
+msprinter_mark_frame (struct frame *f)
+{
+ /* NOTE: These need not be marked as long as we allow only c-defined
+ symbols for their values. Although, marking these is safer than
+ expensive. [I know a proof to the theorem postulating that a
+ gator is longer than greener. Ask me. -- kkm] */
+ mark_object (FRAME_MSPRINTER_ORIENTATION (f));
+ mark_object (FRAME_MSPRINTER_DUPLEX (f));
+}
+
+static void
+msprinter_delete_frame (struct frame *f)
+{
+ if (f->frame_data)
+ {
+ if (FRAME_MSPRINTER_JOB_STARTED (f))
+ EndDoc (DEVICE_MSPRINTER_HDC (XDEVICE (FRAME_DEVICE (f))));
+ if (FRAME_MSPRINTER_CDC(f))
+ DeleteDC(FRAME_MSPRINTER_CDC(f));
+ xfree (f->frame_data);
+ }
+
+ f->frame_data = 0;
+}
+
+static Lisp_Object
+msprinter_frame_property (struct frame *f, Lisp_Object property)
+{
+ if (EQ (Qleft_margin, property))
+ return make_int (FRAME_MSPRINTER_LEFT_MARGIN(f));
+ else if (EQ (Qtop_margin, property))
+ return make_int (FRAME_MSPRINTER_TOP_MARGIN(f));
+ if (EQ (Qright_margin, property))
+ return make_int (FRAME_MSPRINTER_RIGHT_MARGIN(f));
+ else if (EQ (Qbottom_margin, property))
+ return make_int (FRAME_MSPRINTER_BOTTOM_MARGIN(f));
+ else if (EQ (Qorientation, property))
+ return FRAME_MSPRINTER_ORIENTATION(f);
+ else if (EQ (Qduplex, property))
+ return FRAME_MSPRINTER_DUPLEX(f);
+ else
+ return Qunbound;
+}
+
+static int
+msprinter_internal_frame_property_p (struct frame *f, Lisp_Object property)
+{
+ return (EQ (Qleft_margin, property) || EQ (Qtop_margin, property) ||
+ EQ (Qright_margin, property) || EQ (Qbottom_margin, property) ||
+ EQ (Qorientation, property) || EQ (Qduplex, property));
+}
+
+static Lisp_Object
+msprinter_frame_properties (struct frame *f)
+{
+ Lisp_Object props = Qnil;
+ props = cons3 (Qorientation, FRAME_MSPRINTER_ORIENTATION(f), props);
+ props = cons3 (Qduplex, FRAME_MSPRINTER_DUPLEX(f), props);
+ props = cons3 (Qbottom_margin,
+ make_int (FRAME_MSPRINTER_BOTTOM_MARGIN(f)), props);
+ props = cons3 (Qright_margin,
+ make_int (FRAME_MSPRINTER_RIGHT_MARGIN(f)), props);
+ props = cons3 (Qtop_margin,
+ make_int (FRAME_MSPRINTER_TOP_MARGIN(f)), props);
+ props = cons3 (Qleft_margin,
+ make_int (FRAME_MSPRINTER_LEFT_MARGIN(f)), props);
+ return props;
+}
+
+static void
+msprinter_set_frame_properties (struct frame *f, Lisp_Object plist)
+{
+ BOOL size_changed_p = FALSE;
+ Lisp_Object tail;
+
+ /* Extract the properties from plist */
+ for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
+ {
+ Lisp_Object prop = Fcar (tail);
+ Lisp_Object val = Fcar (Fcdr (tail));
+
+ if (SYMBOLP (prop))
+ {
+ if (EQ (prop, Qwidth))
+ {
+ maybe_error_if_job_active (f);
+ if (!NILP (val))
+ {
+ CHECK_NATNUM (val);
+ FRAME_MSPRINTER_CHARWIDTH(f) = XINT (val);
+ }
+ }
+ if (EQ (prop, Qheight))
+ {
+ maybe_error_if_job_active (f);
+ if (!NILP (val))
+ {
+ CHECK_NATNUM (val);
+ FRAME_MSPRINTER_CHARHEIGHT(f) = XINT (val);
+ }
+ }
+ else if (EQ (prop, Qleft_margin))
+ {
+ maybe_error_if_job_active (f);
+ CHECK_NATNUM (val);
+ FRAME_MSPRINTER_LEFT_MARGIN(f) = XINT (val);
+ }
+ else if (EQ (prop, Qtop_margin))
+ {
+ maybe_error_if_job_active (f);
+ CHECK_NATNUM (val);
+ FRAME_MSPRINTER_TOP_MARGIN(f) = XINT (val);
+ }
+ else if (EQ (prop, Qright_margin))
+ {
+ maybe_error_if_job_active (f);
+ CHECK_NATNUM (val);
+ FRAME_MSPRINTER_RIGHT_MARGIN(f) = XINT (val);
+ }
+ else if (EQ (prop, Qbottom_margin))
+ {
+ maybe_error_if_job_active (f);
+ CHECK_NATNUM (val);
+ FRAME_MSPRINTER_BOTTOM_MARGIN(f) = XINT (val);
+ }
+ else if (EQ (prop, Qorientation))
+ {
+ maybe_error_if_job_active (f);
+ CHECK_SYMBOL (val);
+ if (!NILP(val) &&
+ !EQ (val, Qportrait) &&
+ !EQ (val, Qlandscape))
+ signal_simple_error ("Page orientation can only be "
+ "'portrait or 'landscape", val);
+ FRAME_MSPRINTER_ORIENTATION(f) = val;
+ }
+ else if (EQ (prop, Qduplex))
+ {
+ maybe_error_if_job_active (f);
+ CHECK_SYMBOL (val);
+ if (!NILP(val) &&
+ !EQ (val, Qnone) &&
+ !EQ (val, Qvertical) &&
+ !EQ (val, Qhorizontal))
+ signal_simple_error ("Duplex can only be 'none, "
+ "'vertical or 'horizontal", val);
+ FRAME_MSPRINTER_DUPLEX(f) = val;
+ }
+ }
+ }
+}
+
+static void
+msprinter_set_frame_size (struct frame *f, int width, int height)
+{
+ /* We're absolutely unsizeable */
+ error_frame_unsizable (f);
+}
+
void
console_type_create_frame_mswindows (void)
{
- /* frame methods */
+ /* Display frames */
CONSOLE_HAS_METHOD (mswindows, init_frame_1);
CONSOLE_HAS_METHOD (mswindows, init_frame_2);
CONSOLE_HAS_METHOD (mswindows, init_frame_3);
CONSOLE_HAS_METHOD (mswindows, get_frame_parent);
CONSOLE_HAS_METHOD (mswindows, update_frame_external_traits);
CONSOLE_HAS_METHOD (mswindows, frame_size_fixed_p);
+
+ /* Printer frames, aka print jobs */
+ CONSOLE_HAS_METHOD (msprinter, init_frame_1);
+ CONSOLE_HAS_METHOD (msprinter, init_frame_3);
+ CONSOLE_HAS_METHOD (msprinter, mark_frame);
+ CONSOLE_HAS_METHOD (msprinter, delete_frame);
+ CONSOLE_HAS_METHOD (msprinter, frame_property);
+ CONSOLE_HAS_METHOD (msprinter, internal_frame_property_p);
+ CONSOLE_HAS_METHOD (msprinter, frame_properties);
+ CONSOLE_HAS_METHOD (msprinter, set_frame_properties);
+ CONSOLE_HAS_METHOD (msprinter, set_frame_size);
}
void
mswindows_console_methods->device_specific_frame_props =
&Vdefault_mswindows_frame_plist;
+
+ DEFVAR_LISP ("default-msprinter-frame-plist", &Vdefault_msprinter_frame_plist /*
+Plist of default frame-creation properties for msprinter print job frames.
+These override what is specified in `default-frame-plist', but are
+overridden by the arguments to the particular call to `make-frame'.
+
+Note: In many cases, properties of a frame are available as specifiers
+instead of through the frame-properties mechanism.
+
+Here is a list of recognized frame properties, other than those
+documented in `set-frame-properties' (they can be queried and
+set at any time, except as otherwise noted):
+
+ left-margin Margin of the page, in twips. Twip is a
+ top-margin typographical unit of measurement,
+ right-margin equal to 1/1440 of an inch, or 1/20 of a
+ bottom-margin point, and roughly equal to 7/400 of a
+ millimeter. If not specifified, each margin
+ defaults to one inch (25.4 mm).
+
+ MARGINS NOTE. right-margin and bottom-margin are overridden by
+ the height and width properties. If you want to specify size
+ of the printable area in character, as with the rest of XEmacs,
+ use these properties. If height and/or width are nil, then
+ corresponding margin setting is taken into account. If you
+ specify height and/or width in `default-frame-plist', but still
+ want to specify right/bottom margins, set height/width in this
+ plist to nil, as in this example:
+
+ (setq default-frame-plist '(height 55 'width 80)
+ default-msprinter-frame-plist '(height nil 'width nil))
+
+
+ orientation Printer page orientation. Can be 'nil,
+ indicating system default, 'portrait
+ or 'landscape.
+
+ duplex Duplex printing mode, subject to printer
+ support. Can be 'nil for the device default,
+ 'none for simplex printing, 'vertical or
+ 'horizontal for duplex page bound along
+ the corresponding page direction.
+
+See also `default-frame-plist', which specifies properties which apply
+to all frames, not just mswindows frames.
+*/ );
+ Vdefault_msprinter_frame_plist = Qnil;
+
+ msprinter_console_methods->device_specific_frame_props =
+ &Vdefault_msprinter_frame_plist;
}
/* We used to map over all frames here and then map over all widgets
belonging to that frame. However it turns out that this was very fragile
- as it requires our display stuctures to be in sync _and_ that the
+ as it requires our display stuctures to be in sync _and_ that the
loop is told about every new widget somebody adds. Therefore we
now let Xt find it for us (which does a bottom-up search which
could even be faster) */
{
CONST char * tmp;
encoding = DEVICE_XATOM_COMPOUND_TEXT (XDEVICE (FRAME_DEVICE (f)));
- GET_C_CHARPTR_EXT_CTEXT_DATA_ALLOCA ((CONST char *) value, tmp);
+ TO_EXTERNAL_FORMAT (C_STRING, value,
+ C_STRING_ALLOCA, tmp,
+ Qctext);
new_XtValue = (String) tmp;
break;
}
#endif /* MULE */
- /* ### Caching is device-independent - belongs in update_frame_title. */
+ /* #### Caching is device-independent - belongs in update_frame_title. */
Xt_GET_VALUE (FRAME_X_SHELL_WIDGET (f), Xt_resource_name, &old_XtValue);
if (!old_XtValue || strcmp (new_XtValue, old_XtValue))
{
if (XSTRING_LENGTH (prop) == 0)
continue;
- GET_C_STRING_CTEXT_DATA_ALLOCA (prop, extprop);
+ TO_EXTERNAL_FORMAT (LISP_STRING, prop,
+ C_STRING_ALLOCA, extprop,
+ Qctext);
if (STRINGP (val))
{
CONST Extbyte *extval;
Extcount extvallen;
- GET_STRING_CTEXT_DATA_ALLOCA (val, extval, extvallen);
+ TO_EXTERNAL_FORMAT (LISP_STRING, val,
+ ALLOCA, (extval, extvallen),
+ Qctext);
XtVaSetValues (w, XtVaTypedArg, extprop,
XtRString, extval, extvallen + 1,
(XtArgVal) NULL);
unsigned int modifier = 0, state = 0;
char *Ctext;
int numItems = 0, textlen = 0, pos = 0;
- struct Lisp_Event *lisp_event = XEVENT(event);
+ Lisp_Event *lisp_event = XEVENT (event);
Lisp_Object item = Qnil;
struct gcpro gcpro1;
{
filePath = transferInfo->dropData->data.files[ii];
hurl = dnd_url_hexify_string ((char *)filePath, "file:");
- /* ### Mule-izing required */
+ /* #### Mule-izing required */
l_data = Fcons (make_string ((Bufbyte* )hurl,
strlen (hurl)),
l_data);
char *dnd_data = NULL;
unsigned long dnd_len = 0;
int dnd_typ = DndText, dnd_dealloc = 0;
- struct Lisp_Event *lisp_event = XEVENT(event);
+ Lisp_Event *lisp_event = XEVENT (event);
/* only drag if this is really a press */
if (EVENT_TYPE(lisp_event) != button_press_event)
#endif
if (STRINGP (f->name))
- GET_C_STRING_CTEXT_DATA_ALLOCA (f->name, name);
+ TO_EXTERNAL_FORMAT (LISP_STRING, f->name,
+ C_STRING_ALLOCA, name,
+ Qctext);
else
name = "emacs";
#else
XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
/* make sure the windows are really gone! */
- /* ### Is this REALLY necessary? */
+ /* #### Is this REALLY necessary? */
XFlush (dpy);
#endif /* EXTERNAL_WIDGET */
a space), try to find another one. */
if (string_char (XSTRING (Fbuffer_name (buf)), 0) == ' ')
buf = Fother_buffer (buf, Qnil, Qnil);
- Fset_window_buffer (root_window, buf);
+ Fset_window_buffer (root_window, buf, Qnil);
}
return f;
f->has_minibuffer = 1;
XWINDOW (mini_window)->buffer = Qt;
- Fset_window_buffer (mini_window, Vminibuffer_zero);
+ Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
}
/* Make a frame using a separate minibuffer window on another frame.
/* Install the chosen minibuffer window, with proper buffer. */
store_minibuf_frame_prop (f, mini_window);
- Fset_window_buffer (mini_window, Vminibuffer_zero);
+ Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
}
/* Make a frame containing only a minibuffer window. */
/* Put the proper buffer in that window. */
- Fset_window_buffer (mini_window, Vminibuffer_zero);
+ Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
}
static Lisp_Object
console = DEVICE_CONSOLE (d);
con = XCONSOLE (console);
- if (!called_from_delete_device)
+ if (!called_from_delete_device &&
+ !(MAYBE_INT_DEVMETH (d, device_implementation_flags, ())
+ & XDEVIMPF_FRAMELESS_OK))
{
/* If we're deleting the only non-minibuffer frame on the
device, delete the device. */
next_frame_internal (frame, Qt, device,
called_from_delete_device);
if (NILP (next_f) || EQ (next_f, frame))
- ;
+ set_device_selected_frame (d, Qnil);
else
set_device_selected_frame (d, next_f);
}
{
struct frame *sel_frame = selected_frame ();
Fset_window_buffer (sel_frame->minibuffer_window,
- XWINDOW (minibuf_window)->buffer);
+ XWINDOW (minibuf_window)->buffer, Qt);
minibuf_window = sel_frame->minibuffer_window;
/* If the dying minibuffer window was selected,
if (EQ (f->minibuffer_window, minibuf_window))
{
Fset_window_buffer (sel_frame->minibuffer_window,
- XWINDOW (minibuf_window)->buffer);
+ XWINDOW (minibuf_window)->buffer, Qt);
minibuf_window = sel_frame->minibuffer_window;
}
if (EQ (f->minibuffer_window, minibuf_window))
{
Fset_window_buffer (sel_frame->minibuffer_window,
- XWINDOW (minibuf_window)->buffer);
+ XWINDOW (minibuf_window)->buffer, Qt);
minibuf_window = sel_frame->minibuffer_window;
}
Lisp_Object *face_prop_out)
{
Lisp_Object list = Vbuilt_in_face_specifiers;
- struct Lisp_String *s;
+ Lisp_String *s;
if (!SYMBOLP (sym))
return 0;
while (!NILP (list))
{
Lisp_Object prop = Fcar (list);
- struct Lisp_String *prop_name;
+ Lisp_String *prop_name;
if (!SYMBOLP (prop))
continue;
- FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f)
- 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f);
+ new_pixwidth += 2 * f->internal_border_width;
+
/* Adjust the width for the end glyph which may be a different width
than the default character width. */
{
int adjustment, trunc_width, cont_width;
- trunc_width = glyph_width (Vtruncation_glyph,
+ trunc_width = glyph_width (Vtruncation_glyph,
FRAME_SELECTED_WINDOW (f));
- cont_width = glyph_width (Vcontinuation_glyph,
+ cont_width = glyph_width (Vcontinuation_glyph,
FRAME_SELECTED_WINDOW (f));
adjustment = max (trunc_width, cont_width);
adjustment = max (adjustment, font_width);
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_FRAME_H_
-#define _XEMACS_FRAME_H_
+#ifndef INCLUDED_frame_h_
+#define INCLUDED_frame_h_
#ifdef HAVE_SCROLLBARS
#include "scrollbar.h"
void init_frame (void);
-#endif /* _XEMACS_FRAME_H_ */
+#endif /* INCLUDED_frame_h_ */
Lisp_Object Qbitmap;
Lisp_Object Qboolean;
Lisp_Object Qbottom;
+Lisp_Object Qbottom_margin;
Lisp_Object Qbuffer;
Lisp_Object Qbutton;
Lisp_Object Qcenter;
Lisp_Object Qcommand;
Lisp_Object Qconsole;
Lisp_Object Qcritical;
+Lisp_Object Qctext;
Lisp_Object Qcursor;
Lisp_Object Qdata;
Lisp_Object Qdead;
Lisp_Object Qdimension;
Lisp_Object Qdisplay;
Lisp_Object Qdoc_string;
+Lisp_Object Qduplex;
Lisp_Object Qdynarr_overhead;
Lisp_Object Qempty;
Lisp_Object Qeq;
Lisp_Object Qeval;
Lisp_Object Qextents;
Lisp_Object Qface;
+Lisp_Object Qfile_name;
Lisp_Object Qfont;
Lisp_Object Qframe;
Lisp_Object Qfunction;
Lisp_Object Qinternal;
Lisp_Object Qkey;
Lisp_Object Qkey_assoc;
+Lisp_Object Qkeyboard;
Lisp_Object Qkeymap;
+Lisp_Object Qlandscape;
Lisp_Object Qleft;
+Lisp_Object Qleft_margin;
Lisp_Object Qlist;
Lisp_Object Qmagic;
Lisp_Object Qmalloc_overhead;
Lisp_Object Qminus;
Lisp_Object Qmodifiers;
Lisp_Object Qmotion;
+Lisp_Object Qmsprinter;
Lisp_Object Qmswindows;
Lisp_Object Qname;
Lisp_Object Qnone;
Lisp_Object Qold_rassq;
Lisp_Object Qonly;
Lisp_Object Qor;
+Lisp_Object Qorientation;
Lisp_Object Qother;
Lisp_Object Qpointer;
Lisp_Object Qpopup;
+Lisp_Object Qportrait;
Lisp_Object Qprint;
Lisp_Object Qprocess;
Lisp_Object Qprovide;
Lisp_Object Qreturn;
Lisp_Object Qreverse;
Lisp_Object Qright;
+Lisp_Object Qright_margin;
Lisp_Object Qsearch;
Lisp_Object Qselected;
Lisp_Object Qsignal;
Lisp_Object Qstring;
Lisp_Object Qsymbol;
Lisp_Object Qsyntax;
+Lisp_Object Qterminal;
Lisp_Object Qtest;
Lisp_Object Qtext;
Lisp_Object Qtimeout;
Lisp_Object Qtimestamp;
Lisp_Object Qtoolbar;
Lisp_Object Qtop;
+Lisp_Object Qtop_margin;
Lisp_Object Qtty;
Lisp_Object Qtype;
Lisp_Object Qundecided;
defsymbol (&Qbitmap, "bitmap");
defsymbol (&Qboolean, "boolean");
defsymbol (&Qbottom, "bottom");
+ defsymbol (&Qbottom_margin, "bottom-margin");
defsymbol (&Qbuffer, "buffer");
defsymbol (&Qbutton, "button");
defsymbol (&Qcategory, "category");
defsymbol (&Qcommand, "command");
defsymbol (&Qconsole, "console");
defsymbol (&Qcritical, "critical");
+ defsymbol (&Qctext, "ctext");
defsymbol (&Qcursor, "cursor");
defsymbol (&Qdata, "data");
defsymbol (&Qdead, "dead");
defsymbol (&Qdimension, "dimension");
defsymbol (&Qdisplay, "display");
defsymbol (&Qdoc_string, "doc-string");
+ defsymbol (&Qduplex, "duplex");
defsymbol (&Qdynarr_overhead, "dynarr-overhead");
defsymbol (&Qempty, "empty");
defsymbol (&Qeq, "eq");
defsymbol (&Qeval, "eval");
defsymbol (&Qextents, "extents");
defsymbol (&Qface, "face");
+ defsymbol (&Qfile_name, "file-name");
defsymbol (&Qfont, "font");
defsymbol (&Qframe, "frame");
defsymbol (&Qfunction, "function");
defsymbol (&Qinternal, "internal");
defsymbol (&Qkey, "key");
defsymbol (&Qkey_assoc, "key-assoc");
+ defsymbol (&Qkeyboard, "keyboard");
defsymbol (&Qkeymap, "keymap");
+ defsymbol (&Qlandscape, "landscape");
defsymbol (&Qleft, "left");
+ defsymbol (&Qleft_margin, "left-margin");
defsymbol (&Qlist, "list");
defsymbol (&Qmagic, "magic");
defsymbol (&Qmalloc_overhead, "malloc-overhead");
defsymbol (&Qminus, "-");
defsymbol (&Qmodifiers, "modifiers");
defsymbol (&Qmotion, "motion");
+ defsymbol (&Qmsprinter, "msprinter");
defsymbol (&Qmswindows, "mswindows");
defsymbol (&Qname, "name");
defsymbol (&Qnone, "none");
defsymbol (&Qold_rassq, "old-rassq");
defsymbol (&Qonly, "only");
defsymbol (&Qor, "or");
+ defsymbol (&Qorientation, "orientation");
defsymbol (&Qother, "other");
defsymbol (&Qpointer, "pointer");
defsymbol (&Qpopup, "popup");
+ defsymbol (&Qportrait, "portrait");
defsymbol (&Qprint, "print");
defsymbol (&Qprocess, "process");
defsymbol (&Qprovide, "provide");
defsymbol (&Qreturn, "return");
defsymbol (&Qreverse, "reverse");
defsymbol (&Qright, "right");
+ defsymbol (&Qright_margin, "right-margin");
defsymbol (&Qsearch, "search");
defsymbol (&Qselected, "selected");
defsymbol (&Qsignal, "signal");
defsymbol (&Qstring, "string");
defsymbol (&Qsymbol, "symbol");
defsymbol (&Qsyntax, "syntax");
+ defsymbol (&Qterminal, "terminal");
defsymbol (&Qtest, "test");
defsymbol (&Qtext, "text");
defsymbol (&Qtimeout, "timeout");
defsymbol (&Qtimestamp, "timestamp");
defsymbol (&Qtoolbar, "toolbar");
defsymbol (&Qtop, "top");
+ defsymbol (&Qtop_margin, "top-margin");
defsymbol (&Qtty, "tty");
defsymbol (&Qtype, "type");
defsymbol (&Qundecided, "undecided");
loadavg[elem++] = load_info.fifteen_minute;
#endif /* DGUX */
-#if !defined (LDAV_DONE) && defined (apollo)
-#define LDAV_DONE
-/* Apollo code from lisch@mentorg.com (Ray Lischner).
-
- This system call is not documented. The load average is obtained as
- three long integers, for the load average over the past minute,
- five minutes, and fifteen minutes. Each value is a scaled integer,
- with 16 bits of integer part and 16 bits of fraction part.
-
- I'm not sure which operating system first supported this system call,
- but I know that SR10.2 supports it. */
-
- extern void proc1_$get_loadav ();
- unsigned long load_ave[3];
-
- proc1_$get_loadav (load_ave);
-
- if (nelem > 0)
- loadavg[elem++] = load_ave[0] / 65536.0;
- if (nelem > 1)
- loadavg[elem++] = load_ave[1] / 65536.0;
- if (nelem > 2)
- loadavg[elem++] = load_ave[2] / 65536.0;
-#endif /* apollo */
-
#if !defined (LDAV_DONE) && defined (OSF_MIPS)
#define LDAV_DONE
/* Synched up with: FSF 19.30. */
+#ifndef INCLUDED_getpagesize_h_
+#define INCLUDED_getpagesize_h_
+
/* Emulate getpagesize on systems that lack it. */
#if 0
#endif /* _SC_PAGESIZE */
#endif /* not HAVE_GETPAGESIZE */
+#endif /* INCLUDED_getpagesize_h_ */
* 19 Jan 98 - Version 3.1 by Jareth Hein (Support for user-defined I/O). *
******************************************************************************/
-#ifndef GIF_LIB_H
-#define GIF_LIB_H
+#ifndef INCLUDED_gifrlib_h_
+#define INCLUDED_gifrlib_h_
#define GIF_ERROR 0
#define GIF_OK 1
ColorMapObject *MakeMapObject(int ColorCount, GifColorType *ColorMap);
void FreeMapObject(ColorMapObject *Object);
-
-#endif /* GIF_LIB_H */
+#endif /* INCLUDED_gifrlib_h_ */
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
/* It is OK for the unwind data to be local to this function,
because the unwind-protect is always executed when this
stack frame is still valid. */
/* #### This is a definite problem under Mule due to the amount of
stack data it might allocate. Need to be able to convert and
write out to a file. */
- GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (bytes, len), Qbinary);
jpeg_memory_src (&cinfo, (JOCTET *) bytes, len);
}
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
/* It is OK for the unwind data to be local to this function,
because the unwind-protect is always executed when this
stack frame is still valid. */
assert (!NILP (data));
if (!(unwind.giffile = GifSetup()))
- signal_image_error ("Insufficent memory to instantiate GIF image", instantiator);
+ signal_image_error ("Insufficient memory to instantiate GIF image", instantiator);
/* set up error facilities */
if (setjmp(gif_err.setjmp_buffer))
}
GifSetErrorFunc(unwind.giffile, (Gif_error_func)gif_error_func, (VoidPtr)&gif_err);
- GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (bytes, len), Qbinary);
mem_struct.bytes = bytes;
mem_struct.len = len;
mem_struct.index = 0;
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
struct png_unwind_data unwind;
int speccount = specpdl_depth ();
int height, width;
/* #### This is a definite problem under Mule due to the amount of
stack data it might allocate. Need to think about using Lstreams */
- GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (bytes, len), Qbinary);
tbr.bytes = bytes;
tbr.len = len;
tbr.index = 0;
}
else
{
- struct Lisp_Color_Instance *c;
+ Lisp_Color_Instance *c;
Lisp_Object rgblist;
c = XCOLOR_INSTANCE (bkgd);
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
tiff_memory_storage mem_struct;
/* It is OK for the unwind data to be local to this function,
because the unwind-protect is always executed when this
/* #### This is a definite problem under Mule due to the amount of
stack data it might allocate. Think about Lstreams... */
- GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ ALLOCA, (bytes, len),
+ Qbinary);
mem_struct.bytes = bytes;
mem_struct.len = len;
mem_struct.index = 0;
tiff_memory_seek, tiff_memory_close, tiff_memory_size,
tiff_map_noop, tiff_unmap_noop);
if (!unwind.tiff)
- signal_image_error ("Insufficent memory to instantiate TIFF image", instantiator);
+ signal_image_error ("Insufficient memory to instantiate TIFF image", instantiator);
TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
unwind.eimage = (unsigned char *) xmalloc (width * height * 3);
- /* ### This is little more than proof-of-concept/function testing.
+ /* #### This is little more than proof-of-concept/function testing.
It needs to be reimplemented via scanline reads for both memory
compactness. */
raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
Lisp_Object Qmswindows_resource;
static void
-mswindows_initialize_dibitmap_image_instance (struct Lisp_Image_Instance *ii,
+mswindows_initialize_dibitmap_image_instance (Lisp_Image_Instance *ii,
int slices,
enum image_instance_type type);
static void
-mswindows_initialize_image_instance_mask (struct Lisp_Image_Instance* image,
+mswindows_initialize_image_instance_mask (Lisp_Image_Instance* image,
struct frame* f);
-COLORREF mswindows_string_to_color (CONST char *name);
-
#define BPLINE(width) ((int)(~3UL & (unsigned long)((width) +3)))
/************************************************************************/
(IS_DIRECTORY_SEP(XSTRING_BYTE (name, 2)))))))
{
if (!NILP (Ffile_readable_p (name)))
- return name;
+ return Fexpand_file_name (name, Qnil);
else
return Qnil;
}
in the error message. */
static void
-init_image_instance_from_dibitmap (struct Lisp_Image_Instance *ii,
+init_image_instance_from_dibitmap (Lisp_Image_Instance *ii,
BITMAPINFO *bmp_info,
int dest_mask,
void *bmp_data,
}
static void
-image_instance_add_dibitmap (struct Lisp_Image_Instance *ii,
+image_instance_add_dibitmap (Lisp_Image_Instance *ii,
BITMAPINFO *bmp_info,
void *bmp_data,
int bmp_bits,
}
static void
-mswindows_init_image_instance_from_eimage (struct Lisp_Image_Instance *ii,
+mswindows_init_image_instance_from_eimage (Lisp_Image_Instance *ii,
int width, int height,
int slices,
unsigned char *eimage,
}
static void
-mswindows_initialize_image_instance_mask (struct Lisp_Image_Instance* image,
+mswindows_initialize_image_instance_mask (Lisp_Image_Instance* image,
struct frame* f)
{
HBITMAP mask;
}
void
-mswindows_initialize_image_instance_icon (struct Lisp_Image_Instance* image,
+mswindows_initialize_image_instance_icon (Lisp_Image_Instance* image,
int cursor)
{
ICONINFO x_icon;
}
HBITMAP
-mswindows_create_resized_bitmap (struct Lisp_Image_Instance* ii,
+mswindows_create_resized_bitmap (Lisp_Image_Instance* ii,
struct frame* f,
int newx, int newy)
{
}
HBITMAP
-mswindows_create_resized_mask (struct Lisp_Image_Instance* ii,
+mswindows_create_resized_mask (Lisp_Image_Instance* ii,
struct frame* f,
int newx, int newy)
{
}
int
-mswindows_resize_dibitmap_instance (struct Lisp_Image_Instance* ii,
+mswindows_resize_dibitmap_instance (Lisp_Image_Instance* ii,
struct frame* f,
int newx, int newy)
{
colortbl[j].color =
COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (XCDR (cons)));
- GET_C_STRING_OS_DATA_ALLOCA (XCAR (cons), colortbl[j].name);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (cons),
+ C_STRING_ALLOCA, colortbl[j].name,
+ Qnative);
colortbl[j].name = xstrdup (colortbl[j].name); /* mustn't lose this when we return */
free_cons (XCONS (cons));
cons = results;
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
CONST Extbyte *bytes;
Extcount len;
assert (!NILP (data));
- GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ ALLOCA, (bytes, len),
+ Qbinary);
/* in case we have color symbols */
color_symbols = extract_xpm_color_names (device, domain,
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
CONST Extbyte *bytes;
Extcount len;
assert (!NILP (data));
- GET_STRING_BINARY_DATA_ALLOCA (data, bytes, len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ ALLOCA, (bytes, len),
+ Qbinary);
/* Then slurp the image into memory, decoding along the way.
The result is the image in a simple one-byte-per-pixel
do {
Extbyte* nm=0;
- GET_C_STRING_OS_DATA_ALLOCA (name, nm);
+ TO_EXTERNAL_FORMAT (LISP_STRING, name,
+ C_STRING_ALLOCA, nm,
+ Qnative);
if (!strcasecmp ((char*)res->name, nm))
return res->resource_id;
} while ((++res)->name);
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
unsigned int type = 0;
HANDLE himage = NULL;
LPCTSTR resid=0;
if (!NILP (file))
{
Extbyte* f=0;
- GET_C_STRING_FILENAME_DATA_ALLOCA (file, f);
+ TO_EXTERNAL_FORMAT (LISP_STRING, file,
+ C_STRING_ALLOCA, f,
+ Qfile_name);
#ifdef __CYGWIN32__
CYGWIN_WIN32_PATH (f, fname);
#else
type));
if (!resid)
- GET_C_STRING_OS_DATA_ALLOCA (resource_id, resid);
+ TO_EXTERNAL_FORMAT (LISP_STRING, resource_id,
+ C_STRING_ALLOCA, resid,
+ Qnative);
}
}
else if (!(resid = MAKEINTRESOURCE (resource_name_to_resource (resource_id,
image instance accordingly. */
static void
-init_image_instance_from_xbm_inline (struct Lisp_Image_Instance *ii,
+init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii,
int width, int height,
/* Note that data is in ext-format! */
CONST char *bits,
{
Lisp_Object mask_data = find_keyword_in_vector (instantiator, Q_mask_data);
Lisp_Object mask_file = find_keyword_in_vector (instantiator, Q_mask_file);
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
struct frame* f = XFRAME (DEVICE_SELECTED_FRAME
(XDEVICE (IMAGE_INSTANCE_DEVICE (ii))));
HDC hdc = FRAME_MSWINDOWS_CDC (f);
HBITMAP mask = 0;
- CONST char *gcc_may_you_rot_in_hell;
if (!NILP (mask_data))
{
- GET_C_STRING_BINARY_DATA_ALLOCA (XCAR (XCDR (XCDR (mask_data))),
- gcc_may_you_rot_in_hell);
- mask =
- xbm_create_bitmap_from_data ( hdc,
- (unsigned char *)
- gcc_may_you_rot_in_hell,
- XINT (XCAR (mask_data)),
- XINT (XCAR (XCDR (mask_data))), FALSE,
- PALETTERGB (0,0,0),
- PALETTERGB (255,255,255));
+ CONST char *ext_data;
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (XCDR (XCDR (mask_data))),
+ C_STRING_ALLOCA, ext_data,
+ Qbinary);
+ mask = xbm_create_bitmap_from_data (hdc,
+ (unsigned char *) ext_data,
+ XINT (XCAR (mask_data)),
+ XINT (XCAR (XCDR (mask_data))),
+ FALSE,
+ PALETTERGB (0,0,0),
+ PALETTERGB (255,255,255));
}
init_image_instance_from_xbm_inline (ii, width, height, bits,
int dest_mask, Lisp_Object domain)
{
Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
- CONST char *gcc_go_home;
+ CONST char *ext_data;
assert (!NILP (data));
- GET_C_STRING_BINARY_DATA_ALLOCA (XCAR (XCDR (XCDR (data))),
- gcc_go_home);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (XCDR (XCDR (data))),
+ C_STRING_ALLOCA, ext_data,
+ Qbinary);
xbm_instantiate_1 (image_instance, instantiator, pointer_fg,
pointer_bg, dest_mask, XINT (XCAR (data)),
- XINT (XCAR (XCDR (data))), gcc_go_home);
+ XINT (XCAR (XCDR (data))), ext_data);
}
#ifdef HAVE_XFACE
assert (!NILP (data));
- GET_C_STRING_BINARY_DATA_ALLOCA (data, dstring);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ C_STRING_ALLOCA, dstring,
+ Qbinary);
if ((p = strchr (dstring, ':')))
{
/************************************************************************/
static void
-mswindows_print_image_instance (struct Lisp_Image_Instance *p,
+mswindows_print_image_instance (Lisp_Image_Instance *p,
Lisp_Object printcharfun,
int escapeflag)
{
#endif
static void
-mswindows_finalize_image_instance (struct Lisp_Image_Instance *p)
+mswindows_finalize_image_instance (Lisp_Image_Instance *p)
{
if (DEVICE_LIVE_P (XDEVICE (p->device)))
{
/* subwindow and widget support */
/************************************************************************/
+static HFONT
+mswindows_widget_hfont (Lisp_Image_Instance *p,
+ Lisp_Object domain)
+{
+ Lisp_Object face = IMAGE_INSTANCE_WIDGET_FACE (p);
+ int under = FACE_UNDERLINE_P (face, domain);
+ int strike = FACE_STRIKETHRU_P (face, domain);
+ Lisp_Object font = query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (p),
+ face, domain);
+
+ return mswindows_get_hfont (XFONT_INSTANCE (font), under, strike);
+}
+
/* unmap the image if it is a widget. This is used by redisplay via
redisplay_unmap_subwindows */
static void
-mswindows_unmap_subwindow (struct Lisp_Image_Instance *p)
+mswindows_unmap_subwindow (Lisp_Image_Instance *p)
{
if (IMAGE_INSTANCE_SUBWINDOW_ID (p))
{
0, 0, 0, 0,
SWP_HIDEWINDOW | SWP_NOMOVE | SWP_NOSIZE
| SWP_NOSENDCHANGING);
+ if (GetFocus() == WIDGET_INSTANCE_MSWINDOWS_HANDLE (p))
+ SetFocus (GetParent (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p)));
}
}
/* map the subwindow. This is used by redisplay via
redisplay_output_subwindow */
static void
-mswindows_map_subwindow (struct Lisp_Image_Instance *p, int x, int y,
+mswindows_map_subwindow (Lisp_Image_Instance *p, int x, int y,
struct display_glyph_area* dga)
{
- SetFocus (GetParent (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p)));
/* move the window before mapping it ... */
SetWindowPos (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p),
NULL,
/* resize the subwindow instance */
static void
-mswindows_resize_subwindow (struct Lisp_Image_Instance* ii, int w, int h)
+mswindows_resize_subwindow (Lisp_Image_Instance* ii, int w, int h)
{
/* Set the size of the control .... */
SetWindowPos (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii),
/* when you click on a widget you may activate another widget this
needs to be checked and all appropriate widgets updated */
static void
-mswindows_update_subwindow (struct Lisp_Image_Instance *p)
+mswindows_update_subwindow (Lisp_Image_Instance *p)
{
/* Now do widget specific updates. */
if (IMAGE_INSTANCE_TYPE (p) == IMAGE_WIDGET)
/* set the widget font from the widget face */
SendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
WM_SETFONT,
- (WPARAM)FONT_INSTANCE_MSWINDOWS_HFONT
- (XFONT_INSTANCE (query_string_font
- (IMAGE_INSTANCE_WIDGET_TEXT (p),
- IMAGE_INSTANCE_WIDGET_FACE (p),
- IMAGE_INSTANCE_SUBWINDOW_FRAME (p)))),
+ (WPARAM) mswindows_widget_hfont
+ (p, IMAGE_INSTANCE_SUBWINDOW_FRAME (p)),
MAKELPARAM (TRUE, 0));
}
}
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
struct device* d = XDEVICE (device);
Lisp_Object frame = FW_FRAME (domain);
}
static int
-mswindows_image_instance_equal (struct Lisp_Image_Instance *p1,
- struct Lisp_Image_Instance *p2, int depth)
+mswindows_image_instance_equal (Lisp_Image_Instance *p1,
+ Lisp_Image_Instance *p2, int depth)
{
switch (IMAGE_INSTANCE_TYPE (p1))
{
}
static unsigned long
-mswindows_image_instance_hash (struct Lisp_Image_Instance *p, int depth)
+mswindows_image_instance_hash (Lisp_Image_Instance *p, int depth)
{
switch (IMAGE_INSTANCE_TYPE (p))
{
methods are called. */
static void
-mswindows_initialize_dibitmap_image_instance (struct Lisp_Image_Instance *ii,
+mswindows_initialize_dibitmap_image_instance (Lisp_Image_Instance *ii,
int slices,
enum image_instance_type type)
{
CONST char* class, int flags, int exflags)
{
/* this function can call lisp */
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), style;
struct device* d = XDEVICE (device);
Lisp_Object frame = FW_FRAME (domain);
HWND wnd;
int id = 0xffff;
Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
- struct Lisp_Gui_Item* pgui = XGUI_ITEM (gui);
+ Lisp_Gui_Item* pgui = XGUI_ITEM (gui);
if (!DEVICE_MSWINDOWS_P (d))
signal_simple_error ("Not an mswindows device", device);
}
if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)))
- GET_C_STRING_OS_DATA_ALLOCA (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm);
+ TO_EXTERNAL_FORMAT (LISP_STRING, IMAGE_INSTANCE_WIDGET_TEXT (ii),
+ C_STRING_ALLOCA, nm,
+ Qnative);
/* allocate space for the clip window and then allocate the clip window */
ii->data = xnew_and_zero (struct mswindows_subwindow_data);
SetWindowLong (wnd, GWL_USERDATA, (LONG)LISP_TO_VOID(image_instance));
/* set the widget font from the widget face */
SendMessage (wnd, WM_SETFONT,
- (WPARAM)FONT_INSTANCE_MSWINDOWS_HFONT
- (XFONT_INSTANCE (query_string_font
- (IMAGE_INSTANCE_WIDGET_TEXT (ii),
- IMAGE_INSTANCE_WIDGET_FACE (ii),
- domain))),
+ (WPARAM) mswindows_widget_hfont (ii, domain),
MAKELPARAM (TRUE, 0));
}
int dest_mask, Lisp_Object domain)
{
/* this function can call lisp */
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
HWND wnd;
int flags = WS_TABSTOP;/* BS_NOTIFY #### is needed to get exotic feedback
only. Since we seem to want nothing beyond BN_CLICK,
the style is perhaps not necessary -- kkm */
Lisp_Object style;
Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
- struct Lisp_Gui_Item* pgui = XGUI_ITEM (gui);
+ Lisp_Gui_Item* pgui = XGUI_ITEM (gui);
Lisp_Object glyph = find_keyword_in_vector (instantiator, Q_image);
if (!NILP (glyph))
}
mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
- pointer_bg, dest_mask, domain, "BUTTON",
+ pointer_bg, dest_mask, domain, "BUTTON",
flags, 0);
wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
else
SendMessage (wnd, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
/* add the image if one was given */
- if (!NILP (glyph) && IMAGE_INSTANCEP (glyph))
+ if (!NILP (glyph) && IMAGE_INSTANCEP (glyph)
+ &&
+ IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (glyph)))
{
SendMessage (wnd, BM_SETIMAGE,
(WPARAM) (XIMAGE_INSTANCE_MSWINDOWS_BITMAP (glyph) ?
int dest_mask, Lisp_Object domain)
{
HWND wnd;
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
pointer_bg, dest_mask, domain, PROGRESS_CLASS,
WS_BORDER | PBS_SMOOTH, WS_EX_CLIENTEDGE);
{
tvitem.item.lParam = mswindows_register_gui_item (item, domain);
tvitem.item.mask |= TVIF_PARAM;
- GET_C_STRING_OS_DATA_ALLOCA (XGUI_ITEM (item)->name,
- tvitem.item.pszText);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XGUI_ITEM (item)->name,
+ C_STRING_ALLOCA, tvitem.item.pszText,
+ Qnative);
}
else
- GET_C_STRING_OS_DATA_ALLOCA (item, tvitem.item.pszText);
+ TO_EXTERNAL_FORMAT (LISP_STRING, item,
+ C_STRING_ALLOCA, tvitem.item.pszText,
+ Qnative);
tvitem.item.cchTextMax = strlen (tvitem.item.pszText);
Lisp_Object rest;
HWND wnd;
HTREEITEM parent;
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
pointer_bg, dest_mask, domain, WC_TREEVIEW,
WS_TABSTOP | WS_BORDER | PBS_SMOOTH
{
tvitem.lParam = mswindows_register_gui_item (item, domain);
tvitem.mask |= TCIF_PARAM;
- GET_C_STRING_OS_DATA_ALLOCA (XGUI_ITEM (item)->name,
- tvitem.pszText);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XGUI_ITEM (item)->name,
+ C_STRING_ALLOCA, tvitem.pszText,
+ Qnative);
}
else
{
CHECK_STRING (item);
- GET_C_STRING_OS_DATA_ALLOCA (item, tvitem.pszText);
+ TO_EXTERNAL_FORMAT (LISP_STRING, item,
+ C_STRING_ALLOCA, tvitem.pszText,
+ Qnative);
}
tvitem.cchTextMax = strlen (tvitem.pszText);
Lisp_Object rest;
HWND wnd;
int i = 0;
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object orient = find_keyword_in_vector (instantiator, Q_orientation);
unsigned int flags = WS_TABSTOP;
mswindows_tab_control_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (EQ (prop, Q_items))
{
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
HANDLE wnd;
Lisp_Object rest;
Lisp_Object data = Fplist_get (find_keyword_in_vector (instantiator, Q_properties),
height = (height + WIDGET_BORDER_HEIGHT * 2 ) * len;
IMAGE_INSTANCE_HEIGHT (ii) = height;
-
+
/* Now create the widget. */
mswindows_widget_instantiate (image_instance, instantiator, pointer_fg,
pointer_bg, dest_mask, domain, "COMBOBOX",
| CBS_HASSTRINGS | WS_VSCROLL,
WS_EX_CLIENTEDGE);
/* Reset the height. layout will probably do this safely, but better make sure. */
- image_instance_layout (image_instance,
+ image_instance_layout (image_instance,
IMAGE_UNSPECIFIED_GEOMETRY,
IMAGE_UNSPECIFIED_GEOMETRY,
domain);
LIST_LOOP (rest, Fplist_get (IMAGE_INSTANCE_WIDGET_PROPS (ii), Q_items, Qnil))
{
Extbyte* lparam;
- GET_C_STRING_OS_DATA_ALLOCA (XCAR (rest), lparam);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (rest),
+ C_STRING_ALLOCA, lparam,
+ Qnative);
if (SendMessage (wnd, CB_ADDSTRING, 0, (LPARAM)lparam) == CB_ERR)
signal_simple_error ("error adding combo entries", instantiator);
}
static Lisp_Object
mswindows_widget_property (Lisp_Object image_instance, Lisp_Object prop)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
HANDLE wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
/* get the text from a control */
if (EQ (prop, Q_text))
Extbyte* buf =alloca (len+1);
SendMessage (wnd, WM_GETTEXT, (WPARAM)len+1, (LPARAM) buf);
- return build_ext_string (buf, FORMAT_OS);
+ return build_ext_string (buf, Qnative);
}
return Qunbound;
}
static Lisp_Object
mswindows_button_property (Lisp_Object image_instance, Lisp_Object prop)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
HANDLE wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
/* check the state of a button */
if (EQ (prop, Q_selected))
static Lisp_Object
mswindows_combo_box_property (Lisp_Object image_instance, Lisp_Object prop)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
HANDLE wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
/* get the text from a control */
if (EQ (prop, Q_text))
Extcount len = SendMessage (wnd, CB_GETLBTEXTLEN, (WPARAM)item, 0);
Extbyte* buf = alloca (len+1);
SendMessage (wnd, CB_GETLBTEXT, (WPARAM)item, (LPARAM)buf);
- return build_ext_string (buf, FORMAT_OS);
+ return build_ext_string (buf, Qnative);
}
return Qunbound;
}
mswindows_widget_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (EQ (prop, Q_text))
{
Extbyte* lparam=0;
CHECK_STRING (val);
- GET_C_STRING_OS_DATA_ALLOCA (val, lparam);
+ TO_EXTERNAL_FORMAT (LISP_STRING, val,
+ C_STRING_ALLOCA, lparam,
+ Qnative);
SendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii),
WM_SETTEXT, 0, (LPARAM)lparam);
/* We don't return Qt here so that other widget methods can be
mswindows_progress_gauge_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (EQ (prop, Q_percent))
{
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_GLYPHS_MSW_H_
-#define _XEMACS_GLYPHS_MSW_H_
+#ifndef INCLUDED_glyphs_msw_h_
+#define INCLUDED_glyphs_msw_h_
#ifdef HAVE_MS_WINDOWS
IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i))
int
-mswindows_resize_dibitmap_instance (struct Lisp_Image_Instance* ii,
+mswindows_resize_dibitmap_instance (Lisp_Image_Instance* ii,
struct frame* f,
int newx, int newy);
HBITMAP
-mswindows_create_resized_bitmap (struct Lisp_Image_Instance* ii,
+mswindows_create_resized_bitmap (Lisp_Image_Instance* ii,
struct frame* f,
int newx, int newy);
HBITMAP
-mswindows_create_resized_mask (struct Lisp_Image_Instance* ii,
+mswindows_create_resized_mask (Lisp_Image_Instance* ii,
struct frame* f,
int newx, int newy);
void
-mswindows_initialize_image_instance_icon (struct Lisp_Image_Instance* image,
+mswindows_initialize_image_instance_icon (Lisp_Image_Instance* image,
int cursor);
#define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \
IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i))
#endif /* HAVE_MS_WINDOWS */
-#endif /* _XEMACS_GLYPHS_MSW_H_ */
+
+#endif /* INCLUDED_glyphs_msw_h_ */
#endif
/* TODO:
- - more complex controls.
- tooltips for controls, especially buttons.
+ - keyboard traversal.
+ - lisp configurable layout.
*/
/* In MS-Windows normal windows work in pixels, dialog boxes work in
static Lisp_Object
widget_property (Lisp_Object image_instance, Lisp_Object prop)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
struct image_instantiator_methods* meths;
/* first see if its a general property ... */
static Lisp_Object
widget_set_property (Lisp_Object image_instance, Lisp_Object prop, Lisp_Object val)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
struct image_instantiator_methods* meths;
Lisp_Object ret;
unsigned int* width, unsigned int* height,
enum image_instance_geometry disp, Lisp_Object domain)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
struct image_instantiator_methods* meths;
/* First just set up what we already have. */
widget_layout (Lisp_Object image_instance,
unsigned int width, unsigned int height, Lisp_Object domain)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
struct image_instantiator_methods* meths;
/* .. then try device specific methods ... */
}
static void
-initialize_widget_image_instance (struct Lisp_Image_Instance *ii, Lisp_Object type)
+initialize_widget_image_instance (Lisp_Image_Instance *ii, Lisp_Object type)
{
/* initialize_subwindow_image_instance (ii);*/
IMAGE_INSTANCE_WIDGET_TYPE (ii) = type;
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object face = find_keyword_in_vector (instantiator, Q_face);
Lisp_Object height = find_keyword_in_vector (instantiator, Q_height);
Lisp_Object width = find_keyword_in_vector (instantiator, Q_width);
Lisp_Object desc = find_keyword_in_vector (instantiator, Q_descriptor);
Lisp_Object glyph = find_keyword_in_vector (instantiator, Q_image);
Lisp_Object props = find_keyword_in_vector (instantiator, Q_properties);
+ Lisp_Object items = find_keyword_in_vector (instantiator, Q_items);
Lisp_Object orient = find_keyword_in_vector (instantiator, Q_orientation);
int pw=0, ph=0, tw=0, th=0;
subwindow_instantiate (image_instance, instantiator, pointer_fg, pointer_bg,
dest_mask, domain);
- if (!(dest_mask & IMAGE_WIDGET_MASK))
- incompatible_image_types (instantiator, dest_mask, IMAGE_WIDGET_MASK);
+ if (!(dest_mask & (IMAGE_WIDGET_MASK | IMAGE_LAYOUT_MASK)))
+ incompatible_image_types (instantiator, dest_mask,
+ IMAGE_WIDGET_MASK | IMAGE_LAYOUT_MASK);
initialize_widget_image_instance (ii, XVECTOR_DATA (instantiator)[0]);
+ IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET;
+ IMAGE_INSTANCE_WIDGET_PROPS (ii) = props;
+
/* retrieve the fg and bg colors */
if (!NILP (face))
SET_IMAGE_INSTANCE_WIDGET_FACE (ii, Fget_face (face));
- /* data items for some widgets */
- IMAGE_INSTANCE_WIDGET_PROPS (ii) = props;
+ /* Do layout specific initialisation. This feels a bit tacky, but
+ the alternative is a myriad of different little functions. */
+ if (EQ (IMAGE_INSTANCE_WIDGET_TYPE (ii), Qlayout))
+ {
+ Lisp_Object rest, children = Qnil;
+ Lisp_Object border = find_keyword_in_vector (instantiator, Q_border);
- /* Pick up the orientation before we do our first layout. */
- if (EQ (orient, Qleft) || EQ (orient, Qright) || EQ (orient, Qvertical))
- IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii) = 1;
+ if (NILP (orient))
+ {
+ IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii) = LAYOUT_VERTICAL;
+ }
+ IMAGE_INSTANCE_TYPE (ii) = IMAGE_LAYOUT;
+
+ if (EQ (border, Qt))
+ {
+ IMAGE_INSTANCE_LAYOUT_BORDER (ii) = Qetched_in;
+ }
+ else if (GLYPHP (border))
+ {
+ /* We are going to be sneaky here and add the border text as
+ just another child, the layout and output routines don't know
+ this and will just display at the offsets we prescribe. */
+ children = Fcons (glyph_image_instance (border, domain, ERROR_ME, 1),
+ children);
+ IMAGE_INSTANCE_LAYOUT_BORDER (ii) = make_int (0);
+ }
+ else
+ {
+ IMAGE_INSTANCE_LAYOUT_BORDER (ii) = border;
+ }
+ /* Pick up the sub-widgets. */
+ LIST_LOOP (rest, items)
+ {
+ /* make sure the image is instantiated */
+ Lisp_Object gii = glyph_image_instance (XCAR (rest), domain, ERROR_ME, 1);
+ children = Fcons (gii, children);
+ /* Make sure elements in the layout are in the order the
+ user expected. */
+ children = Fnreverse (children);
+ }
+ IMAGE_INSTANCE_LAYOUT_CHILDREN (ii) = children;
+ }
/* retrieve the gui item information. This is easy if we have been
provided with a vector, more difficult if we have just been given
keywords */
- if (STRINGP (desc) || NILP (desc))
+ else if (STRINGP (desc) || NILP (desc))
{
/* big cheat - we rely on the fact that a gui item looks like an instantiator */
IMAGE_INSTANCE_WIDGET_ITEMS (ii) =
IMAGE_INSTANCE_WIDGET_ITEMS (ii) =
gui_parse_item_keywords_no_errors (desc);
+ /* Pick up the orientation before we do our first layout. */
+ if (EQ (orient, Qleft) || EQ (orient, Qright) || EQ (orient, Qvertical))
+ IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii) = 1;
+
/* parse more gui items out of the properties */
- if (!NILP (props))
+ if (!NILP (props)
+ && !EQ (IMAGE_INSTANCE_WIDGET_TYPE (ii), Qlayout))
{
- Lisp_Object items = Fplist_get (props, Q_items, Qnil);
+ if (NILP (items))
+ {
+ items = Fplist_get (props, Q_items, Qnil);
+ }
if (!NILP (items))
- IMAGE_INSTANCE_WIDGET_ITEMS (ii) =
- Fcons (IMAGE_INSTANCE_WIDGET_ITEMS (ii),
- parse_gui_item_tree_children (items));
+ {
+ IMAGE_INSTANCE_WIDGET_ITEMS (ii) =
+ Fcons (IMAGE_INSTANCE_WIDGET_ITEMS (ii),
+ parse_gui_item_tree_children (items));
+ }
}
/* Normalize size information. We now only assign sizes if the user
IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii) = 0;
}
- /* have to set the type this late in case there is no device
- instantiation for a widget */
- IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET;
-
/* When we create the widgets the window system expects a valid
size, so If we still don' t have sizes, call layout to pick them
up. If query_geometry or layout relies on the widget being in
unsigned int* width, unsigned int* height,
enum image_instance_geometry disp, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object items = IMAGE_INSTANCE_WIDGET_ITEMS (ii);
unsigned int* width, unsigned int* height,
enum image_instance_geometry disp, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object items = IMAGE_INSTANCE_WIDGET_ITEMS (ii);
Lisp_Object rest;
unsigned int tw = 0, th = 0;
return inst;
}
-/* Instantiate a layout widget. Sizing commentary: we have a number of
- problems that we would like to address. Some consider some of these
- more important than others. Currently size information is
- determined at instantiation time and is then fixed forever
+/* Layout widget. Sizing commentary: we have a number of problems that
+ we would like to address. Some consider some of these more
+ important than others. It used to be that size information was
+ determined at instantiation time and was then fixed forever
after. Generally this is not what we want. Users want size to be
"big enough" to accommodate whatever they are trying to show and
this is dependent on text length, lines, font metrics etc. Of
Text glyphs are particularly troublesome since their metrics depend
on the context in which they are being viewed. For instance they
can appear differently depending on the window face, frame face or
- glyph face. All other glyphs are essentially fixed in
- appearance. Perhaps the problem is that text glyphs are cached on a
- device basis like most other glyphs. Instead they should be cached
- per-window and then the instance would be fixed and we wouldn't
- have to mess around with font metrics and the rest. */
+ glyph face. In order to simplify this text glyphs can now only have
+ a glyph-face or image-instance face. All other glyphs are
+ essentially fixed in appearance. Perhaps the problem is that text
+ glyphs are cached on a device basis like most other glyphs. Instead
+ they should be cached per-window and then the instance would be
+ fixed and we wouldn't have to mess around with font metrics and the
+ rest. */
+
+/* Query the geometry of a layout widget. We assume that we can only
+ get here if the size is not already fixed. */
static void
-layout_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
- Lisp_Object pointer_fg, Lisp_Object pointer_bg,
- int dest_mask, Lisp_Object domain)
+layout_query_geometry (Lisp_Object image_instance, unsigned int* width,
+ unsigned int* height, enum image_instance_geometry disp,
+ Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
- Lisp_Object rest, device = IMAGE_INSTANCE_DEVICE (ii);
- Lisp_Object frame = FW_FRAME (domain);
- Lisp_Object items = find_keyword_in_vector (instantiator, Q_items);
- Lisp_Object width = find_keyword_in_vector (instantiator, Q_pixel_width);
- Lisp_Object height = find_keyword_in_vector (instantiator, Q_pixel_height);
- Lisp_Object orient = find_keyword_in_vector (instantiator, Q_orientation);
- Lisp_Object justify = find_keyword_in_vector (instantiator, Q_justify);
- Lisp_Object border = find_keyword_in_vector (instantiator, Q_border);
- Lisp_Object children = Qnil;
- int pw = 0, ph = 0, x, y, maxph = 0, maxpw = 0, nitems = 0,
- horiz_spacing, vert_spacing, ph_adjust = 0;
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Object items = IMAGE_INSTANCE_LAYOUT_CHILDREN (ii), rest;
+ int maxph = 0, maxpw = 0, nitems = 0, ph_adjust = 0;
- if (NILP (frame))
- signal_simple_error ("No selected frame", device);
-
- if (!(dest_mask & IMAGE_LAYOUT_MASK))
- incompatible_image_types (instantiator, dest_mask, IMAGE_LAYOUT_MASK);
+ /* Flip through the items to work out how much stuff we have to display */
+ LIST_LOOP (rest, items)
+ {
+ Lisp_Object glyph = XCAR (rest);
+ unsigned int gheight, gwidth;
+
+ image_instance_query_geometry (glyph, &gwidth, &gheight, disp, domain);
- if (NILP (orient))
- orient = Qvertical;
+ /* Pick up the border text if we have one. */
+ if (INTP (IMAGE_INSTANCE_LAYOUT_BORDER (ii))
+ && NILP (XCDR (rest)))
+ {
+ ph_adjust = gheight / 2;
+ }
+ else
+ {
+
+ nitems ++;
+ if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_HORIZONTAL)
+ {
+ maxph = max (maxph, gheight);
+ maxpw += gwidth;
+ }
+ else
+ {
+ maxpw = max (maxpw, gwidth);
+ maxph += gheight;
+ }
+ }
+ }
- if (EQ (border, Qt))
- border = Qetched_in;
+ /* work out spacing between items and bounds of the layout. No user
+ provided width so we just do default spacing. */
+ if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_HORIZONTAL)
+ *width = maxpw + (nitems + 1) * WIDGET_BORDER_WIDTH * 2;
+ else
+ *width = maxpw + 2 * WIDGET_BORDER_WIDTH * 2;
- ii->data = 0;
- IMAGE_INSTANCE_TYPE (ii) = IMAGE_LAYOUT;
- IMAGE_INSTANCE_SUBWINDOW_ID (ii) = 0;
- IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii) = 0;
- IMAGE_INSTANCE_SUBWINDOW_FRAME (ii) = frame;
- IMAGE_INSTANCE_LAYOUT_BORDER (ii) = border;
+ /* Work out vertical spacings. */
+ if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_VERTICAL)
+ *height = maxph + (nitems + 1) * WIDGET_BORDER_HEIGHT * 2 + ph_adjust;
+ else
+ *height = maxph + 2 * WIDGET_BORDER_HEIGHT * 2 + ph_adjust;
+}
- /* normalize size information */
- if (!NILP (width))
- pw = XINT (width);
- if (!NILP (height))
- ph = XINT (height);
+
+static void
+layout_layout (Lisp_Object image_instance,
+ unsigned int width, unsigned int height, Lisp_Object domain)
+{
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Object rest;
+ Lisp_Object items = IMAGE_INSTANCE_LAYOUT_CHILDREN (ii);
+ int x, y, maxph = 0, maxpw = 0, nitems = 0,
+ horiz_spacing, vert_spacing, ph_adjust = 0;
+ unsigned int gheight, gwidth;
/* flip through the items to work out how much stuff we have to display */
LIST_LOOP (rest, items)
{
Lisp_Object glyph = XCAR (rest);
- int gheight = glyph_height (glyph, domain);
- int gwidth = glyph_width (glyph, domain);
- nitems ++;
- if (EQ (orient, Qhorizontal))
+
+ image_instance_query_geometry (glyph, &gwidth, &gheight,
+ IMAGE_DESIRED_GEOMETRY, domain);
+
+ /* Pick up the border text if we have one. */
+ if (INTP (IMAGE_INSTANCE_LAYOUT_BORDER (ii))
+ && NILP (XCDR (rest)))
{
- maxph = max (maxph, gheight);
- maxpw += gwidth;
+ XIMAGE_INSTANCE_XOFFSET (glyph) = 10; /* Really, what should this be? */
+ XIMAGE_INSTANCE_YOFFSET (glyph) = 0;
+ ph_adjust = gheight / 2;
+ IMAGE_INSTANCE_LAYOUT_BORDER (ii) = make_int (ph_adjust);
}
- else if (EQ (orient, Qvertical))
+ else
{
- maxpw = max (maxpw, gwidth);
- maxph += gheight;
+
+ nitems ++;
+ if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_HORIZONTAL)
+ {
+ maxph = max (maxph, gheight);
+ maxpw += gwidth;
+ }
+ else
+ {
+ maxpw = max (maxpw, gwidth);
+ maxph += gheight;
+ }
}
}
/* work out spacing between items and bounds of the layout */
- if (!pw)
- {
- /* No user provided width so we just do default spacing. */
- horiz_spacing = WIDGET_BORDER_WIDTH * 2;
- if (EQ (orient, Qhorizontal))
- pw = maxpw + (nitems + 1) * horiz_spacing;
- else
- pw = maxpw + 2 * horiz_spacing;
- }
- else if (pw < maxpw)
+ if (width < maxpw)
/* The user wants a smaller space than the largest item, so we
just provide default spacing and will let the output routines
clip.. */
horiz_spacing = WIDGET_BORDER_WIDTH * 2;
- else if (EQ (orient, Qhorizontal))
+ else if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_HORIZONTAL)
/* We have a larger area to display in so distribute the space
evenly. */
- horiz_spacing = (pw - maxpw) / (nitems + 1);
+ horiz_spacing = (width - maxpw) / (nitems + 1);
else
- horiz_spacing = (pw - maxpw) / 2;
+ horiz_spacing = (width - maxpw) / 2;
- /* Do the border now so that we can adjust the layout. */
- if (GLYPHP (border))
- {
- /* We are going to be sneaky here and add the border text as
- just another child, the layout and output routines don't know
- this and will just display at the offsets we prescribe. */
- Lisp_Object bglyph = glyph_image_instance (border, domain, ERROR_ME, 1);
-
- children = Fcons (bglyph, children);
- XIMAGE_INSTANCE_XOFFSET (bglyph) = 10; /* Really, what should this be? */
- XIMAGE_INSTANCE_YOFFSET (bglyph) = 0;
-
- ph_adjust = (glyph_height (border, domain) / 2);
- IMAGE_INSTANCE_LAYOUT_BORDER (ii) = make_int (ph_adjust);
- }
-
- /* Work out vertical spacings. */
- if (!ph)
- {
- vert_spacing = WIDGET_BORDER_HEIGHT * 2;
- if (EQ (orient, Qvertical))
- ph = maxph + (nitems + 1) * vert_spacing + ph_adjust;
- else
- ph = maxph + 2 * vert_spacing + ph_adjust;
- }
- else if (ph < maxph)
+ if (height < maxph)
vert_spacing = WIDGET_BORDER_HEIGHT * 2;
- else if (EQ (orient, Qvertical))
- vert_spacing = (ph - (maxph + ph_adjust)) / (nitems + 1);
+ else if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_VERTICAL)
+ vert_spacing = (height - (maxph + ph_adjust)) / (nitems + 1);
else
- vert_spacing = (ph - (maxph + ph_adjust)) / 2;
+ vert_spacing = (height - (maxph + ph_adjust)) / 2;
y = vert_spacing + ph_adjust;
x = horiz_spacing;
/* Now flip through putting items where we want them, paying
- attention to justification. */
+ attention to justification. Make sure we don't mess with the
+ border glyph. */
LIST_LOOP (rest, items)
{
- /* make sure the image is instantiated */
Lisp_Object glyph = XCAR (rest);
- Lisp_Object gii = glyph_image_instance (glyph, domain, ERROR_ME, 1);
- int gwidth = glyph_width (glyph, domain);
- int gheight = glyph_height (glyph, domain);
-
- children = Fcons (gii, children);
-
- if (EQ (orient, Qhorizontal))
- {
- if (EQ (justify, Qright))
- y = ph - (gheight + vert_spacing);
- else if (EQ (justify, Qcenter))
- y = (ph - gheight) / 2;
- }
- else if (EQ (orient, Qvertical))
- {
- if (EQ (justify, Qright))
- x = pw - (gwidth + horiz_spacing);
- else if (EQ (justify, Qcenter))
- x = (pw - gwidth) / 2;
- }
-
- XIMAGE_INSTANCE_XOFFSET (gii) = x;
- XIMAGE_INSTANCE_YOFFSET (gii) = y;
- if (EQ (orient, Qhorizontal))
- {
- x += (gwidth + horiz_spacing);
- }
- else if (EQ (orient, Qvertical))
- {
- y += (gheight + vert_spacing);
- }
+ image_instance_query_geometry (glyph, &gwidth, &gheight,
+ IMAGE_DESIRED_GEOMETRY, domain);
+
+ if (!INTP (IMAGE_INSTANCE_LAYOUT_BORDER (ii))
+ || !NILP (XCDR (rest)))
+ {
+ if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_HORIZONTAL)
+ {
+ if (IMAGE_INSTANCE_SUBWINDOW_JUSTIFY (ii)
+ == LAYOUT_JUSTIFY_RIGHT)
+ y = height - (gheight + vert_spacing);
+ if (IMAGE_INSTANCE_SUBWINDOW_JUSTIFY (ii)
+ == LAYOUT_JUSTIFY_CENTER)
+ y = (height - gheight) / 2;
+ }
+ else
+ {
+ if (IMAGE_INSTANCE_SUBWINDOW_JUSTIFY (ii)
+ == LAYOUT_JUSTIFY_RIGHT)
+ x = width - (gwidth + horiz_spacing);
+ if (IMAGE_INSTANCE_SUBWINDOW_JUSTIFY (ii)
+ == LAYOUT_JUSTIFY_CENTER)
+ x = (width - gwidth) / 2;
+ }
+
+ XIMAGE_INSTANCE_XOFFSET (glyph) = x;
+ XIMAGE_INSTANCE_YOFFSET (glyph) = y;
+
+ if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii)
+ == LAYOUT_HORIZONTAL)
+ {
+ x += (gwidth + horiz_spacing);
+ }
+ else
+ {
+ y += (gheight + vert_spacing);
+ }
+ }
+
+ /* Now layout subwidgets if they require it. */
+ image_instance_layout (glyph, gwidth, gheight, domain);
}
- IMAGE_INSTANCE_LAYOUT_CHILDREN (ii) = children;
- assert (pw && ph);
- IMAGE_INSTANCE_SUBWINDOW_WIDTH (ii) = pw;
- IMAGE_INSTANCE_SUBWINDOW_HEIGHT (ii) = ph;
+ IMAGE_INSTANCE_SUBWINDOW_WIDTH (ii) = width;
+ IMAGE_INSTANCE_SUBWINDOW_HEIGHT (ii) = height;
}
\f
defsymbol (&Qbevel_out, "bevel-out");
}
-void
-image_instantiator_format_create_glyphs_widget (void)
-{
-#define VALID_GUI_KEYWORDS(type) \
- IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_active, check_valid_anything); \
- IIFORMAT_VALID_KEYWORD (type, Q_suffix, check_valid_anything); \
- IIFORMAT_VALID_KEYWORD (type, Q_keys, check_valid_string); \
- IIFORMAT_VALID_KEYWORD (type, Q_style, check_valid_symbol); \
- IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_selected, check_valid_anything); \
- IIFORMAT_VALID_KEYWORD (type, Q_filter, check_valid_anything); \
- IIFORMAT_VALID_KEYWORD (type, Q_config, check_valid_symbol); \
- IIFORMAT_VALID_KEYWORD (type, Q_included, check_valid_anything); \
- IIFORMAT_VALID_KEYWORD (type, Q_key_sequence, check_valid_string); \
- IIFORMAT_VALID_KEYWORD (type, Q_accelerator, check_valid_string); \
- IIFORMAT_VALID_KEYWORD (type, Q_label, check_valid_anything); \
- IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_callback, check_valid_callback); \
- IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_descriptor, check_valid_string_or_vector)
-
-#define VALID_WIDGET_KEYWORDS(type) \
+#define VALID_GUI_KEYWORDS(type) do { \
+ IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_active, check_valid_anything); \
+ IIFORMAT_VALID_KEYWORD (type, Q_suffix, check_valid_anything); \
+ IIFORMAT_VALID_KEYWORD (type, Q_keys, check_valid_string); \
+ IIFORMAT_VALID_KEYWORD (type, Q_style, check_valid_symbol); \
+ IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_selected, check_valid_anything); \
+ IIFORMAT_VALID_KEYWORD (type, Q_filter, check_valid_anything); \
+ IIFORMAT_VALID_KEYWORD (type, Q_config, check_valid_symbol); \
+ IIFORMAT_VALID_KEYWORD (type, Q_included, check_valid_anything); \
+ IIFORMAT_VALID_KEYWORD (type, Q_key_sequence, check_valid_string); \
+ IIFORMAT_VALID_KEYWORD (type, Q_accelerator, check_valid_string); \
+ IIFORMAT_VALID_KEYWORD (type, Q_label, check_valid_anything); \
+ IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_callback, check_valid_callback); \
+ IIFORMAT_VALID_NONCOPY_KEYWORD (type, Q_descriptor, check_valid_string_or_vector); \
+} while (0)
+
+#define VALID_WIDGET_KEYWORDS(type) do { \
IIFORMAT_VALID_KEYWORD (type, Q_width, check_valid_int); \
IIFORMAT_VALID_KEYWORD (type, Q_height, check_valid_int); \
IIFORMAT_VALID_KEYWORD (type, Q_pixel_width, check_valid_int); \
IIFORMAT_VALID_KEYWORD (type, Q_pixel_height, check_valid_int); \
- IIFORMAT_VALID_KEYWORD (type, Q_face, check_valid_face)
+ IIFORMAT_VALID_KEYWORD (type, Q_face, check_valid_face); \
+} while (0)
- /* we only do this for properties */
+
+static void image_instantiator_widget (void)
+{ /* we only do this for properties */
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT_NO_SYM (widget, "widget");
IIFORMAT_HAS_METHOD (widget, property);
IIFORMAT_HAS_METHOD (widget, set_property);
IIFORMAT_HAS_METHOD (widget, query_geometry);
IIFORMAT_HAS_METHOD (widget, layout);
+}
- /* widget image-instantiator types - buttons */
+static void image_instantiator_buttons (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (button, "button");
IIFORMAT_HAS_SHARED_METHOD (button, validate, widget);
IIFORMAT_HAS_SHARED_METHOD (button, possible_dest_types, widget);
IIFORMAT_HAS_SHARED_METHOD (button, instantiate, widget);
IIFORMAT_HAS_SHARED_METHOD (button, normalize, widget);
- IIFORMAT_VALID_KEYWORD (button,
+ IIFORMAT_VALID_KEYWORD (button,
Q_image, check_valid_glyph_or_instantiator);
VALID_WIDGET_KEYWORDS (button);
VALID_GUI_KEYWORDS (button);
+}
- /* edit fields */
+static void image_instantiator_edit_fields (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (edit_field, "edit-field");
IIFORMAT_HAS_SHARED_METHOD (edit_field, validate, widget);
IIFORMAT_HAS_SHARED_METHOD (edit_field, possible_dest_types, widget);
IIFORMAT_HAS_SHARED_METHOD (edit_field, instantiate, widget);
VALID_WIDGET_KEYWORDS (edit_field);
VALID_GUI_KEYWORDS (edit_field);
+}
- /* combo box */
+static void image_instantiator_combo_box (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (combo_box, "combo-box");
IIFORMAT_HAS_METHOD (combo_box, validate);
IIFORMAT_HAS_SHARED_METHOD (combo_box, possible_dest_types, widget);
IIFORMAT_VALID_KEYWORD (combo_box, Q_pixel_width, check_valid_int);
IIFORMAT_VALID_KEYWORD (combo_box, Q_face, check_valid_face);
IIFORMAT_VALID_KEYWORD (combo_box, Q_properties, check_valid_item_list);
+}
- /* scrollbar */
+static void image_instantiator_scrollbar (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (scrollbar, "scrollbar");
IIFORMAT_HAS_SHARED_METHOD (scrollbar, validate, widget);
IIFORMAT_HAS_SHARED_METHOD (scrollbar, possible_dest_types, widget);
IIFORMAT_VALID_KEYWORD (scrollbar, Q_pixel_width, check_valid_int);
IIFORMAT_VALID_KEYWORD (scrollbar, Q_pixel_height, check_valid_int);
IIFORMAT_VALID_KEYWORD (scrollbar, Q_face, check_valid_face);
+}
- /* progress guage */
+static void image_instantiator_progress_guage (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (progress_gauge, "progress-gauge");
IIFORMAT_HAS_SHARED_METHOD (progress_gauge, validate, widget);
IIFORMAT_HAS_SHARED_METHOD (progress_gauge, possible_dest_types, widget);
IIFORMAT_HAS_SHARED_METHOD (progress_gauge, instantiate, widget);
VALID_WIDGET_KEYWORDS (progress_gauge);
VALID_GUI_KEYWORDS (progress_gauge);
+}
- /* tree view */
+static void image_instantiator_tree_view (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (tree_view, "tree-view");
IIFORMAT_HAS_SHARED_METHOD (tree_view, validate, combo_box);
IIFORMAT_HAS_SHARED_METHOD (tree_view, possible_dest_types, widget);
VALID_WIDGET_KEYWORDS (tree_view);
VALID_GUI_KEYWORDS (tree_view);
IIFORMAT_VALID_KEYWORD (tree_view, Q_properties, check_valid_item_list);
+}
- /* tab control */
+static void image_instantiator_tab_control (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (tab_control, "tab-control");
IIFORMAT_HAS_SHARED_METHOD (tab_control, validate, combo_box);
IIFORMAT_HAS_SHARED_METHOD (tab_control, possible_dest_types, widget);
VALID_GUI_KEYWORDS (tab_control);
IIFORMAT_VALID_KEYWORD (tab_control, Q_orientation, check_valid_tab_orientation);
IIFORMAT_VALID_KEYWORD (tab_control, Q_properties, check_valid_item_list);
+}
- /* labels */
+static void image_instantiator_labels (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (label, "label");
IIFORMAT_HAS_SHARED_METHOD (label, possible_dest_types, widget);
IIFORMAT_HAS_SHARED_METHOD (label, instantiate, widget);
VALID_WIDGET_KEYWORDS (label);
IIFORMAT_VALID_KEYWORD (label, Q_descriptor, check_valid_string);
+}
- /* layout */
+static void image_instantiator_layout (void)
+{
INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (layout, "layout");
IIFORMAT_HAS_METHOD (layout, possible_dest_types);
- IIFORMAT_HAS_METHOD (layout, instantiate);
+ IIFORMAT_HAS_SHARED_METHOD (layout, instantiate, widget);
IIFORMAT_HAS_METHOD (layout, normalize);
+ IIFORMAT_HAS_METHOD (layout, query_geometry);
+ IIFORMAT_HAS_METHOD (layout, layout);
IIFORMAT_VALID_KEYWORD (layout, Q_pixel_width, check_valid_int);
IIFORMAT_VALID_KEYWORD (layout, Q_pixel_height, check_valid_int);
IIFORMAT_VALID_KEYWORD (layout, Q_orientation, check_valid_orientation);
IIFORMAT_VALID_KEYWORD (layout, Q_justify, check_valid_justification);
IIFORMAT_VALID_KEYWORD (layout, Q_border, check_valid_border);
- IIFORMAT_VALID_KEYWORD (layout, Q_items,
+ IIFORMAT_VALID_KEYWORD (layout, Q_items,
check_valid_glyph_or_instantiator_list);
}
void
+image_instantiator_format_create_glyphs_widget (void)
+{
+ image_instantiator_widget();
+ image_instantiator_buttons();
+ image_instantiator_edit_fields();
+ image_instantiator_combo_box();
+ image_instantiator_scrollbar();
+ image_instantiator_progress_guage();
+ image_instantiator_tree_view();
+ image_instantiator_tab_control();
+ image_instantiator_labels();
+ image_instantiator_layout();
+}
+
+void
reinit_vars_of_glyphs_widget (void)
{
#ifdef DEBUG_WIDGETS
#ifdef HAVE_WIDGETS
static void
update_widget_face (widget_value* wv,
- struct Lisp_Image_Instance* ii, Lisp_Object domain);
+ Lisp_Image_Instance* ii, Lisp_Object domain);
static void
update_tab_widget_face (widget_value* wv,
- struct Lisp_Image_Instance* ii, Lisp_Object domain);
+ Lisp_Image_Instance* ii, Lisp_Object domain);
#endif
#include "bitmaps.h"
*pixtbl = xnew_array (unsigned long, pixcount);
*npixels = 0;
- /* ### should implement a sort by popularity to assure proper allocation */
+ /* #### should implement a sort by popularity to assure proper allocation */
n = *npixels;
for (i = 0; i < qtable->num_active_colors; i++)
{
static void
-x_print_image_instance (struct Lisp_Image_Instance *p,
+x_print_image_instance (Lisp_Image_Instance *p,
Lisp_Object printcharfun,
int escapeflag)
{
#endif
static void
-x_finalize_image_instance (struct Lisp_Image_Instance *p)
+x_finalize_image_instance (Lisp_Image_Instance *p)
{
if (!p->data)
return;
}
static int
-x_image_instance_equal (struct Lisp_Image_Instance *p1,
- struct Lisp_Image_Instance *p2, int depth)
+x_image_instance_equal (Lisp_Image_Instance *p1,
+ Lisp_Image_Instance *p2, int depth)
{
switch (IMAGE_INSTANCE_TYPE (p1))
{
}
static unsigned long
-x_image_instance_hash (struct Lisp_Image_Instance *p, int depth)
+x_image_instance_hash (Lisp_Image_Instance *p, int depth)
{
switch (IMAGE_INSTANCE_TYPE (p))
{
methods are called. */
static void
-x_initialize_pixmap_image_instance (struct Lisp_Image_Instance *ii,
+x_initialize_pixmap_image_instance (Lisp_Image_Instance *ii,
int slices,
enum image_instance_type type)
{
(XSTRING_BYTE (name, 2) == '/')))))
{
if (!NILP (Ffile_readable_p (name)))
- return name;
+ return Fexpand_file_name (name, Qnil);
else
return Qnil;
}
Use the same code as for `xpm'. */
static void
-init_image_instance_from_x_image (struct Lisp_Image_Instance *ii,
+init_image_instance_from_x_image (Lisp_Image_Instance *ii,
XImage *ximage,
int dest_mask,
Colormap cmap,
}
static void
-image_instance_add_x_image (struct Lisp_Image_Instance *ii,
+image_instance_add_x_image (Lisp_Image_Instance *ii,
XImage *ximage,
int slice,
Lisp_Object instantiator)
}
static void
-x_init_image_instance_from_eimage (struct Lisp_Image_Instance *ii,
+x_init_image_instance_from_eimage (Lisp_Image_Instance *ii,
int width, int height,
int slices,
unsigned char *eimage,
image instance accordingly. */
static void
-init_image_instance_from_xbm_inline (struct Lisp_Image_Instance *ii,
+init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii,
int width, int height,
/* Note that data is in ext-format! */
CONST char *bits,
{
Lisp_Object mask_data = find_keyword_in_vector (instantiator, Q_mask_data);
Lisp_Object mask_file = find_keyword_in_vector (instantiator, Q_mask_file);
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Pixmap mask = 0;
- CONST char *gcc_may_you_rot_in_hell;
if (!NILP (mask_data))
{
- GET_C_STRING_BINARY_DATA_ALLOCA (XCAR (XCDR (XCDR (mask_data))),
- gcc_may_you_rot_in_hell);
- mask =
- pixmap_from_xbm_inline (IMAGE_INSTANCE_DEVICE (ii),
- XINT (XCAR (mask_data)),
- XINT (XCAR (XCDR (mask_data))),
- (CONST unsigned char *)
- gcc_may_you_rot_in_hell);
+ CONST char *ext_data;
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (XCDR (XCDR (mask_data))),
+ C_STRING_ALLOCA, ext_data,
+ Qbinary);
+ mask = pixmap_from_xbm_inline (IMAGE_INSTANCE_DEVICE (ii),
+ XINT (XCAR (mask_data)),
+ XINT (XCAR (XCDR (mask_data))),
+ (CONST unsigned char *) ext_data);
}
init_image_instance_from_xbm_inline (ii, width, height, bits,
int dest_mask, Lisp_Object domain)
{
Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
- CONST char *gcc_go_home;
+ CONST char *ext_data;
assert (!NILP (data));
- GET_C_STRING_BINARY_DATA_ALLOCA (XCAR (XCDR (XCDR (data))),
- gcc_go_home);
+ TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (XCDR (XCDR (data))),
+ C_STRING_ALLOCA, ext_data,
+ Qbinary);
xbm_instantiate_1 (image_instance, instantiator, pointer_fg,
pointer_bg, dest_mask, XINT (XCAR (data)),
- XINT (XCAR (XCDR (data))), gcc_go_home);
+ XINT (XCAR (XCDR (data))), ext_data);
}
\f
int dest_mask, Lisp_Object domain)
{
/* This function can GC */
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
Display *dpy;
assert (!NILP (data));
- GET_C_STRING_BINARY_DATA_ALLOCA (data, dstring);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ C_STRING_ALLOCA, dstring,
+ Qbinary);
if ((p = strchr (dstring, ':')))
{
if (dest_mask & IMAGE_POINTER_MASK)
{
CONST char *name_ext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (data, name_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ C_STRING_ALLOCA, name_ext,
+ Qfile_name);
if (XmuCursorNameToIndex (name_ext) != -1)
{
result = alist_to_tagged_vector (Qcursor_font, alist);
{
/* This function can GC */
Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
Display *dpy;
XColor fg, bg;
{
/* This function can GC */
Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
Display *dpy;
int i;
if (!(dest_mask & IMAGE_POINTER_MASK))
incompatible_image_types (instantiator, dest_mask, IMAGE_POINTER_MASK);
- GET_C_STRING_FILENAME_DATA_ALLOCA (data, name_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ C_STRING_ALLOCA, name_ext,
+ Qfile_name);
if ((i = XmuCursorNameToIndex (name_ext)) == -1)
signal_simple_error ("Unrecognized cursor-font name", data);
x_colorize_image_instance (Lisp_Object image_instance,
Lisp_Object foreground, Lisp_Object background)
{
- struct Lisp_Image_Instance *p;
+ Lisp_Image_Instance *p;
p = XIMAGE_INSTANCE (image_instance);
/* unmap the image if it is a widget. This is used by redisplay via
redisplay_unmap_subwindows */
static void
-x_unmap_subwindow (struct Lisp_Image_Instance *p)
+x_unmap_subwindow (Lisp_Image_Instance *p)
{
if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
{
/* map the subwindow. This is used by redisplay via
redisplay_output_subwindow */
static void
-x_map_subwindow (struct Lisp_Image_Instance *p, int x, int y,
+x_map_subwindow (Lisp_Image_Instance *p, int x, int y,
struct display_glyph_area* dga)
{
if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
/* when you click on a widget you may activate another widget this
needs to be checked and all appropriate widgets updated */
static void
-x_update_subwindow (struct Lisp_Image_Instance *p)
+x_update_subwindow (Lisp_Image_Instance *p)
{
#ifdef HAVE_WIDGETS
if (IMAGE_INSTANCE_TYPE (p) == IMAGE_WIDGET)
int dest_mask, Lisp_Object domain)
{
/* This function can GC */
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
Lisp_Object frame = FW_FRAME (domain);
struct frame* f = XFRAME (frame);
(subwindow, property, data))
{
Atom property_atom;
- struct Lisp_Subwindow *sw;
+ Lisp_Subwindow *sw;
Display *dpy;
CHECK_SUBWINDOW (subwindow);
#endif
static void
-x_resize_subwindow (struct Lisp_Image_Instance* ii, int w, int h)
+x_resize_subwindow (Lisp_Image_Instance* ii, int w, int h)
{
if (IMAGE_INSTANCE_TYPE (ii) == IMAGE_SUBWINDOW)
{
{
Arg al[2];
- if (!XtIsRealized (IMAGE_INSTANCE_X_WIDGET_ID (ii)))
+ if ( !XtIsManaged(IMAGE_INSTANCE_X_WIDGET_ID (ii))
+ ||
+ IMAGE_INSTANCE_X_WIDGET_ID (ii)->core.being_destroyed )
{
Lisp_Object sw;
XSETIMAGE_INSTANCE (sw, ii);
- signal_simple_error ("XEmacs bug: subwindow is not realized", sw);
+ signal_simple_error ("XEmacs bug: subwindow is deleted", sw);
}
XtSetArg (al [0], XtNwidth, (Dimension)w);
/************************************************************************/
static void
-update_widget_face (widget_value* wv, struct Lisp_Image_Instance *ii,
+update_widget_face (widget_value* wv, Lisp_Image_Instance *ii,
Lisp_Object domain)
{
#ifdef LWLIB_WIDGETS_MOTIF
}
static void
-update_tab_widget_face (widget_value* wv, struct Lisp_Image_Instance *ii,
+update_tab_widget_face (widget_value* wv, Lisp_Image_Instance *ii,
Lisp_Object domain)
{
if (wv->contents)
int dest_mask, Lisp_Object domain,
CONST char* type, widget_value* wv)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), pixel;
struct device* d = XDEVICE (device);
Lisp_Object frame = FW_FRAME (domain);
IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET;
if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)))
- GET_C_STRING_OS_DATA_ALLOCA (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm);
+ TO_EXTERNAL_FORMAT (LISP_STRING, IMAGE_INSTANCE_WIDGET_TEXT (ii),
+ C_STRING_ALLOCA, nm,
+ Qnative);
ii->data = xnew_and_zero (struct x_subwindow_data);
x_widget_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
/* Modify the text properties of the widget */
if (EQ (prop, Q_text))
char* str;
widget_value* wv = lw_get_all_values (IMAGE_INSTANCE_X_WIDGET_LWID (ii));
CHECK_STRING (val);
- GET_C_STRING_OS_DATA_ALLOCA (val, str);
+ TO_EXTERNAL_FORMAT (LISP_STRING, val,
+ C_STRING_ALLOCA, str,
+ Qnative);
wv->value = str;
lw_modify_all_widgets (IMAGE_INSTANCE_X_WIDGET_LWID (ii), wv, False);
}
static Lisp_Object
x_widget_property (Lisp_Object image_instance, Lisp_Object prop)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
/* get the text from a control */
if (EQ (prop, Q_text))
{
widget_value* wv = lw_get_all_values (IMAGE_INSTANCE_X_WIDGET_LWID (ii));
- return build_ext_string (wv->value, FORMAT_OS);
+ return build_ext_string (wv->value, Qnative);
}
return Qunbound;
}
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
Lisp_Object glyph = find_keyword_in_vector (instantiator, Q_image);
widget_value* wv = xmalloc_widget_value ();
pointer_bg, dest_mask, domain, "button", wv);
/* add the image if one was given */
- if (!NILP (glyph) && IMAGE_INSTANCEP (glyph))
+ if (!NILP (glyph) && IMAGE_INSTANCEP (glyph)
+ && IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (glyph)))
{
Arg al [2];
int ac =0;
static Lisp_Object
x_button_property (Lisp_Object image_instance, Lisp_Object prop)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
/* check the state of a button */
if (EQ (prop, Q_selected))
{
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
widget_value* wv = xmalloc_widget_value ();
x_progress_gauge_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (EQ (prop, Q_percent))
{
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
widget_value* wv = xmalloc_widget_value ();
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
widget_value * wv = 0;
/* This is not done generically because of sizing problems under
mswindows. */
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
widget_value * wv =
gui_items_to_widget_values (IMAGE_INSTANCE_WIDGET_ITEMS (ii));
x_tab_control_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (EQ (prop, Q_items))
{
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
widget_value* wv = xmalloc_widget_value ();
make_int (name##_height), \
make_ext_string (name##_bits, \
sizeof (name##_bits), \
- FORMAT_BINARY))), \
+ Qbinary))), \
Qglobal, Qx, Qnil)
BUILD_GLYPH_INST (Vtruncation_glyph, truncator);
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_GLYPHS_X_H_
-#define _XEMACS_GLYPHS_X_H_
+#ifndef INCLUDED_glyphs_x_h_
+#define INCLUDED_glyphs_x_h_
#include "glyphs.h"
((Widget) IMAGE_INSTANCE_SUBWINDOW_ID (i))
#endif /* HAVE_X_WINDOWS */
-#endif /* _XEMACS_GLYPHS_X_H_ */
+#endif /* INCLUDED_glyphs_x_h_ */
if ((NILP (d) && NILP (device))
||
(!NILP (device) &&
- EQ (CONSOLE_TYPE (XCONSOLE
+ EQ (CONSOLE_TYPE (XCONSOLE
(DEVICE_CONSOLE (XDEVICE (device)))), d)))
return Dynarr_at (the_image_instantiator_format_entry_dynarr, i).meths;
}
struct image_instantiator_methods *meths;
GCPRO1 (instantiator);
-
+
meths = decode_image_instantiator_format (XVECTOR_DATA (instantiator)[0],
ERROR_ME);
RETURN_UNGCPRO (IIFORMAT_METH_OR_GIVEN (meths, normalize,
methp = (int)HAS_IIFORMAT_METH_P (meths, instantiate);
MAYBE_IIFORMAT_METH (meths, instantiate, (ii, instantiator, pointer_fg,
pointer_bg, dest_mask, domain));
-
+
/* now do device specific instantiation */
meths = decode_device_ii_format (device, XVECTOR_DATA (instantiator)[0],
ERROR_ME_NOT);
static Lisp_Object
mark_image_instance (Lisp_Object obj)
{
- struct Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj);
+ Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj);
mark_object (i->name);
/* We don't mark the glyph reference since that would create a
break;
case IMAGE_WIDGET:
+ case IMAGE_LAYOUT:
mark_object (IMAGE_INSTANCE_WIDGET_TYPE (i));
mark_object (IMAGE_INSTANCE_WIDGET_PROPS (i));
mark_object (IMAGE_INSTANCE_WIDGET_FACE (i));
mark_object (IMAGE_INSTANCE_SUBWINDOW_FRAME (i));
break;
- case IMAGE_LAYOUT:
- mark_object (IMAGE_INSTANCE_LAYOUT_CHILDREN (i));
- mark_object (IMAGE_INSTANCE_LAYOUT_BORDER (i));
- mark_object (IMAGE_INSTANCE_SUBWINDOW_FRAME (i));
- break;
-
default:
break;
}
int escapeflag)
{
char buf[100];
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (obj);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (obj);
if (print_readably)
error ("printing unreadable object #<image-instance 0x%x>",
write_c_string (" on #<", printcharfun);
{
struct frame* f = XFRAME (IMAGE_INSTANCE_SUBWINDOW_FRAME (ii));
-
+
if (!FRAME_LIVE_P (f))
write_c_string ("dead", printcharfun);
- else
+ else
write_c_string (DEVICE_TYPE_NAME (XDEVICE (FRAME_DEVICE (f))),
printcharfun);
write_c_string (">", printcharfun);
sprintf (buf, " 0x%p", IMAGE_INSTANCE_SUBWINDOW_ID (ii));
write_c_string (buf, printcharfun);
-
+
break;
default:
static void
finalize_image_instance (void *header, int for_disksave)
{
- struct Lisp_Image_Instance *i = (struct Lisp_Image_Instance *) header;
+ Lisp_Image_Instance *i = (Lisp_Image_Instance *) header;
if (IMAGE_INSTANCE_TYPE (i) == IMAGE_NOTHING)
/* objects like this exist at dump time, so don't bomb out. */
||
IMAGE_INSTANCE_TYPE (i) == IMAGE_SUBWINDOW)
{
- MARK_FRAME_SUBWINDOWS_CHANGED
+ MARK_FRAME_SUBWINDOWS_CHANGED
(XFRAME (IMAGE_INSTANCE_SUBWINDOW_FRAME (i)));
}
static int
image_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Image_Instance *i1 = XIMAGE_INSTANCE (obj1);
- struct Lisp_Image_Instance *i2 = XIMAGE_INSTANCE (obj2);
+ Lisp_Image_Instance *i1 = XIMAGE_INSTANCE (obj1);
+ Lisp_Image_Instance *i2 = XIMAGE_INSTANCE (obj2);
struct device *d1 = XDEVICE (i1->device);
struct device *d2 = XDEVICE (i2->device);
break;
case IMAGE_WIDGET:
+ case IMAGE_LAYOUT:
if (!(EQ (IMAGE_INSTANCE_WIDGET_TYPE (i1),
IMAGE_INSTANCE_WIDGET_TYPE (i2))
&& IMAGE_INSTANCE_SUBWINDOW_ID (i1) ==
))
return 0;
break;
-
- case IMAGE_LAYOUT:
- if (IMAGE_INSTANCE_TYPE (i1) == IMAGE_LAYOUT
- &&
- !(EQ (IMAGE_INSTANCE_LAYOUT_BORDER (i1),
- IMAGE_INSTANCE_LAYOUT_BORDER (i2))
- &&
- internal_equal (IMAGE_INSTANCE_LAYOUT_CHILDREN (i1),
- IMAGE_INSTANCE_LAYOUT_CHILDREN (i2),
- depth + 1)))
- return 0;
- break;
-
+
case IMAGE_SUBWINDOW:
if (!(IMAGE_INSTANCE_SUBWINDOW_ID (i1) ==
IMAGE_INSTANCE_SUBWINDOW_ID (i2)))
static unsigned long
image_instance_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj);
+ Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj);
struct device *d = XDEVICE (i->device);
unsigned long hash = HASH3 ((unsigned long) d,
IMAGE_INSTANCE_WIDTH (i),
break;
case IMAGE_WIDGET:
- hash = HASH4 (hash,
+ case IMAGE_LAYOUT:
+ hash = HASH4 (hash,
internal_hash (IMAGE_INSTANCE_WIDGET_TYPE (i), depth + 1),
internal_hash (IMAGE_INSTANCE_WIDGET_PROPS (i), depth + 1),
internal_hash (IMAGE_INSTANCE_WIDGET_ITEMS (i), depth + 1));
hash = HASH2 (hash, (int) IMAGE_INSTANCE_SUBWINDOW_ID (i));
break;
- case IMAGE_LAYOUT:
- hash = HASH3 (hash,
- internal_hash (IMAGE_INSTANCE_LAYOUT_BORDER (i), depth + 1),
- internal_hash (IMAGE_INSTANCE_LAYOUT_CHILDREN (i),
- depth + 1));
- break;
-
default:
abort ();
}
mark_image_instance, print_image_instance,
finalize_image_instance, image_instance_equal,
image_instance_hash, 0,
- struct Lisp_Image_Instance);
+ Lisp_Image_Instance);
static Lisp_Object
allocate_image_instance (Lisp_Object device, Lisp_Object glyph)
{
- struct Lisp_Image_Instance *lp =
- alloc_lcrecord_type (struct Lisp_Image_Instance, &lrecord_image_instance);
+ Lisp_Image_Instance *lp =
+ alloc_lcrecord_type (Lisp_Image_Instance, &lrecord_image_instance);
Lisp_Object val;
zero_lcrecord (lp);
NO-ERROR controls what happens when the image cannot be generated.
If nil, an error message is generated. If t, no messages are
generated and this function returns nil. If anything else, a warning
-message is generated and this function returns nil.
+message is generated and this function returns nil.
*/
(data, device, dest_types, no_error))
{
}
DEFUN ("image-instance-property", Fimage_instance_property, 2, 2, 0, /*
-Return the given property of the given image instance.
+Return the given property of the given image instance.
Returns nil if the property or the property method do not exist for
-the image instance in the domain.
+the image instance in the domain.
*/
(image_instance, prop))
{
- struct Lisp_Image_Instance* ii;
+ Lisp_Image_Instance* ii;
Lisp_Object type, ret;
struct image_instantiator_methods* meths;
/* ... then try device specific methods ... */
type = encode_image_instance_type (IMAGE_INSTANCE_TYPE (ii));
- meths = decode_device_ii_format (IMAGE_INSTANCE_DEVICE (ii),
+ meths = decode_device_ii_format (IMAGE_INSTANCE_DEVICE (ii),
type, ERROR_ME_NOT);
if (meths && HAS_IIFORMAT_METH_P (meths, property)
- &&
+ &&
!UNBOUNDP (ret = IIFORMAT_METH (meths, property, (image_instance, prop))))
{
return ret;
}
DEFUN ("set-image-instance-property", Fset_image_instance_property, 3, 3, 0, /*
-Set the given property of the given image instance.
+Set the given property of the given image instance.
Does nothing if the property or the property method do not exist for
the image instance in the domain.
*/
(image_instance, prop, val))
{
- struct Lisp_Image_Instance* ii;
+ Lisp_Image_Instance* ii;
Lisp_Object type, ret;
struct image_instantiator_methods* meths;
ii = XIMAGE_INSTANCE (image_instance);
type = encode_image_instance_type (IMAGE_INSTANCE_TYPE (ii));
/* try device specific methods first ... */
- meths = decode_device_ii_format (IMAGE_INSTANCE_DEVICE (ii),
+ meths = decode_device_ii_format (IMAGE_INSTANCE_DEVICE (ii),
type, ERROR_ME_NOT);
if (meths && HAS_IIFORMAT_METH_P (meths, set_property)
&&
- !UNBOUNDP (ret =
+ !UNBOUNDP (ret =
IIFORMAT_METH (meths, set_property, (image_instance, prop, val))))
{
val = ret;
meths = decode_device_ii_format (Qnil, type, ERROR_ME_NOT);
if (meths && HAS_IIFORMAT_METH_P (meths, set_property)
&&
- !UNBOUNDP (ret =
+ !UNBOUNDP (ret =
IIFORMAT_METH (meths, set_property, (image_instance, prop, val))))
{
val = ret;
}
}
- /* Make sure the image instance gets redisplayed. */
+ /* Make sure the image instance gets redisplayed.
+
+ ### This currently does not change the dirty state of an
+ enclosing layout which may be bad. */
MARK_IMAGE_INSTANCE_CHANGED (ii);
MARK_SUBWINDOWS_STATE_CHANGED;
MARK_GLYPHS_CHANGED;
case IMAGE_WIDGET:
return FACE_FOREGROUND (
XIMAGE_INSTANCE_WIDGET_FACE (image_instance),
- XIMAGE_INSTANCE_SUBWINDOW_FRAME
+ XIMAGE_INSTANCE_SUBWINDOW_FRAME
(image_instance));
default:
case IMAGE_WIDGET:
return FACE_BACKGROUND (
XIMAGE_INSTANCE_WIDGET_FACE (image_instance),
- XIMAGE_INSTANCE_SUBWINDOW_FRAME
+ XIMAGE_INSTANCE_SUBWINDOW_FRAME
(image_instance));
default:
/* Find out desired geometry of the image instance. If there is no
special function then just return the width and / or height. */
void
-image_instance_query_geometry (Lisp_Object image_instance,
- unsigned int* width, unsigned int* height,
+image_instance_query_geometry (Lisp_Object image_instance,
+ unsigned int* width, unsigned int* height,
enum image_instance_geometry disp,
Lisp_Object domain)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object type;
struct image_instantiator_methods* meths;
type = encode_image_instance_type (IMAGE_INSTANCE_TYPE (ii));
meths = decode_device_ii_format (Qnil, type, ERROR_ME_NOT);
-
+
if (meths && HAS_IIFORMAT_METH_P (meths, query_geometry))
{
- IIFORMAT_METH (meths, query_geometry, (image_instance, width, height,
+ IIFORMAT_METH (meths, query_geometry, (image_instance, width, height,
disp, domain));
}
else
don't mind what size you have (normal widgets) and one where you
want to specifiy something (layout widgets). */
void
-image_instance_layout (Lisp_Object image_instance,
- unsigned int width, unsigned int height,
+image_instance_layout (Lisp_Object image_instance,
+ unsigned int width, unsigned int height,
Lisp_Object domain)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object type;
struct image_instantiator_methods* meths;
/* Get the desired geometry. */
if (meths && HAS_IIFORMAT_METH_P (meths, query_geometry))
{
- IIFORMAT_METH (meths, query_geometry, (image_instance, &dwidth, &dheight,
- IMAGE_DESIRED_GEOMETRY,
+ IIFORMAT_METH (meths, query_geometry, (image_instance, &dwidth, &dheight,
+ IMAGE_DESIRED_GEOMETRY,
domain));
}
else
we set the glyph geometry and lay it out. */
IMAGE_INSTANCE_WIDTH (ii) = width;
IMAGE_INSTANCE_HEIGHT (ii) = height;
-
+
if (meths && HAS_IIFORMAT_METH_P (meths, layout))
{
IIFORMAT_METH (meths, layout, (image_instance, width, height, domain));
}
/* else no change to the geometry. */
+
+ XIMAGE_INSTANCE_DIRTYP (image_instance) = 0;
+}
+
+/*
+ * Mark image instance in W as dirty if (a) W's faces have changed and
+ * (b) GLYPH_OR_II instance in W is a string.
+ *
+ * Return non-zero if instance has been marked dirty.
+ */
+int
+invalidate_glyph_geometry_maybe (Lisp_Object glyph_or_ii, struct window* w)
+{
+ if (XFRAME(WINDOW_FRAME(w))->faces_changed)
+ {
+ Lisp_Object image = glyph_or_ii;
+
+ if (GLYPHP (glyph_or_ii))
+ {
+ Lisp_Object window;
+ XSETWINDOW (window, w);
+ image = glyph_image_instance (glyph_or_ii, window, ERROR_ME_NOT, 1);
+ }
+
+ if (TEXT_IMAGE_INSTANCEP (image))
+ {
+ XIMAGE_INSTANCE_DIRTYP (image) = 1;
+ if (GLYPHP (glyph_or_ii))
+ XGLYPH_DIRTYP (glyph_or_ii) = 1;
+ return 1;
+ }
+ }
+
+ return 0;
}
\f
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (dest_mask & IMAGE_NOTHING_MASK)
IMAGE_INSTANCE_TYPE (ii) = IMAGE_NOTHING;
int dest_mask, Lisp_Object domain)
{
Lisp_Object string = find_keyword_in_vector (instantiator, Q_data);
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
-
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+
/* Should never get here with a domain other than a window. */
assert (!NILP (string) && WINDOWP (domain));
if (dest_mask & IMAGE_TEXT_MASK)
helper that is used elsewhere for calculating text geometry. */
void
query_string_geometry (Lisp_Object string, Lisp_Object face,
- unsigned int* width, unsigned int* height,
+ unsigned int* width, unsigned int* height,
unsigned int* descent, Lisp_Object domain)
{
struct font_metric_info fm;
find_charsets_in_bufbyte_string (charsets,
XSTRING_DATA (string),
XSTRING_LENGTH (string));
-
+
/* Fallback to the default face if none was provided. */
if (!NILP (face))
{
{
cachel = WINDOW_FACE_CACHEL (XWINDOW (domain), DEFAULT_INDEX);
}
-
+
ensure_face_cachel_complete (cachel, domain, charsets);
face_cachel_charset_font_metric_info (cachel, charsets, &fm);
-
+
*height = fm.ascent + fm.descent;
/* #### descent only gets set if we query the height as well. */
if (descent)
*descent = fm.descent;
}
-
+
/* Compute width */
if (width)
{
find_charsets_in_bufbyte_string (charsets,
XSTRING_DATA (string),
XSTRING_LENGTH (string));
-
+
reset_face_cachel (&frame_cachel);
update_face_cachel_data (&frame_cachel, frame, face);
cachel = &frame_cachel;
ensure_face_cachel_complete (cachel, domain, charsets);
-
+
for (i = 0; i < NUM_LEADING_BYTES; i++)
{
if (charsets[i])
{
- return FACE_CACHEL_FONT (cachel,
- CHARSET_BY_LEADING_BYTE (i +
+ return FACE_CACHEL_FONT (cachel,
+ CHARSET_BY_LEADING_BYTE (i +
MIN_LEADING_BYTE));
- }
+ }
}
return Qnil; /* NOT REACHED */
static void
text_query_geometry (Lisp_Object image_instance,
- unsigned int* width, unsigned int* height,
+ unsigned int* width, unsigned int* height,
enum image_instance_geometry disp, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
unsigned int descent = 0;
query_string_geometry (IMAGE_INSTANCE_TEXT_STRING (ii),
text_set_property (Lisp_Object image_instance, Lisp_Object prop,
Lisp_Object val)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
if (EQ (prop, Q_data))
{
warn_when_safe (Qunimplemented, Qnotice,
"`formatted-string' not yet implemented; assuming `string'");
- string_instantiate (image_instance, instantiator,
+ string_instantiate (image_instance, instantiator,
pointer_fg, pointer_bg, dest_mask, domain);
}
int result;
CONST char *filename_ext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (name, filename_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, name,
+ C_STRING_ALLOCA, filename_ext,
+ Qfile_name);
result = read_bitmap_data_from_file (filename_ext, &w, &h,
&data, xhot, yhot);
int len = (w + 7) / 8 * h;
retval = list3 (make_int (w), make_int (h),
- make_ext_string (data, len, FORMAT_BINARY));
+ make_ext_string (data, len, Qbinary));
XFree ((char *) data);
return retval;
}
char **data;
int result;
char *fname = 0;
-
- GET_C_STRING_FILENAME_DATA_ALLOCA (name, fname);
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, name,
+ C_STRING_ALLOCA, fname,
+ Qfile_name);
result = XpmReadFileToData (fname, &data);
if (result == XpmSuccess)
static void
image_create (Lisp_Object obj)
{
- struct Lisp_Specifier *image = XIMAGE_SPECIFIER (obj);
+ Lisp_Specifier *image = XIMAGE_SPECIFIER (obj);
IMAGE_SPECIFIER_ALLOWED (image) = ~0; /* all are allowed */
IMAGE_SPECIFIER_ATTACHEE (image) = Qnil;
static void
image_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *image = XIMAGE_SPECIFIER (obj);
+ Lisp_Specifier *image = XIMAGE_SPECIFIER (obj);
mark_object (IMAGE_SPECIFIER_ATTACHEE (image));
mark_object (IMAGE_SPECIFIER_ATTACHEE_PROPERTY (image));
/* For the image instance cache, we do comparisons with EQ rather
than with EQUAL, as we do for color and font names.
The reasons are:
-
+
1) pixmap data can be very long, and thus the hashing and
comparing will take awhile.
2) It's not so likely that we'll run into things that are EQUAL
round it. */
if (UNBOUNDP (instance)
&&
- dest_mask & (IMAGE_SUBWINDOW_MASK
+ dest_mask & (IMAGE_SUBWINDOW_MASK
| IMAGE_WIDGET_MASK
| IMAGE_TEXT_MASK))
{
if (!WINDOWP (domain))
signal_simple_error ("Can't instantiate text or subwindow outside a window",
instantiator);
- instance = Fgethash (instantiator,
- XWINDOW (domain)->subwindow_instance_cache,
+ instance = Fgethash (instantiator,
+ XWINDOW (domain)->subwindow_instance_cache,
Qunbound);
}
}
noseeum_cons (pointerp ? ls3 : instantiator,
subtable));
int speccount = specpdl_depth ();
-
+
/* make sure we cache the failures, too.
Use an unwind-protect to catch such errors.
If we fail, the unwind-protect records nil in
pointer_fg, pointer_bg,
dest_mask,
glyph);
-
+
Fsetcar (locative, instance);
/* only after the image has been instantiated do we know
whether we need to put it in the per-window image instance
if (!WINDOWP (domain))
signal_simple_error ("Can't instantiate subwindow outside a window",
instantiator);
-
+
Fsetcdr (XCDR (locative), XWINDOW (domain)->subwindow_instance_cache );
}
unbind_to (speccount, Qnil);
set_image_attached_to (Lisp_Object obj, Lisp_Object face_or_glyph,
Lisp_Object property)
{
- struct Lisp_Specifier *image = XIMAGE_SPECIFIER (obj);
+ Lisp_Specifier *image = XIMAGE_SPECIFIER (obj);
IMAGE_SPECIFIER_ATTACHEE (image) = face_or_glyph;
IMAGE_SPECIFIER_ATTACHEE_PROPERTY (image) = property;
instantiator = Fcopy_sequence (instantiator);
elt = XVECTOR_DATA (instantiator);
instantiator_len = XVECTOR_LENGTH (instantiator);
-
+
meths = decode_image_instantiator_format (elt[0], ERROR_ME);
for (i = 1; i < instantiator_len; i += 2)
static Lisp_Object
mark_glyph (Lisp_Object obj)
{
- struct Lisp_Glyph *glyph = XGLYPH (obj);
+ Lisp_Glyph *glyph = XGLYPH (obj);
mark_object (glyph->image);
mark_object (glyph->contrib_p);
static void
print_glyph (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Glyph *glyph = XGLYPH (obj);
+ Lisp_Glyph *glyph = XGLYPH (obj);
char buf[20];
if (print_readably)
static int
glyph_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Glyph *g1 = XGLYPH (obj1);
- struct Lisp_Glyph *g2 = XGLYPH (obj2);
+ Lisp_Glyph *g1 = XGLYPH (obj1);
+ Lisp_Glyph *g2 = XGLYPH (obj2);
depth++;
static Lisp_Object
glyph_getprop (Lisp_Object obj, Lisp_Object prop)
{
- struct Lisp_Glyph *g = XGLYPH (obj);
+ Lisp_Glyph *g = XGLYPH (obj);
if (EQ (prop, Qimage)) return g->image;
if (EQ (prop, Qcontrib_p)) return g->contrib_p;
static Lisp_Object
glyph_plist (Lisp_Object obj)
{
- struct Lisp_Glyph *glyph = XGLYPH (obj);
+ Lisp_Glyph *glyph = XGLYPH (obj);
Lisp_Object result = glyph->plist;
result = cons3 (Qface, glyph->face, result);
}
static const struct lrecord_description glyph_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Glyph, image), 5 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Glyph, image) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Glyph, contrib_p) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Glyph, baseline) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) },
{ XD_END }
};
glyph_equal, glyph_hash, glyph_description,
glyph_getprop, glyph_putprop,
glyph_remprop, glyph_plist,
- struct Lisp_Glyph);
+ Lisp_Glyph);
\f
Lisp_Object
allocate_glyph (enum glyph_type type,
{
/* This function can GC */
Lisp_Object obj = Qnil;
- struct Lisp_Glyph *g =
- alloc_lcrecord_type (struct Lisp_Glyph, &lrecord_glyph);
+ Lisp_Glyph *g = alloc_lcrecord_type (Lisp_Glyph, &lrecord_glyph);
g->type = type;
g->image = Fmake_specifier (Qimage); /* This function can GC */
{
case GLYPH_BUFFER:
XIMAGE_SPECIFIER_ALLOWED (g->image) =
- IMAGE_NOTHING_MASK | IMAGE_TEXT_MASK
- | IMAGE_MONO_PIXMAP_MASK | IMAGE_COLOR_PIXMAP_MASK
+ IMAGE_NOTHING_MASK | IMAGE_TEXT_MASK
+ | IMAGE_MONO_PIXMAP_MASK | IMAGE_COLOR_PIXMAP_MASK
| IMAGE_SUBWINDOW_MASK | IMAGE_WIDGET_MASK
| IMAGE_LAYOUT_MASK;
break;
/* This can never return Qunbound. All glyphs have 'nothing as
a fallback. */
- Lisp_Object image_instance = specifier_instance (specifier, Qunbound,
+ Lisp_Object image_instance = specifier_instance (specifier, Qunbound,
domain, errb, no_quit, 0,
Qzero);
+ assert (!UNBOUNDP (image_instance));
return image_instance;
}
{
Lisp_Object instance = glyph_image_instance_maybe (glyph_or_image,
domain);
-
+
if (!IMAGE_INSTANCEP (instance))
return 0;
return make_int (glyph_height (glyph, window));
}
-static unsigned int
-glyph_dirty_p (Lisp_Object glyph_or_image, Lisp_Object window)
-{
- return XIMAGE_INSTANCE_DIRTYP (glyph_image_instance_maybe
- (glyph_or_image, window));
-}
-
static void
set_glyph_dirty_p (Lisp_Object glyph_or_image, Lisp_Object window, int dirty)
{
#if 0 /* Not used for now */
static void
glyph_query_geometry (Lisp_Object glyph_or_image, Lisp_Object window,
- unsigned int* width, unsigned int* height,
+ unsigned int* width, unsigned int* height,
enum image_instance_geometry disp, Lisp_Object domain)
{
Lisp_Object instance = glyph_or_image;
if (GLYPHP (glyph_or_image))
instance = glyph_image_instance (glyph_or_image, window, ERROR_ME_NOT, 1);
-
+
image_instance_query_geometry (instance, width, height, disp, domain);
}
if (GLYPHP (glyph_or_image))
instance = glyph_image_instance (glyph_or_image, window, ERROR_ME_NOT, 1);
-
+
image_instance_layout (instance, width, height, domain);
}
#endif
struct glyph_cachel *cachel)
{
if (!cachel->updated || NILP (cachel->glyph) || !EQ (cachel->glyph, glyph)
- || XGLYPH_DIRTYP (cachel->glyph))
+ || XGLYPH_DIRTYP (cachel->glyph)
+ || XFRAME(WINDOW_FRAME(w))->faces_changed)
{
Lisp_Object window, instance;
XSETWINDOW (window, w);
cachel->glyph = glyph;
- /* Speed things up slightly by grabbing the glyph instantiation
- and passing it to the size functions. */
+ /* Speed things up slightly by grabbing the glyph instantiation
+ and passing it to the size functions. */
instance = glyph_image_instance (glyph, window, ERROR_ME_NOT, 1);
- cachel->dirty = XGLYPH_DIRTYP (glyph) = glyph_dirty_p (glyph, window);
+
+ /* Mark text instance of the glyph dirty if faces have changed,
+ because its geometry might have changed. */
+ invalidate_glyph_geometry_maybe (instance, w);
+
+ /* #### Do the following 2 lines buy us anything? --kkm */
+ XGLYPH_DIRTYP (glyph) = XIMAGE_INSTANCE_DIRTYP (instance);
+ cachel->dirty = XGLYPH_DIRTYP (glyph);
cachel->width = glyph_width (instance, window);
cachel->ascent = glyph_ascent (instance, window);
cachel->descent = glyph_descent (instance, window);
}
/* Unset the dirty bit on all the glyph cachels that have it. */
-void
+void
mark_glyph_cachels_as_clean (struct window* w)
{
int elt;
{
struct subwindow_cachel *cachel =
Dynarr_atp (f->subwindow_cachels, elt);
-
+
if (EQ (cachel->subwindow, subwindow) && !NILP (subwindow))
{
update_subwindow_cachel_data (f, subwindow, cachel);
we have to check for overlaps. Being conservative we will
check for exposures wholly contained by the subwindow, this
might give us what we want.*/
- if (ei->x <= x && ei->y <= y
+ if (ei->x <= x && ei->y <= y
&& ei->x + ei->width >= x + width
&& ei->y + ei->height >= y + height)
{
f->subwindow_exposures = ei->next;
else
prev->next = ei->next;
-
+
if (ei == f->subwindow_exposures_tail)
f->subwindow_exposures_tail = prev;
if (!hold_ignored_expose_registration)
{
struct expose_ignore *ei;
-
+
ei = Blocktype_alloc (the_expose_ignore_blocktype);
-
+
ei->next = NULL;
ei->x = x;
ei->y = y;
ei->width = width;
ei->height = height;
-
+
/* we have to add the exposure to the end of the list, since we
want to check the oldest events first. for speed we keep a record
of the end so that we can add right to it. */
if (cachel->being_displayed
&&
cachel->x <= x && cachel->y <= y
- &&
+ &&
cachel->x + cachel->width >= x + width
&&
cachel->y + cachel->height >= y + height)
static void
update_subwindow (Lisp_Object subwindow)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
if (!IMAGE_INSTANCE_TYPE (ii) == IMAGE_WIDGET
||
{
struct subwindow_cachel *cachel =
Dynarr_atp (f->subwindow_cachels, elt);
-
+
if (cachel->being_displayed)
{
update_subwindow (cachel->subwindow);
/* remove a subwindow from its frame */
void unmap_subwindow (Lisp_Object subwindow)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
int elt;
struct subwindow_cachel* cachel;
struct frame* f;
void map_subwindow (Lisp_Object subwindow, int x, int y,
struct display_glyph_area *dga)
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
- int elt;
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
+ int elt;
struct subwindow_cachel* cachel;
struct frame* f;
if (IMAGE_INSTANCE_DIRTYP (ii))
{
update_subwindow (subwindow);
- IMAGE_INSTANCE_DIRTYP (ii) = 0;
+ IMAGE_INSTANCE_DIRTYP (ii) = 0;
}
MAYBE_DEVMETH (XDEVICE (ii->device), map_subwindow, (ii, x, y, dga));
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain)
{
- struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
Lisp_Object frame = FW_FRAME (domain);
Lisp_Object width = find_keyword_in_vector (instantiator, Q_pixel_width);
if (NILP (frame))
signal_simple_error ("No selected frame", device);
-
+
if (!(dest_mask & IMAGE_SUBWINDOW_MASK))
incompatible_image_types (instantiator, dest_mask, IMAGE_SUBWINDOW_MASK);
/* #### This stuff may get overidden by the widget code and is
actually really dumb now that we have dynamic geometry
calculations. What should really happen is that the subwindow
- should query its child for and appropriate geometry. */
+ should query its child for an appropriate geometry. */
if (NILP (width))
IMAGE_INSTANCE_SUBWINDOW_WIDTH (ii) = 20;
else
if (!NILP (XWEAK_LIST_LIST (arg)) && !NILP (XCAR (XWEAK_LIST_LIST (arg))))
{
Lisp_Object value = XCAR (XWEAK_LIST_LIST (arg));
-
+
if (IMAGE_INSTANCEP (value))
{
- struct Lisp_Image_Instance* ii = XIMAGE_INSTANCE (value);
+ Lisp_Image_Instance* ii = XIMAGE_INSTANCE (value);
if (COLOR_PIXMAP_IMAGE_INSTANCEP (value)
&&
% IMAGE_INSTANCE_PIXMAP_MAXSLICE (ii);
/* We might need to kick redisplay at this point - but we
also might not. */
- MARK_DEVICE_FRAMES_GLYPHS_CHANGED
+ MARK_DEVICE_FRAMES_GLYPHS_CHANGED
(XDEVICE (IMAGE_INSTANCE_DEVICE (ii)));
MARK_IMAGE_INSTANCE_CHANGED (ii);
}
}
static const struct lrecord_description image_specifier_description[] = {
- { XD_LISP_OBJECT, specifier_data_offset + offsetof(struct image_specifier, attachee), 2 },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct image_specifier, attachee) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct image_specifier, attachee_property) },
{ XD_END }
};
static const struct lrecord_description iike_description_1[] = {
- { XD_LISP_OBJECT, offsetof(ii_keyword_entry, keyword), 1 },
+ { XD_LISP_OBJECT, offsetof (ii_keyword_entry, keyword) },
{ XD_END }
};
static const struct struct_description iike_description = {
- sizeof(ii_keyword_entry),
+ sizeof (ii_keyword_entry),
iike_description_1
};
static const struct lrecord_description iiked_description_1[] = {
- XD_DYNARR_DESC(ii_keyword_entry_dynarr, &iike_description),
+ XD_DYNARR_DESC (ii_keyword_entry_dynarr, &iike_description),
{ XD_END }
};
static const struct struct_description iiked_description = {
- sizeof(ii_keyword_entry_dynarr),
+ sizeof (ii_keyword_entry_dynarr),
iiked_description_1
};
static const struct lrecord_description iife_description_1[] = {
- { XD_LISP_OBJECT, offsetof(image_instantiator_format_entry, symbol), 2 },
- { XD_STRUCT_PTR, offsetof(image_instantiator_format_entry, meths), 1, &iim_description },
+ { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, symbol) },
+ { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, device) },
+ { XD_STRUCT_PTR, offsetof (image_instantiator_format_entry, meths), 1, &iim_description },
{ XD_END }
};
static const struct struct_description iife_description = {
- sizeof(image_instantiator_format_entry),
+ sizeof (image_instantiator_format_entry),
iife_description_1
};
static const struct lrecord_description iifed_description_1[] = {
- XD_DYNARR_DESC(image_instantiator_format_entry_dynarr, &iife_description),
+ XD_DYNARR_DESC (image_instantiator_format_entry_dynarr, &iife_description),
{ XD_END }
};
static const struct struct_description iifed_description = {
- sizeof(image_instantiator_format_entry_dynarr),
+ sizeof (image_instantiator_format_entry_dynarr),
iifed_description_1
};
static const struct lrecord_description iim_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct image_instantiator_methods, symbol), 2 },
- { XD_STRUCT_PTR, offsetof(struct image_instantiator_methods, keywords), 1, &iiked_description },
- { XD_STRUCT_PTR, offsetof(struct image_instantiator_methods, consoles), 1, &cted_description },
+ { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, symbol) },
+ { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, device) },
+ { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, keywords), 1, &iiked_description },
+ { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, consoles), 1, &cted_description },
{ XD_END }
};
/* image instances */
- Vimage_instance_type_list = Fcons (Qnothing,
- list6 (Qtext, Qmono_pixmap, Qcolor_pixmap,
+ Vimage_instance_type_list = Fcons (Qnothing,
+ list6 (Qtext, Qmono_pixmap, Qcolor_pixmap,
Qpointer, Qsubwindow, Qwidget));
staticpro (&Vimage_instance_type_list);
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_GLYPHS_H_
-#define _XEMACS_GLYPHS_H_
+#ifndef INCLUDED_glyphs_h_
+#define INCLUDED_glyphs_h_
#include "specifier.h"
#include "gui.h"
subwindow subwindow
inherit mono-pixmap
autodetect mono-pixmap, color-pixmap, pointer, text
- button widget
+ button widget
edit-field widget
combo -box widget
progress-gauge widget
tab-control widget
tree-view widget
scrollbar widget
- static widget
+ static widget
*/
/* These are methods specific to a particular format of image instantiator
IMAGE_GEOMETRY,
IMAGE_DESIRED_GEOMETRY,
IMAGE_MIN_GEOMETRY,
- IMAGE_MAX_GEOMETRY,
+ IMAGE_MAX_GEOMETRY,
IMAGE_UNSPECIFIED_GEOMETRY = ~0
};
image instance. */
void (*query_geometry_method) (Lisp_Object image_instance,
unsigned int* width, unsigned int* height,
- enum image_instance_geometry disp,
+ enum image_instance_geometry disp,
Lisp_Object domain);
-
+
/* Layout the instance and its children bounded by the provided
dimensions. */
void (*layout_method) (Lisp_Object image_instance,
FORMAT. VALIDATE_FUN if a function that returns whether the data
is valid. The keyword may not appear more than once. */
#define IIFORMAT_VALID_GENERIC_KEYWORD(format, keyw, validate_fun, copy, multi) \
- do { \
+ do { \
struct ii_keyword_entry entry; \
- \
- entry.keyword = keyw; \
+ \
+ entry.keyword = keyw; \
entry.validate = validate_fun; \
- entry.multiple_p = multi; \
+ entry.multiple_p = multi; \
entry.copy_p = copy; \
Dynarr_add (format##_image_instantiator_methods->keywords, \
entry); \
#define IIFORMAT_VALID_NONCOPY_KEYWORD(format, keyw, validate_fun) \
IIFORMAT_VALID_GENERIC_KEYWORD(format, keyw, validate_fun, 0, 0)
-/* Declare that image-instantiator format FORMAT is supported on
+/* Declare that image-instantiator format FORMAT is supported on
CONSOLE type. */
-#define IIFORMAT_VALID_CONSOLE(console, format) \
+#define IIFORMAT_VALID_CONSOLE(console, format) \
do { \
struct console_type_entry entry; \
\
entry); \
} while (0)
-#define DEFINE_DEVICE_IIFORMAT(type, format)\
-DECLARE_IMAGE_INSTANTIATOR_FORMAT(format); \
+#define DEFINE_DEVICE_IIFORMAT(type, format) \
+DECLARE_IMAGE_INSTANTIATOR_FORMAT(format); \
struct image_instantiator_methods *type##_##format##_image_instantiator_methods
#define INITIALIZE_DEVICE_IIFORMAT(type, format) \
void check_valid_vector (Lisp_Object data);
void check_valid_item_list_1 (Lisp_Object items);
-void initialize_subwindow_image_instance (struct Lisp_Image_Instance*);
+void initialize_subwindow_image_instance (Lisp_Image_Instance*);
void subwindow_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain);
void widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
Lisp_Object pointer_fg, Lisp_Object pointer_bg,
int dest_mask, Lisp_Object domain);
-void image_instance_query_geometry (Lisp_Object image_instance,
- unsigned int* width, unsigned int* height,
+void image_instance_query_geometry (Lisp_Object image_instance,
+ unsigned int* width, unsigned int* height,
enum image_instance_geometry disp,
Lisp_Object domain);
-void image_instance_layout (Lisp_Object image_instance,
- unsigned int width, unsigned int height,
+void image_instance_layout (Lisp_Object image_instance,
+ unsigned int width, unsigned int height,
Lisp_Object domain);
+int invalidate_glyph_geometry_maybe (Lisp_Object glyph_or_ii, struct window* w);
DECLARE_DOESNT_RETURN (incompatible_image_types (Lisp_Object instantiator,
int given_dest_mask,
/* Image Instance Object */
/************************************************************************/
-DECLARE_LRECORD (image_instance, struct Lisp_Image_Instance);
-#define XIMAGE_INSTANCE(x) \
- XRECORD (x, image_instance, struct Lisp_Image_Instance)
+DECLARE_LRECORD (image_instance, Lisp_Image_Instance);
+#define XIMAGE_INSTANCE(x) XRECORD (x, image_instance, Lisp_Image_Instance)
#define XSETIMAGE_INSTANCE(x, p) XSETRECORD (x, p, image_instance)
#define IMAGE_INSTANCEP(x) RECORDP (x, image_instance)
#define CHECK_IMAGE_INSTANCE(x) CHECK_RECORD (x, image_instance)
#define LAYOUT_IMAGE_INSTANCEP(ii) \
IMAGE_INSTANCE_TYPE_P (ii, IMAGE_LAYOUT)
-#define CHECK_NOTHING_IMAGE_INSTANCE(x) do { \
- CHECK_IMAGE_INSTANCE (x); \
+#define CHECK_NOTHING_IMAGE_INSTANCE(x) do { \
+ CHECK_IMAGE_INSTANCE (x); \
if (!NOTHING_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qnothing_image_instance_p, (x)); \
} while (0)
-#define CHECK_TEXT_IMAGE_INSTANCE(x) do { \
- CHECK_IMAGE_INSTANCE (x); \
+#define CHECK_TEXT_IMAGE_INSTANCE(x) do { \
+ CHECK_IMAGE_INSTANCE (x); \
if (!TEXT_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qtext_image_instance_p, (x)); \
} while (0)
x = wrong_type_argument (Qmono_pixmap_image_instance_p, (x)); \
} while (0)
-#define CHECK_COLOR_PIXMAP_IMAGE_INSTANCE(x) do { \
- CHECK_IMAGE_INSTANCE (x); \
+#define CHECK_COLOR_PIXMAP_IMAGE_INSTANCE(x) do { \
+ CHECK_IMAGE_INSTANCE (x); \
if (!COLOR_PIXMAP_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qcolor_pixmap_image_instance_p, (x)); \
} while (0)
-#define CHECK_POINTER_IMAGE_INSTANCE(x) do { \
- CHECK_IMAGE_INSTANCE (x); \
+#define CHECK_POINTER_IMAGE_INSTANCE(x) do { \
+ CHECK_IMAGE_INSTANCE (x); \
if (!POINTER_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qpointer_image_instance_p, (x)); \
} while (0)
-#define CHECK_SUBWINDOW_IMAGE_INSTANCE(x) do { \
+#define CHECK_SUBWINDOW_IMAGE_INSTANCE(x) do { \
CHECK_IMAGE_INSTANCE (x); \
if (!SUBWINDOW_IMAGE_INSTANCEP (x) \
&& !WIDGET_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qsubwindow_image_instance_p, (x)); \
} while (0)
-#define CHECK_WIDGET_IMAGE_INSTANCE(x) do { \
- CHECK_IMAGE_INSTANCE (x); \
+#define CHECK_WIDGET_IMAGE_INSTANCE(x) do { \
+ CHECK_IMAGE_INSTANCE (x); \
if (!WIDGET_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qwidget_image_instance_p, (x)); \
} while (0)
-#define CHECK_LAYOUT_IMAGE_INSTANCE(x) do { \
- CHECK_IMAGE_INSTANCE (x); \
+#define CHECK_LAYOUT_IMAGE_INSTANCE(x) do { \
+ CHECK_IMAGE_INSTANCE (x); \
if (!LAYOUT_IMAGE_INSTANCEP (x)) \
x = wrong_type_argument (Qlayout_image_instance_p, (x)); \
} while (0)
unsigned int h_resize : 1; /* Whether the hsize is allowed to change. */
unsigned int orientation : 1; /* Vertical or horizontal. */
unsigned int justification : 2; /* Left, right or center. */
- union
- {
- struct
- {
- /* Face for colors and font. We specify this here becuase we
- want people to be able to put :face in the instantiator
- spec. Using gyph-face is more inconvenient, although more
- general. */
- Lisp_Object face;
- Lisp_Object type;
- Lisp_Object props; /* properties */
- Lisp_Object gui_item; /* a list of gui_items */
- } widget; /* widgets are subwindows */
- struct
- {
- Lisp_Object children; /* managed children */
- Lisp_Object border; /* Style of enclosing border or text. */
- } layout;
- } s;
+ /* Face for colors and font. We specify this here becuase we
+ want people to be able to put :face in the instantiator
+ spec. Using gyph-face is more inconvenient, although more
+ general. */
+ Lisp_Object face;
+ Lisp_Object type;
+ Lisp_Object props; /* properties or border*/
+ Lisp_Object items; /* a list of gui_items or children */
} subwindow;
} u;
#define IMAGE_INSTANCE_YOFFSET(i) ((i)->y_offset)
#define IMAGE_INSTANCE_WIDTH(i) ((i)->width)
#define IMAGE_INSTANCE_HEIGHT(i) ((i)->height)
-#define IMAGE_INSTANCE_PIXMAP_TYPE_P(i) \
- ((IMAGE_INSTANCE_TYPE (i) == IMAGE_MONO_PIXMAP) \
+#define IMAGE_INSTANCE_PIXMAP_TYPE_P(i) \
+ ((IMAGE_INSTANCE_TYPE (i) == IMAGE_MONO_PIXMAP) \
|| (IMAGE_INSTANCE_TYPE (i) == IMAGE_COLOR_PIXMAP))
#define IMAGE_INSTANCE_DIRTYP(i) ((i)->dirty)
#define IMAGE_INSTANCE_FACE(i) \
IMAGE_INSTANCE_WIDTH(i)
#define IMAGE_INSTANCE_WIDGET_HEIGHT(i) \
IMAGE_INSTANCE_HEIGHT(i)
-#define IMAGE_INSTANCE_WIDGET_TYPE(i) ((i)->u.subwindow.s.widget.type)
-#define IMAGE_INSTANCE_WIDGET_PROPS(i) ((i)->u.subwindow.s.widget.props)
+#define IMAGE_INSTANCE_WIDGET_TYPE(i) ((i)->u.subwindow.type)
+#define IMAGE_INSTANCE_WIDGET_PROPS(i) ((i)->u.subwindow.props)
#define SET_IMAGE_INSTANCE_WIDGET_FACE(i,f) \
- ((i)->u.subwindow.s.widget.face = f)
-#define IMAGE_INSTANCE_WIDGET_FACE(i) \
- (!NILP ((i)->u.subwindow.s.widget.face) ? (i)->u.subwindow.s.widget.face : \
- !NILP (IMAGE_INSTANCE_FACE (i)) ? IMAGE_INSTANCE_FACE (i) : \
+ ((i)->u.subwindow.face = f)
+#define IMAGE_INSTANCE_WIDGET_FACE(i) \
+ (!NILP ((i)->u.subwindow.face) ? (i)->u.subwindow.face : \
+ !NILP (IMAGE_INSTANCE_FACE (i)) ? IMAGE_INSTANCE_FACE (i) : \
Vwidget_face)
-#define IMAGE_INSTANCE_WIDGET_ITEMS(i) ((i)->u.subwindow.s.widget.gui_item)
-#define IMAGE_INSTANCE_WIDGET_ITEM(i) \
-(CONSP (IMAGE_INSTANCE_WIDGET_ITEMS (i)) ? \
-XCAR (IMAGE_INSTANCE_WIDGET_ITEMS (i)) : \
+#define IMAGE_INSTANCE_WIDGET_ITEMS(i) ((i)->u.subwindow.items)
+#define IMAGE_INSTANCE_WIDGET_ITEM(i) \
+(CONSP (IMAGE_INSTANCE_WIDGET_ITEMS (i)) ? \
+XCAR (IMAGE_INSTANCE_WIDGET_ITEMS (i)) : \
IMAGE_INSTANCE_WIDGET_ITEMS (i))
#define IMAGE_INSTANCE_WIDGET_TEXT(i) XGUI_ITEM (IMAGE_INSTANCE_WIDGET_ITEM (i))->name
-#define IMAGE_INSTANCE_LAYOUT_CHILDREN(i) ((i)->u.subwindow.s.layout.children)
-#define IMAGE_INSTANCE_LAYOUT_BORDER(i) ((i)->u.subwindow.s.layout.border)
+#define IMAGE_INSTANCE_LAYOUT_CHILDREN(i) ((i)->u.subwindow.items)
+#define IMAGE_INSTANCE_LAYOUT_BORDER(i) ((i)->u.subwindow.props)
#define XIMAGE_INSTANCE_DEVICE(i) \
IMAGE_INSTANCE_DEVICE (XIMAGE_INSTANCE (i))
Lisp_Object baseline; /* percent above baseline */
Lisp_Object face; /* if non-nil, face to use when displaying */
-
+
Lisp_Object plist;
void (*after_change) (Lisp_Object glyph, Lisp_Object property,
Lisp_Object locale);
unsigned int dirty : 1; /* So that we can selectively
redisplay changed glyphs. */
};
+typedef struct Lisp_Glyph Lisp_Glyph;
-DECLARE_LRECORD (glyph, struct Lisp_Glyph);
-#define XGLYPH(x) XRECORD (x, glyph, struct Lisp_Glyph)
+DECLARE_LRECORD (glyph, Lisp_Glyph);
+#define XGLYPH(x) XRECORD (x, glyph, Lisp_Glyph)
#define XSETGLYPH(x, p) XSETRECORD (x, p, glyph)
#define GLYPHP(x) RECORDP (x, glyph)
#define CHECK_GLYPH(x) CHECK_RECORD (x, glyph)
Lisp_Object property,
Lisp_Object locale));
void query_string_geometry ( Lisp_Object string, Lisp_Object face,
- unsigned int* width, unsigned int* height,
+ unsigned int* width, unsigned int* height,
unsigned int* descent, Lisp_Object domain);
-Lisp_Object query_string_font (Lisp_Object string,
+Lisp_Object query_string_font (Lisp_Object string,
Lisp_Object face, Lisp_Object domain);
Lisp_Object add_glyph_animated_timeout (EMACS_INT tickms, Lisp_Object device);
void disable_glyph_animated_timeout (int i);
int check_for_ignored_expose (struct frame* f, int x, int y, int width, int height);
extern int hold_ignored_expose_registration;
-#endif /* _XEMACS_GLYPHS_H_ */
+#endif /* INCLUDED_glyphs_h_ */
#include <malloc.h>
#endif
-#if 0 /* FSFmacs */
-/* XEmacs requires an ANSI compiler, and memmove() is part of the ANSI-
- mandated functions. For losing systems like SunOS 4, we provide
- our own memmove(). */
-
-#if (defined (MEMMOVE_MISSING) || \
- !defined(_LIBC) && !defined(STDC_HEADERS) && !defined(USG))
-
-/* Snarfed directly from Emacs src/dispnew.c:
- XXX Should use system bcopy if it handles overlap. */
-#ifndef emacs
-
-/* Like bcopy except never gets confused by overlap. */
-
-static void
-safe_bcopy (char *from, char *to, int size)
-{
- if (size <= 0 || from == to)
- return;
-
- /* If the source and destination don't overlap, then bcopy can
- handle it. If they do overlap, but the destination is lower in
- memory than the source, we'll assume bcopy can handle that. */
- if (to < from || from + size <= to)
- bcopy (from, to, size);
-
- /* Otherwise, we'll copy from the end. */
- else
- {
- char *endf = from + size;
- char *endt = to + size;
-
- /* If TO - FROM is large, then we should break the copy into
- nonoverlapping chunks of TO - FROM bytes each. However, if
- TO - FROM is small, then the bcopy function call overhead
- makes this not worth it. The crossover point could be about
- anywhere. Since I don't think the obvious copy loop is too
- bad, I'm trying to err in its favor. */
- if (to - from < 64)
- {
- do
- *--endt = *--endf;
- while (endf != from);
- }
- else
- {
- for (;;)
- {
- endt -= (to - from);
- endf -= (to - from);
-
- if (endt < to)
- break;
-
- bcopy (endf, endt, to - from);
- }
-
- /* If SIZE wasn't a multiple of TO - FROM, there will be a
- little left over. The amount left over is
- (endt + (to - from)) - to, which is endt - from. */
- bcopy (from, to, endt - from);
- }
- }
-}
-#endif /* Not emacs. */
-
-#define memmove(to, from, size) safe_bcopy ((from), (to), (size))
-
-#endif
-
-#endif /* FSFmacs */
-
-
#ifndef min
#define min(A, B) ((A) < (B) ? (A) : (B))
#endif
-/* GPM functions
+/* GPM (General purpose mouse) functions
Copyright (C) 1997 William M. Perry <wmperry@gnu.org>
Copyright (C) 1999 Free Software Foundation, Inc.
extern void *gpm_stack;
static int (*orig_event_pending_p) (int);
-static void (*orig_next_event_cb) (struct Lisp_Event *);
+static void (*orig_next_event_cb) (Lisp_Event *);
static Lisp_Object gpm_event_queue;
static Lisp_Object gpm_event_queue_tail;
}
static int
-get_process_infd (struct Lisp_Process *p)
+get_process_infd (Lisp_Process *p)
{
Lisp_Object instr, outstr;
get_process_streams (p, &instr, &outstr);
int modifiers = 0;
int button = 1;
Lisp_Object fake_event;
- struct Lisp_Event *event = NULL;
+ Lisp_Event *event = NULL;
struct gcpro gcpro1;
static int num_events;
static void
tty_set_mouse_position (struct window *w, int x, int y)
{
- /*
+ /*
#### I couldn't find any GPM functions that set the mouse position.
#### Mr. Perry had left this function empty; that must be why.
#### karlheg
return (orig_event_pending_p (user_p));
}
-static void gpm_next_event_cb (struct Lisp_Event *event)
+static void gpm_next_event_cb (Lisp_Event *event)
{
/* #### It would be nice to preserve some sort of ordering of the
** #### different types of events, but that would be quite a bit
** #### of work, and would more than likely break the abstraction
** #### between the other event loops and this one.
*/
-
+
if (!NILP (gpm_event_queue))
{
Lisp_Object queued_event = dequeue_event (&gpm_event_queue, &gpm_event_queue_tail);
** descriptor, or it can get the wrong terminal sizes, etc.
*/
gpm_consolefd = fd;
-
+
/* We have to pass the virtual console manually, otherwise if you
** use 'gnuclient -nw' to connect to an XEmacs that is running in
** X, Gpm_Open() tries to use ttyname(0 | 1 | 2) to find out which
-#ifndef _HAVE_GPM
-#define _HAVE_GPM
+/* GPM (General purpose mouse) support
+ Copyright (C) 1997 William M. Perry <wmperry@gnu.org>
+ Copyright (C) 1999 Free Software Foundation, Inc.
-int handle_gpm_read (struct Lisp_Event *event, struct console *con, int fd);
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#ifndef INCLUDED_gpmevent_h_
+#define INCLUDED_gpmevent_h_
+
+int handle_gpm_read (Lisp_Event *event, struct console *con, int fd);
void connect_to_gpm (struct console *con);
-#endif
+#endif /* INCLUDED_gpmevent_h_ */
#include "frame.h"
#include "elhash.h"
#include "console-msw.h"
+#include "buffer.h"
/*
* Return value is Qt if we have dispatched the command,
* command if we return nil
*/
Lisp_Object
-mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, WORD id)
+mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, DWORD id)
{
/* Try to map the command id through the proper hash table */
Lisp_Object data, fn, arg, frame;
+ /* #### make_int should assert that --kkm */
+ assert (XINT (make_int (id)) == id);
+
data = Fgethash (make_int (id),
FRAME_MSWINDOWS_WIDGET_HASH_TABLE (f), Qnil);
return Qt;
}
+DEFUN ("mswindows-shell-execute", Fmswindows_shell_execute, 2, 4, 0, /*
+Get Windows to perform OPERATION on DOCUMENT.
+This is a wrapper around the ShellExecute system function, which
+invokes the application registered to handle OPERATION for DOCUMENT.
+OPERATION is typically \"open\", \"print\" or \"explore\" (but can be
+nil for the default action), and DOCUMENT is typically the name of a
+document file or URL, but can also be a program executable to run or
+a directory to open in the Windows Explorer.
+
+If DOCUMENT is a program executable, PARAMETERS can be a string
+containing command line parameters, but otherwise should be nil.
+
+SHOW-FLAG can be used to control whether the invoked application is hidden
+or minimized. If SHOW-FLAG is nil, the application is displayed normally,
+otherwise it is an integer representing a ShowWindow flag:
+
+ 0 - start hidden
+ 1 - start normally
+ 3 - start maximized
+ 6 - start minimized
+*/
+ (operation, document, parameters, show_flag))
+{
+ Lisp_Object current_dir;
+
+ CHECK_STRING (document);
+
+ /* Encode filename and current directory. */
+ current_dir = current_buffer->directory;
+ if ((int) ShellExecute (NULL,
+ (STRINGP (operation) ?
+ XSTRING (operation)->data : NULL),
+ XSTRING (document)->data,
+ (STRINGP (parameters) ?
+ XSTRING (parameters)->data : NULL),
+ XSTRING (current_dir)->data,
+ (INTP (show_flag) ?
+ XINT (show_flag) : SW_SHOWDEFAULT))
+ > 32)
+ return Qt;
+
+ error ("ShellExecute failed");
+ return Qnil;
+}
+
+void
+syms_of_gui_mswindows (void)
+{
+ DEFSUBR (Fmswindows_shell_execute);
+}
/* !!#### This function has not been Mule-ized */
/* This function cannot GC because gc_currently_forbidden is set when
it's called */
- struct Lisp_Gui_Item* pgui = 0;
+ Lisp_Gui_Item* pgui = 0;
/* degenerate case */
if (STRINGP (gui_item))
CHECK_STRING (suffix2);
}
- GET_C_STRING_FILENAME_DATA_ALLOCA (suffix2, const_bogosity);
+ TO_EXTERNAL_FORMAT (LISP_STRING, suffix2,
+ C_STRING_ALLOCA, const_bogosity,
+ Qfile_name);
wv->value = (char *) const_bogosity;
wv->value = xstrdup (wv->value);
}
wv = xmalloc_widget_value();
if (parent)
parent->contents = wv;
- else
+ else
prev->next = wv;
if (!button_item_to_widget_value (items, wv, 0, 1))
{
free_widget_value_tree (wv);
if (parent)
parent->contents = 0;
- else
+ else
prev->next = 0;
}
- else
+ else
{
wv->value = xstrdup (wv->name); /* what a mess... */
}
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_XLWLIB_H_
-#define _XEMACS_XLWLIB_H_
+#ifndef INCLUDED_gui_x_h_
+#define INCLUDED_gui_x_h_
#include "../lwlib/lwlib.h"
char *menu_separator_style (CONST char *s);
Lisp_Object widget_value_unwind (Lisp_Object closure);
-#endif /* _XEMACS_XLWLIB_H_ */
+#endif /* INCLUDED_gui_x_h_ */
*/
void
gui_item_add_keyval_pair (Lisp_Object gui_item,
- Lisp_Object key, Lisp_Object val,
+ Lisp_Object key, Lisp_Object val,
Error_behavior errb)
{
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
if (!KEYWORDP (key))
signal_simple_error_2 ("Non-keyword in gui item", key, pgui_item->name);
else if (EQ (key, Q_selected)) pgui_item->selected = val;
else if (EQ (key, Q_keys)) pgui_item->keys = val;
else if (EQ (key, Q_callback)) pgui_item->callback = val;
- else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatability */
+ else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatibility */
else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */
else if (EQ (key, Q_accelerator))
{
void
gui_item_init (Lisp_Object gui_item)
{
- struct Lisp_Gui_Item *lp = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item *lp = XGUI_ITEM (gui_item);
lp->name = Qnil;
lp->callback = Qnil;
Lisp_Object
allocate_gui_item (void)
{
- struct Lisp_Gui_Item *lp =
- alloc_lcrecord_type (struct Lisp_Gui_Item, &lrecord_gui_item);
+ Lisp_Gui_Item *lp = alloc_lcrecord_type (Lisp_Gui_Item, &lrecord_gui_item);
Lisp_Object val;
zero_lcrecord (lp);
int length, plist_p, start;
Lisp_Object *contents;
Lisp_Object gui_item = allocate_gui_item ();
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
CHECK_VECTOR (item);
length = XVECTOR_LENGTH (item);
pgui_item->callback = contents [1];
start = 2;
}
- else
+ else
start =1;
if (!plist_p && length > 2)
void
gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item)
{
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
-
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+
if (!NILP (pgui_item->callback))
Fplist_put (plist, Q_callback, pgui_item->callback);
if (!NILP (pgui_item->suffix))
Lisp_Object
gui_item_accelerator (Lisp_Object gui_item)
{
- struct Lisp_Gui_Item* pgui = XGUI_ITEM (gui_item);
-
+ Lisp_Gui_Item* pgui = XGUI_ITEM (gui_item);
+
if (!NILP (pgui->accelerator))
return pgui->accelerator;
gui_item_included_p (Lisp_Object gui_item, Lisp_Object conflist)
{
/* This function can call lisp */
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
/* Evaluate :included first. Shortcut to avoid evaluating Qt each time */
if (!EQ (pgui_item->included, Qt)
/* This function can call lisp */
char *p = buf;
Bytecount len;
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
/* Copy item name first */
CHECK_STRING (pgui_item->name);
gui_item_display_flush_right (Lisp_Object gui_item,
char* buf, Bytecount buf_len)
{
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
*buf = 0;
#ifdef HAVE_MENUBARS
static Lisp_Object
mark_gui_item (Lisp_Object obj)
{
- struct Lisp_Gui_Item *p = XGUI_ITEM (obj);
+ Lisp_Gui_Item *p = XGUI_ITEM (obj);
mark_object (p->name);
mark_object (p->callback);
static unsigned long
gui_item_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Gui_Item *p = XGUI_ITEM (obj);
+ Lisp_Gui_Item *p = XGUI_ITEM (obj);
return HASH2 (HASH5 (internal_hash (p->name, depth + 1),
internal_hash (p->callback, depth + 1),
static int
gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Gui_Item *p1 = XGUI_ITEM (obj1);
- struct Lisp_Gui_Item *p2 = XGUI_ITEM (obj2);
+ Lisp_Gui_Item *p1 = XGUI_ITEM (obj1);
+ Lisp_Gui_Item *p2 = XGUI_ITEM (obj2);
if (!(internal_equal (p1->name, p2->name, depth + 1)
&&
static void
print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Gui_Item *g = XGUI_ITEM (obj);
+ Lisp_Gui_Item *g = XGUI_ITEM (obj);
char buf[20];
if (print_readably)
sub = parse_gui_item_tree_list (XCAR (rest));
else
sub = parse_gui_item_tree_item (XCAR (rest));
-
+
ret = Fcons (sub, ret);
}
/* make the order the same as the items we have parsed */
0, gui_item_equal,
gui_item_hash,
0,
- struct Lisp_Gui_Item);
+ Lisp_Gui_Item);
void
syms_of_gui (void)
/* Written by kkm on 12/24/97 */
-#ifndef _XEMACS_GUI_H_
-#define _XEMACS_GUI_H_
+#ifndef INCLUDED_gui_h_
+#define INCLUDED_gui_h_
int separator_string_p (CONST char *s);
void get_gui_callback (Lisp_Object, Lisp_Object *, Lisp_Object *);
/* Image Instance Object */
/************************************************************************/
-DECLARE_LRECORD (gui_item, struct Lisp_Gui_Item);
-#define XGUI_ITEM(x) \
- XRECORD (x, gui_item, struct Lisp_Gui_Item)
-#define XSETGUI_ITEM(x, p) XSETRECORD (x, p, gui_item)
-#define GUI_ITEMP(x) RECORDP (x, gui_item)
-#define CHECK_GUI_ITEM(x) CHECK_RECORD (x, gui_item)
-#define CONCHECK_GUI_ITEM(x) CONCHECK_RECORD (x, gui_item)
-
/* This structure describes gui button,
menu item or submenu properties */
struct Lisp_Gui_Item
Lisp_Object accelerator; /* Char or Symbol */
};
+DECLARE_LRECORD (gui_item, Lisp_Gui_Item);
+#define XGUI_ITEM(x) XRECORD (x, gui_item, Lisp_Gui_Item)
+#define XSETGUI_ITEM(x, p) XSETRECORD (x, p, gui_item)
+#define GUI_ITEMP(x) RECORDP (x, gui_item)
+#define CHECK_GUI_ITEM(x) CHECK_RECORD (x, gui_item)
+#define CONCHECK_GUI_ITEM(x) CONCHECK_RECORD (x, gui_item)
+
extern Lisp_Object Q_accelerator, Q_active, Q_config, Q_filter, Q_included;
extern Lisp_Object Q_keys, Q_selected, Q_suffix, Qradio, Qtoggle;
extern Lisp_Object Q_key_sequence, Q_label, Q_callback;
#define MAX_MENUITEM_LENGTH 128
-#endif /* _XEMACS_GUI_H_ */
+#endif /* INCLUDED_gui_h_ */
struct device *d = XDEVICE (f->device);
struct window* w = XWINDOW (window);
int x, y, width, height, ypos;
- int line;
- int border_width = FRAME_GUTTER_BORDER_WIDTH (f, pos);
- face_index findex = get_builtin_face_cache_index (w, Vgui_element_face);
+ int line, border_width;
+ face_index findex;
display_line_dynarr* ddla, *cdla;
struct display_line *dl;
int cdla_len;
+ if (!WINDOW_LIVE_P (w))
+ return;
+
+ border_width = FRAME_GUTTER_BORDER_WIDTH (f, pos);
+ findex = get_builtin_face_cache_index (w, Vgui_element_face);
+
if (!f->current_display_lines)
f->current_display_lines = Dynarr_new (display_line);
if (!f->desired_display_lines)
fb = Fcons (Fcons (list1 (Qx), Qautodetect), fb);
#endif
#ifdef HAVE_MS_WINDOWS
+ fb = Fcons (Fcons (list1 (Qmsprinter), Qautodetect), fb);
fb = Fcons (Fcons (list1 (Qmswindows), Qautodetect), fb);
#endif
if (!NILP (fb))
fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_GUTTER_WIDTH)), fb);
#endif
#ifdef HAVE_MS_WINDOWS
+ fb = Fcons (Fcons (list1 (Qmsprinter), Qzero), fb);
fb = Fcons (Fcons (list1 (Qmswindows),
make_int (DEFAULT_GUTTER_WIDTH)), fb);
#endif
fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_GUTTER_BORDER_WIDTH)), fb);
#endif
#ifdef HAVE_MS_WINDOWS
+ fb = Fcons (Fcons (list1 (Qmsprinter), Qzero), fb);
fb = Fcons (Fcons (list1 (Qmswindows), make_int (DEFAULT_GUTTER_BORDER_WIDTH)), fb);
#endif
if (!NILP (fb))
set_specifier_fallback (Vgutter_visible_p[BOTTOM_GUTTER], fb);
set_specifier_fallback (Vgutter_visible_p[LEFT_GUTTER], fb);
set_specifier_fallback (Vgutter_visible_p[RIGHT_GUTTER], fb);
-
}
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_GUTTER_H_
-#define _XEMACS_GUTTER_H_
+#ifndef INCLUDED_gutter_h_
+#define INCLUDED_gutter_h_
#include "specifier.h"
#define FRAME_RIGHT_GUTTER_BOUNDS(f) \
WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), RIGHT_GUTTER)
-#endif /* _XEMACS_GUTTER_H_ */
+#endif /* INCLUDED_gutter_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _HASH_H_
-#define _HASH_H_
+#ifndef INCLUDED_hash_h_
+#define INCLUDED_hash_h_
typedef struct
{
void map_remhash (remhash_predicate predicate,
struct hash_table *hash_table, void *arg);
-#endif /* _HASH_H_ */
+#endif /* INCLUDED_hash_h_ */
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifndef INCLUDED_imgproc_h_
+#define INCLUDED_imgproc_h_
+
/* Synched up with: Not in FSF. */
/* Original author: Jareth Hein */
#define QUANT_GET_COLOR(qt,r,g,b) (qt->histogram[r>>COLOR_SHIFT][g>>COLOR_SHIFT][b>>COLOR_SHIFT])
quant_table *build_EImage_quantable(unsigned char *eimage, int width, int height, int num_colors);
+
+#endif /* INCLUDED_imgproc_h_ */
}
int
-string_column_at_point (struct Lisp_String* s, Bufpos init_pos, int tab_width)
+string_column_at_point (Lisp_String* s, Bufpos init_pos, int tab_width)
{
int col;
int tab_seen;
{
char *locale;
- /* dverna - Nov. 98: ### DON'T DO THIS !!! The default XtLanguageProc
+ /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc
routine calls setlocale(LC_ALL, lang) which fucks up our lower-level
locale management, and especially the value of LC_NUMERIC. Anyway, since
at this point, we don't know yet whether we're gonna need an X11 frame,
void
XIM_SetSpotLocation (struct frame *f, int x, int y)
{
- /* ### FIX: Must make sure spot fits within Preedit Area */
+ /* #### FIX: Must make sure spot fits within Preedit Area */
XPoint *spot = &(FRAME_X_XIC_SPOT (f));
if (spot->x == (short) x &&
spot->y == (short) y)
{
char *locale;
- /* dverna - Nov. 98: ### DON'T DO THIS !!! The default XtLanguageProc
+ /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc
routine calls setlocale(LC_ALL, lang) which fucks up our lower-level
locale management, and especially the value of LC_NUMERIC. Anyway, since
at this point, we don't know yet whether we're gonna need an X11 frame,
{
char *locale;
- /* dverna - Nov. 98: ### DON'T DO THIS !!! The default XtLanguageProc
+ /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc
routine calls setlocale(LC_ALL, lang) which fucks up our lower-level
locale management, and especially the value of LC_NUMERIC. Anyway, since
at this point, we don't know yet whether we're gonna need an X11 frame,
spot->x = (short) x;
spot->y = (short) y;
- /* ### FIX: Must make sure spot fits within Preedit Area */
+ /* #### FIX: Must make sure spot fits within Preedit Area */
XIC_Value (Set, xic, XNPreeditAttributes, XNSpotLocation, spot);
#ifdef DEBUG_XIM
stderr_out ("Spot: %d %d\n", spot->x, spot->y);
adjust_markers (struct buffer *buf, Memind from, Memind to,
Bytecount amount)
{
- struct Lisp_Marker *m;
+ Lisp_Marker *m;
for (m = BUF_MARKERS (buf); m; m = marker_next (m))
m->memind = do_marker_adjustment (m->memind, from, to, amount);
static void
adjust_markers_for_insert (struct buffer *buf, Memind ind, Bytecount amount)
{
- struct Lisp_Marker *m;
+ Lisp_Marker *m;
for (m = BUF_MARKERS (buf); m; m = marker_next (m))
{
/* Routines for dealing with the gap */
/************************************************************************/
-/* XEmacs requires an ANSI C compiler, and it damn well better have a
- working memmove() */
-#define GAP_USE_BCOPY
-#ifdef BCOPY_UPWARD_SAFE
-# undef BCOPY_UPWARD_SAFE
-#endif
-#ifdef BCOPY_DOWNWARD_SAFE
-# undef BCOPY_DOWNWARD_SAFE
-#endif
-#define BCOPY_UPWARD_SAFE 1
-#define BCOPY_DOWNWARD_SAFE 1
-
/* maximum amount of memory moved in a single chunk. Increasing this
value improves gap-motion efficiency but decreases QUIT responsiveness
time. Was 32000 but today's processors are faster and files are
/* Move at most GAP_MOVE_CHUNK chars before checking again for a quit. */
if (i > GAP_MOVE_CHUNK)
i = GAP_MOVE_CHUNK;
-#ifdef GAP_USE_BCOPY
- if (i >= 128
- /* bcopy is safe if the two areas of memory do not overlap
- or on systems where bcopy is always safe for moving upward. */
- && (BCOPY_UPWARD_SAFE
- || to - from >= 128))
+
+ if (i >= 128)
{
- /* If overlap is not safe, avoid it by not moving too many
- characters at once. */
- if (!BCOPY_UPWARD_SAFE && i > to - from)
- i = to - from;
new_s1 -= i;
- from -= i, to -= i;
+ from -= i;
+ to -= i;
memmove (to, from, i);
}
else
-#endif
{
new_s1 -= i;
while (--i >= 0)
/* Move at most GAP_MOVE_CHUNK chars before checking again for a quit. */
if (i > GAP_MOVE_CHUNK)
i = GAP_MOVE_CHUNK;
-#ifdef GAP_USE_BCOPY
- if (i >= 128
- /* bcopy is safe if the two areas of memory do not overlap
- or on systems where bcopy is always safe for moving downward. */
- && (BCOPY_DOWNWARD_SAFE
- || from - to >= 128))
+
+ if (i >= 128)
{
- /* If overlap is not safe, avoid it by not moving too many
- characters at once. */
- if (!BCOPY_DOWNWARD_SAFE && i > from - to)
- i = from - to;
new_s1 += i;
memmove (to, from, i);
- from += i, to += i;
+ from += i;
+ to += i;
}
else
-#endif
{
new_s1 += i;
while (--i >= 0)
/* Mostly rewritten by Ben Wing. */
-#ifndef _XEMACS_INSDEL_H_
-#define _XEMACS_INSDEL_H_
+#ifndef INCLUDED_insdel_h_
+#define INCLUDED_insdel_h_
/************************************************************************/
/* changing a buffer's text */
void init_buffer_text (struct buffer *b);
void uninit_buffer_text (struct buffer *b);
-#endif /* _XEMACS_INSDEL_H_ */
+#endif /* INCLUDED_insdel_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_ISO_WIDE_H
-#define _XEMACS_ISO_WIDE_H
+#ifndef INCLUDED_iso_wide_h_
+#define INCLUDED_iso_wide_h_
/* The following macros are designed for SunOS 5.0 wide characters,
in which the single byte ISO Latin-1 character 1xxxxxxx are represented
#define WIDE_TO_BYTE(c) (IS_ISO_WIDE (c) ? ISO_WIDE_TO_BYTE (c) : (c))
#define BYTE_TO_WIDE(c) (IS_ISO_BYTE (c) ? ISO_BYTE_TO_WIDE (c) : (c))
-#endif /* _XEMACS_ISO_WIDE_H */
+#endif /* INCLUDED_iso_wide_h_ */
Since keymaps are opaque, the only way to extract information from them
is with the functions lookup-key, key-binding, local-key-binding, and
global-key-binding, which work just as before, and the new function
- map-keymap, which is roughly analagous to maphash.
+ map-keymap, which is roughly analogous to maphash.
Note that map-keymap perpetuates the illusion that the "bucky" submaps
don't exist: if you map over a keymap with bucky submaps, it will also
*/
-typedef struct Lisp_Keymap
+struct Lisp_Keymap
{
struct lcrecord_header header;
- Lisp_Object parents; /* Keymaps to be searched after this one
- * An ordered list */
+ Lisp_Object parents; /* Keymaps to be searched after this one.
+ An ordered list */
Lisp_Object prompt; /* Qnil or a string to print in the minibuffer
- * when reading from this keymap */
-
+ when reading from this keymap */
Lisp_Object table; /* The contents of this keymap */
Lisp_Object inverse_table; /* The inverse mapping of the above */
-
Lisp_Object default_binding; /* Use this if no other binding is found
- * (this overrides parent maps and the
- * normal global-map lookup). */
-
-
+ (this overrides parent maps and the
+ normal global-map lookup). */
Lisp_Object sub_maps_cache; /* Cache of directly inferior keymaps;
This holds an alist, of the key and the
maps, or the modifier bit and the map.
If this is the symbol t, then the cache
- needs to be recomputed.
- */
- int fullness; /* How many entries there are in this table.
- This should be the same as the fullness
- of the `table', but hash.c is broken. */
+ needs to be recomputed. */
Lisp_Object name; /* Just for debugging convenience */
-} Lisp_Keymap;
+};
#define MAKE_MODIFIER_HASH_KEY(modifier) make_int (modifier)
#define MODIFIER_HASH_KEY_BITS(x) (INTP (x) ? XINT (x) : 0)
/* Actually allocate storage for these variables */
-static Lisp_Object Vcurrent_global_map; /* Always a keymap */
+Lisp_Object Vcurrent_global_map; /* Always a keymap */
static Lisp_Object Vmouse_grabbed_buffer;
Lisp_Object shadow,
int mice_only_p,
Lisp_Object buffer);
+static Lisp_Object keymap_submaps (Lisp_Object keymap);
Lisp_Object Qcontrol, Qctrl, Qmeta, Qsuper, Qhyper, Qalt, Qshift;
Lisp_Object Qbutton0, Qbutton1, Qbutton2, Qbutton3;
/* This function can GC */
Lisp_Keymap *keymap = XKEYMAP (obj);
char buf[200];
- int size = XINT (Fkeymap_fullness (obj));
if (print_readably)
error ("printing unreadable object #<keymap 0x%x>", keymap->header.uid);
write_c_string ("#<keymap ", printcharfun);
if (!NILP (keymap->name))
- print_internal (keymap->name, printcharfun, 1);
- /* #### Yuck! This is no way to form plural! --hniksic */
- sprintf (buf, "%s%d entr%s 0x%x>",
- (NILP (keymap->name) ? "" : " "),
- size,
- ((size == 1) ? "y" : "ies"),
- keymap->header.uid);
+ {
+ print_internal (keymap->name, printcharfun, 1);
+ write_c_string (" ", printcharfun);
+ }
+ sprintf (buf, "size %ld 0x%x>",
+ (long) XINT (Fkeymap_fullness (obj)), keymap->header.uid);
write_c_string (buf, printcharfun);
}
static const struct lrecord_description keymap_description[] = {
- { XD_LISP_OBJECT, offsetof(Lisp_Keymap, parents), 6 },
- { XD_LISP_OBJECT, offsetof(Lisp_Keymap, name), 1 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, parents) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, prompt) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, table) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, inverse_table) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, default_binding) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, sub_maps_cache) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Keymap, name) },
{ XD_END }
};
start_keymap = get_keymap (start_keymap, 1, 1);
keymap = start_keymap;
/* Hack special-case parents at top-level */
- tail = ((!NILP (tail)) ? tail : XKEYMAP (keymap)->parents);
+ tail = !NILP (tail) ? tail : XKEYMAP (keymap)->parents;
for (;;)
{
Lisp_Object result;
QUIT;
- result = ((mapper) (keymap, mapper_arg));
+ result = mapper (keymap, mapper_arg);
if (!NILP (result))
{
while (CONSP (malloc_bites))
{
- struct Lisp_Cons *victim = XCONS (malloc_bites);
+ Lisp_Cons *victim = XCONS (malloc_bites);
malloc_bites = victim->cdr;
free_cons (victim);
}
stack_depth--;
if (CONSP (malloc_bites))
{
- struct Lisp_Cons *victim = XCONS (malloc_bites);
+ Lisp_Cons *victim = XCONS (malloc_bites);
tail = victim->car;
malloc_bites = victim->cdr;
free_cons (victim);
*/
}
+/* Prevent luser from shooting herself in the foot using something like
+ (define-key ctl-x-4-map "p" global-map) */
+static void
+check_keymap_definition_loop (Lisp_Object def, Lisp_Keymap *to_keymap)
+{
+ def = get_keymap (def, 0, 0);
+
+ if (KEYMAPP (def))
+ {
+ Lisp_Object maps;
+
+ if (XKEYMAP (def) == to_keymap)
+ signal_simple_error ("Cyclic keymap definition", def);
+
+ for (maps = keymap_submaps (def);
+ CONSP (maps);
+ maps = XCDR (maps))
+ check_keymap_definition_loop (XCDR (XCAR (maps)), to_keymap);
+ }
+}
static void
keymap_store_internal (Lisp_Object keysym, Lisp_Keymap *keymap,
- Lisp_Object value)
+ Lisp_Object def)
{
- Lisp_Object prev_value = Fgethash (keysym, keymap->table, Qnil);
+ Lisp_Object prev_def = Fgethash (keysym, keymap->table, Qnil);
- if (EQ (prev_value, value))
+ if (EQ (prev_def, def))
return;
- if (!NILP (prev_value))
+
+ check_keymap_definition_loop (def, keymap);
+
+ if (!NILP (prev_def))
keymap_delete_inverse_internal (keymap->inverse_table,
- keysym, prev_value);
- if (NILP (value))
+ keysym, prev_def);
+ if (NILP (def))
{
- keymap->fullness--;
- if (keymap->fullness < 0) abort ();
Fremhash (keysym, keymap->table);
}
else
{
- if (NILP (prev_value))
- keymap->fullness++;
- Fputhash (keysym, value, keymap->table);
+ Fputhash (keysym, def, keymap->table);
keymap_store_inverse_internal (keymap->inverse_table,
- keysym, value);
+ keysym, def);
}
keymap_tick++;
}
{
Lisp_Object keysym = key->keysym;
unsigned int modifiers = key->modifiers;
- Lisp_Keymap *k;
-
- if ((modifiers & ~(MOD_CONTROL | MOD_META | MOD_SUPER | MOD_HYPER
- | MOD_ALT | MOD_SHIFT)) != 0)
- abort ();
+ Lisp_Keymap *k = XKEYMAP (keymap);
- k = XKEYMAP (keymap);
+ assert ((modifiers & ~(MOD_CONTROL | MOD_META | MOD_SUPER | MOD_HYPER
+ | MOD_ALT | MOD_SHIFT)) == 0);
/* If the keysym is a one-character symbol, use the char code instead. */
if (SYMBOLP (keysym) && string_char_length (XSYMBOL (keysym)->name) == 1)
- {
- Lisp_Object run_the_gcc_developers_over_with_a_steamroller =
- make_char (string_char (XSYMBOL (keysym)->name, 0));
- keysym = run_the_gcc_developers_over_with_a_steamroller;
- }
+ keysym = make_char (string_char (XSYMBOL (keysym)->name, 0));
if (modifiers & MOD_META) /* Utterly hateful ESC lossage */
{
keymap->inverse_table = Qnil;
keymap->default_binding = Qnil;
keymap->sub_maps_cache = Qnil; /* No possible submaps */
- keymap->fullness = 0;
keymap->name = Qnil;
if (size != 0) /* hack for copy-keymap */
struct key_data indirection;
if (CHARP (idx))
{
- struct Lisp_Event event;
+ Lisp_Event event;
event.event_type = empty_event;
character_to_event (XCHAR (idx), &event,
XCONSOLE (Vselected_console), 0, 0);
copy_keymap_inverse_closure.inverse_table = keymap->inverse_table;
new_keymap->parents = Fcopy_sequence (keymap->parents);
- new_keymap->fullness = keymap->fullness;
new_keymap->sub_maps_cache = Qnil; /* No submaps */
new_keymap->table = Fcopy_hash_table (keymap->table);
new_keymap->inverse_table = Fcopy_hash_table (keymap->inverse_table);
struct gcpro gcpro1, gcpro2;
keymap = get_keymap (keymap, 1, 1);
- fullness = XKEYMAP (keymap)->fullness;
- sub_maps = keymap_submaps (keymap);
+ fullness = XINT (Fhash_table_count (XKEYMAP (keymap)->table));
GCPRO2 (keymap, sub_maps);
- for (; !NILP (sub_maps); sub_maps = XCDR (sub_maps))
+ for (sub_maps = keymap_submaps (keymap);
+ !NILP (sub_maps);
+ sub_maps = XCDR (sub_maps))
{
if (MODIFIER_HASH_KEY_BITS (XCAR (XCAR (sub_maps))) != 0)
{
- Lisp_Object sub_map = XCDR (XCAR (sub_maps));
- fullness--; /* don't count bucky maps */
- fullness += keymap_fullness (sub_map);
+ Lisp_Object bucky_map = XCDR (XCAR (sub_maps));
+ fullness--; /* don't count bucky maps themselves. */
+ fullness += keymap_fullness (bucky_map);
}
}
UNGCPRO;
}
else
{
- signal_simple_error ("Unknown keysym specifier",
- *keysym);
+ signal_simple_error ("Unknown keysym specifier", *keysym);
}
if (SYMBOLP (*keysym))
{
- char *name = (char *)
- string_data (XSYMBOL (*keysym)->name);
+ char *name = (char *) string_data (XSYMBOL (*keysym)->name);
/* FSFmacs uses symbols with the printed representation of keysyms in
their names, like 'M-x, and we use the syntax '(meta x). So, to avoid
{
if (CHAR_OR_CHAR_INTP (spec))
{
- struct Lisp_Event event;
+ Lisp_Event event;
event.event_type = empty_event;
character_to_event (XCHAR_OR_CHAR_INT (spec), &event,
XCONSOLE (Vselected_console), 0, 0);
int
-event_matches_key_specifier_p (struct Lisp_Event *event,
- Lisp_Object key_specifier)
+event_matches_key_specifier_p (Lisp_Event *event, Lisp_Object key_specifier)
{
Lisp_Object event2;
int retval;
static int
meta_prefix_char_p (CONST struct key_data *key)
{
- struct Lisp_Event event;
+ Lisp_Event event;
event.event_type = key_press_event;
event.channel = Vselected_console;
(defvar my-escape-map (lookup-key my-map "\e"))
if the luser really wants the map in a variable.
*/
- Lisp_Object mmap;
+ Lisp_Object meta_map;
struct gcpro ngcpro1;
NGCPRO1 (c);
- mmap = Fgethash (MAKE_MODIFIER_HASH_KEY (MOD_META),
- XKEYMAP (keymap)->table, Qnil);
- if (!NILP (mmap)
- && keymap_fullness (mmap) != 0)
- {
- Lisp_Object desc
- = Fsingle_key_description (Vmeta_prefix_char);
- signal_simple_error_2
- ("Map contains meta-bindings, can't bind", desc, keymap);
- }
+ meta_map = Fgethash (MAKE_MODIFIER_HASH_KEY (MOD_META),
+ XKEYMAP (keymap)->table, Qnil);
+ if (!NILP (meta_map)
+ && keymap_fullness (meta_map) != 0)
+ signal_simple_error_2
+ ("Map contains meta-bindings, can't bind",
+ Fsingle_key_description (Vmeta_prefix_char), keymap);
NUNGCPRO;
}
else
if (metized)
{
- raw_key1.modifiers |= MOD_META;
+ raw_key1.modifiers |= MOD_META;
raw_key2.modifiers |= MOD_META;
metized = 0;
}
c.tail = Qnil;
GCPRO4 (accessible_keymaps, c.tail, prefix, keymap);
- retry:
keymap = get_keymap (keymap, 1, 1);
+
+ retry:
if (NILP (prefix))
- prefix = make_vector (0, Qnil);
- else if (!VECTORP (prefix) || STRINGP (prefix))
{
- prefix = wrong_type_argument (Qarrayp, prefix);
- goto retry;
+ prefix = make_vector (0, Qnil);
}
- else
+ else if (VECTORP (prefix) || STRINGP (prefix))
{
int len = XINT (Flength (prefix));
- Lisp_Object def = Flookup_key (keymap, prefix, Qnil);
+ Lisp_Object def;
Lisp_Object p;
int iii;
struct gcpro ngcpro1;
+ if (len == 0)
+ {
+ prefix = Qnil;
+ goto retry;
+ }
+
+ def = Flookup_key (keymap, prefix, Qnil);
def = get_keymap (def, 0, 1);
if (!KEYMAPP (def))
goto RETURN;
NUNGCPRO;
prefix = p;
}
+ else
+ {
+ prefix = wrong_type_argument (Qarrayp, prefix);
+ goto retry;
+ }
accessible_keymaps = list1 (Fcons (prefix, keymap));
- /* For each map in the list maps,
- look at any other maps it points to
- and stick them at the end if they are not already in the list */
+ /* For each map in the list maps, look at any other maps it points
+ to and stick them at the end if they are not already in the list */
for (c.tail = accessible_keymaps;
!NILP (c.tail);
char buf [255];
if (!EVENTP (key))
{
- struct Lisp_Event event;
+ Lisp_Event event;
event.event_type = empty_event;
CHECK_CHAR_COERCE_INT (key);
character_to_event (XCHAR (key), &event,
format_raw_keys (struct key_data *keys, int count, char *buf)
{
int i;
- struct Lisp_Event event;
+ Lisp_Event event;
event.event_type = key_press_event;
event.channel = Vselected_console;
for (i = 0; i < count; i++)
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_KEYMAP_H_
-#define _XEMACS_KEYMAP_H_
+#ifndef INCLUDED_keymap_h_
+#define INCLUDED_keymap_h_
-DECLARE_LRECORD (keymap, struct Lisp_Keymap);
-#define XKEYMAP(x) XRECORD (x, keymap, struct Lisp_Keymap)
+typedef struct Lisp_Keymap Lisp_Keymap;
+
+DECLARE_LRECORD (keymap, Lisp_Keymap);
+#define XKEYMAP(x) XRECORD (x, keymap, Lisp_Keymap)
#define XSETKEYMAP(x, p) XSETRECORD (x, p, keymap)
#define KEYMAPP(x) RECORDP (x, keymap)
#define CHECK_KEYMAP(x) CHECK_RECORD (x, keymap)
void key_desc_list_to_event (Lisp_Object list, Lisp_Object event,
int allow_menu_events);
-int event_matches_key_specifier_p (struct Lisp_Event *event,
+int event_matches_key_specifier_p (Lisp_Event *event,
Lisp_Object key_specifier);
-#endif /* _XEMACS_KEYMAP_H_ */
+#endif /* INCLUDED_keymap_h_ */
/* Synched up with: Not in FSF. */
+#ifndef INCLUDED_libsst_h_
+#define INCLUDED_libsst_h_
+
#include <sys/ioctl.h>
#ifndef SUNOS4_0_3
#define AUDIO_4_0_3_COMPAT
#else /* !emacs */
# define warn(str) fprintf (stderr, "%s\n", (str))
#endif /* emacs */
+
+#endif /* INCLUDED_libsst_h_ */
/* Synched up with: Not in FSF. */
+#ifndef INCLUDED_libst_h_
+#define INCLUDED_libst_h_
+
#define SAMPLES_PER_SECOND 8192
#define MINLIN -32768
244, 228, 212, 196, 180, 164, 148, 132,
120, 112, 104, 96, 88, 80, 72, 64,
56, 48, 40, 32, 24, 16, 8, 0 };
+
+#endif /* INCLUDED_libst_h_ */
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifndef INCLUDED_line_number_h_
+#define INCLUDED_line_number_h_
+
/* Synched up with: Not in FSF. */
void narrow_line_number_cache (struct buffer *);
void delete_invalidate_line_number_cache (struct buffer *, Bufpos, Bufpos);
EMACS_INT buffer_line_number (struct buffer *, Bufpos, int);
+
+#endif /* INCLUDED_line_number_h_ */
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_LISP_H_
-#define _XEMACS_LISP_H_
+#ifndef INCLUDED_lisp_h_
+#define INCLUDED_lisp_h_
/************************************************************************/
/* general definitions */
void Dynarr_delete_many (void *d, int start, int len);
void Dynarr_free (void *d);
-#define Dynarr_new(type) ((type##_dynarr *) Dynarr_newf (sizeof(type)))
+#define Dynarr_new(type) ((type##_dynarr *) Dynarr_newf (sizeof (type)))
#define Dynarr_at(d, pos) ((d)->base[pos])
#define Dynarr_atp(d, pos) (&Dynarr_at (d, pos))
#define Dynarr_length(d) ((d)->cur)
#define Dynarr_add_many(d, el, len) Dynarr_insert_many (d, el, len, (d)->cur)
#define Dynarr_insert_many_at_start(d, el, len) \
Dynarr_insert_many (d, el, len, 0)
-#define Dynarr_add_literal_string(d, s) Dynarr_add_many (d, s, sizeof(s) - 1)
+#define Dynarr_add_literal_string(d, s) Dynarr_add_many (d, s, sizeof (s) - 1)
#define Dynarr_add_lisp_string(d, s) do { \
- struct Lisp_String *dyna_ls_s = XSTRING (s); \
+ Lisp_String *dyna_ls_s = XSTRING (s); \
Dynarr_add_many (d, (char *) string_data (dyna_ls_s), \
string_length (dyna_ls_s)); \
} while (0)
#define Dynarr_increment(d) ((d)->cur++)
#define Dynarr_set_size(d, n) ((d)->cur = n)
-/* Minimum size in elements for dynamic array when resized; default is 32 */
-extern int Dynarr_min_size;
-
#ifdef MEMORY_USAGE_STATS
struct overhead_stats;
size_t Dynarr_memory_usage (void *d, struct overhead_stats *stats);
typedef struct extent *EXTENT;
struct frame; /* "frame.h" */
struct window; /* "window.h" */
-struct Lisp_Event; /* "events.h" */
-typedef struct Lisp_Event Lisp_Event;
-struct Lisp_Face;
-typedef struct Lisp_Face Lisp_Face;
-struct Lisp_Process; /* "process.c" */
-typedef struct Lisp_Process Lisp_Process;
+typedef struct Lisp_Event Lisp_Event; /* "events.h" */
+typedef struct Lisp_Face Lisp_Face; /* "faces.h" */
+typedef struct Lisp_Process Lisp_Process; /* "procimpl.h" */
struct stat; /* <sys/stat.h> */
-struct Lisp_Color_Instance;
typedef struct Lisp_Color_Instance Lisp_Color_Instance;
-struct Lisp_Font_Instance;
typedef struct Lisp_Font_Instance Lisp_Font_Instance;
-struct Lisp_Image_Instance;
typedef struct Lisp_Image_Instance Lisp_Image_Instance;
-struct Lisp_Gui_Item;
typedef struct Lisp_Gui_Item Lisp_Gui_Item;
struct display_line;
struct display_glyph_area;
Dynarr_declare (struct console_type_entry);
} console_type_entry_dynarr;
-/* Need to declare this here. */
-enum external_data_format
-{
- /* Binary format. This is the simplest format and is what we
- use in the absence of a more appropriate format. This converts
- according to the `binary' coding system:
-
- a) On input, bytes 0 - 255 are converted into characters 0 - 255.
- b) On output, characters 0 - 255 are converted into bytes 0 - 255
- and other characters are converted into `X'.
- */
- FORMAT_BINARY,
-
- /* Format used for filenames. In the original Mule, this is
- user-definable with the `pathname-coding-system' variable.
- For the moment, we just use the `binary' coding system. */
- FORMAT_FILENAME,
-
- /* Format used for output to the terminal. This should be controlled
- by the `terminal-coding-system' variable. Under kterm, this will
- be some ISO2022 system. On some DOS machines, this is Shift-JIS. */
- FORMAT_TERMINAL,
-
- /* Format used for input from the terminal. This should be controlled
- by the `keyboard-coding-system' variable. */
- FORMAT_KEYBOARD,
-
- /* Format used for the external Unix environment -- argv[], stuff
- from getenv(), stuff from the /etc/passwd file, etc.
-
- Perhaps should be the same as FORMAT_FILENAME. */
- FORMAT_OS,
-
- /* Compound-text format. This is the standard X format used for
- data stored in properties, selections, and the like. This is
- an 8-bit no-lock-shift ISO2022 coding system. */
- FORMAT_CTEXT
-};
-
-#define FORMAT_NATIVE FORMAT_FILENAME
-
enum run_hooks_condition
{
RUN_HOOKS_TO_COMPLETION,
/*********** symbol ***********/
+typedef struct Lisp_Symbol Lisp_Symbol;
struct Lisp_Symbol
{
struct lrecord_header lheader;
/* next symbol in this obarray bucket */
- struct Lisp_Symbol *next;
- struct Lisp_String *name;
+ Lisp_Symbol *next;
+ Lisp_String *name;
Lisp_Object value;
Lisp_Object function;
Lisp_Object plist;
};
-typedef struct Lisp_Symbol Lisp_Symbol;
#define SYMBOL_IS_KEYWORD(sym) \
((string_byte (symbol_name (XSYMBOL (sym)), 0) == ':') \
/*********** marker ***********/
+typedef struct Lisp_Marker Lisp_Marker;
struct Lisp_Marker
{
struct lrecord_header lheader;
- struct Lisp_Marker *next, *prev;
+ Lisp_Marker *next;
+ Lisp_Marker *prev;
struct buffer *buffer;
Memind memind;
char insertion_type;
};
-typedef struct Lisp_Marker Lisp_Marker;
DECLARE_LRECORD (marker, Lisp_Marker);
#define XMARKER(x) XRECORD (x, marker, Lisp_Marker)
/*********** readonly objects ***********/
-
+
#define CHECK_C_WRITEABLE(obj) \
do { if (c_readonly (obj)) c_write_error (obj); } while (0)
int c_readonly (Lisp_Object);
int lisp_readonly (Lisp_Object);
Lisp_Object build_string (CONST char *);
-Lisp_Object build_ext_string (CONST char *, enum external_data_format);
+Lisp_Object build_ext_string (CONST char *, Lisp_Object);
Lisp_Object build_translated_string (CONST char *);
Lisp_Object make_string (CONST Bufbyte *, Bytecount);
-Lisp_Object make_ext_string (CONST Extbyte *, EMACS_INT,
- enum external_data_format);
+Lisp_Object make_ext_string (CONST Extbyte *, EMACS_INT, Lisp_Object);
Lisp_Object make_uninit_string (Bytecount);
Lisp_Object make_float (double);
Lisp_Object make_string_nocopy (CONST Bufbyte *, Bytecount);
/* Defined in editfns.c */
void uncache_home_directory (void);
-char *get_home_directory (void);
+Extbyte *get_home_directory (void);
char *user_login_name (uid_t *);
Bufpos bufpos_clip_to_bounds (Bufpos, Bufpos, Bufpos);
Bytind bytind_clip_to_bounds (Bytind, Bytind, Bytind);
/* Defined in events.c */
void clear_event_resource (void);
Lisp_Object allocate_event (void);
-int event_to_character (Lisp_Event *, int, int, int);
/* Defined in fileio.c */
void record_auto_save (void);
/* Defined in indent.c */
int bi_spaces_at_point (struct buffer *, Bytind);
int column_at_point (struct buffer *, Bufpos, int);
-int string_column_at_point (struct Lisp_String *, Bufpos, int);
+int string_column_at_point (Lisp_String *, Bufpos, int);
int current_column (struct buffer *);
void invalidate_current_column (void);
Bufpos vmotion (struct window *, Bufpos, int, int *);
/* Defined in print.c */
void write_string_to_stdio_stream (FILE *, struct console *,
CONST Bufbyte *, Bytecount, Bytecount,
- enum external_data_format);
+ Lisp_Object);
void debug_print (Lisp_Object);
void debug_short_backtrace (int);
void temp_output_buffer_setup (Lisp_Object);
Bufpos find_next_newline (struct buffer *, Bufpos, int);
Bufpos find_next_newline_no_quit (struct buffer *, Bufpos, int);
Bytind bi_find_next_newline_no_quit (struct buffer *, Bytind, int);
-Bytind bi_find_next_emchar_in_string (struct Lisp_String*, Emchar, Bytind, EMACS_INT);
+Bytind bi_find_next_emchar_in_string (Lisp_String*, Emchar, Bytind, EMACS_INT);
Bufpos find_before_next_newline (struct buffer *, Bufpos, Bufpos, int);
struct re_pattern_buffer *compile_pattern (Lisp_Object, struct re_registers *,
char *, int, Error_behavior);
EXFUN (Fleq, MANY);
EXFUN (Flist, MANY);
EXFUN (Flistp, 1);
-#ifdef HAVE_SHLIB
EXFUN (Flist_modules, 0);
EXFUN (Fload_module, 3);
-#endif
+EXFUN (Flookup_key, 3);
EXFUN (Flss, MANY);
EXFUN (Fmake_byte_code, MANY);
EXFUN (Fmake_coding_system, 4);
extern Lisp_Object Qafter, Qall, Qand;
extern Lisp_Object Qarith_error, Qarrayp, Qassoc, Qat, Qautodetect, Qautoload;
extern Lisp_Object Qbackground, Qbackground_pixmap, Qbad_variable, Qbefore;
-extern Lisp_Object Qbeginning_of_buffer, Qbig5, Qbinary, Qbitmap, Qbitp, Qblinking;
-extern Lisp_Object Qboolean, Qbottom, Qbuffer;
+extern Lisp_Object Qbeginning_of_buffer, Qbig5, Qbinary;
+extern Lisp_Object Qbitmap, Qbitp, Qblinking;
+extern Lisp_Object Qboolean, Qbottom, Qbottom_margin, Qbuffer;
extern Lisp_Object Qbuffer_glyph_p, Qbuffer_live_p, Qbuffer_read_only, Qbutton;
extern Lisp_Object Qbyte_code, Qcall_interactively, Qcategory;
extern Lisp_Object Qcategory_designator_p, Qcategory_table_value_p, Qccl, Qcdr;
extern Lisp_Object Qcolor, Qcolor_pixmap_image_instance_p;
extern Lisp_Object Qcolumns, Qcommand, Qcommandp, Qcompletion_ignore_case;
extern Lisp_Object Qconsole, Qconsole_live_p, Qconst_specifier, Qcr, Qcritical;
-extern Lisp_Object Qcrlf, Qctext, Qcurrent_menubar, Qcursor;
+extern Lisp_Object Qcrlf, Qctext, Qcurrent_menubar, Qctext, Qcursor;
extern Lisp_Object Qcyclic_variable_indirection, Qdata, Qdead, Qdecode;
extern Lisp_Object Qdefault, Qdefun, Qdelete, Qdelq, Qdevice, Qdevice_live_p;
extern Lisp_Object Qdim, Qdimension, Qdisabled, Qdisplay, Qdisplay_table;
-extern Lisp_Object Qdoc_string, Qdomain_error, Qdynarr_overhead;
+extern Lisp_Object Qdoc_string, Qdomain_error, Qduplex, Qdynarr_overhead;
extern Lisp_Object Qempty, Qencode, Qend_of_buffer, Qend_of_file, Qend_open;
extern Lisp_Object Qeol_cr, Qeol_crlf, Qeol_lf, Qeol_type, Qeq, Qeql, Qequal;
extern Lisp_Object Qerror, Qerror_conditions, Qerror_message, Qescape_quoted;
extern Lisp_Object Qeval, Qevent_live_p, Qexit, Qextent_live_p, Qextents;
-extern Lisp_Object Qexternal_debugging_output, Qface, Qfeaturep, Qfile_error;
+extern Lisp_Object Qexternal_debugging_output, Qface, Qfeaturep;
+extern Lisp_Object Qfile_name, Qfile_error;
extern Lisp_Object Qfont, Qforce_g0_on_output, Qforce_g1_on_output;
extern Lisp_Object Qforce_g2_on_output, Qforce_g3_on_output, Qforeground;
extern Lisp_Object Qformat, Qframe, Qframe_live_p, Qfunction, Qgap_overhead;
-extern Lisp_Object Qgeneric, Qgeometry, Qglobal, Qheight, Qhighlight, Qhorizontal, Qicon;
+extern Lisp_Object Qgeneric, Qgeometry, Qglobal, Qheight;
+extern Lisp_Object Qhighlight, Qhorizontal, Qicon;
extern Lisp_Object Qicon_glyph_p, Qid, Qidentity, Qimage, Qinfo, Qinherit;
extern Lisp_Object Qinhibit_quit, Qinhibit_read_only;
extern Lisp_Object Qinput_charset_conversion, Qinteger;
extern Lisp_Object Qinteger_char_or_marker_p, Qinteger_or_char_p;
extern Lisp_Object Qinteger_or_marker_p, Qintegerp, Qinteractive, Qinternal;
extern Lisp_Object Qinvalid_function, Qinvalid_read_syntax, Qio_error;
-extern Lisp_Object Qiso2022, Qkey, Qkey_assoc, Qkeymap, Qlambda, Qlayout, Qleft, Qlf;
+extern Lisp_Object Qiso2022, Qkey, Qkey_assoc, Qkeyboard, Qkeymap;
+extern Lisp_Object Qlambda, Qlayout, Qlandscape, Qleft, Qleft_margin, Qlf;
extern Lisp_Object Qlist, Qlistp, Qload, Qlock_shift, Qmacro, Qmagic;
-extern Lisp_Object Qmalformed_list, Qmalformed_property_list;
+extern Lisp_Object Qmakunbound, Qmalformed_list, Qmalformed_property_list;
extern Lisp_Object Qmalloc_overhead, Qmark, Qmarkers;
extern Lisp_Object Qmax, Qmemory, Qmessage, Qminus, Qmnemonic, Qmodifiers;
extern Lisp_Object Qmono_pixmap_image_instance_p, Qmotion;
-extern Lisp_Object Qmouse_leave_buffer_hook, Qmswindows, Qname, Qnas, Qnatnump;
+extern Lisp_Object Qmouse_leave_buffer_hook, Qmsprinter, Qmswindows;
+extern Lisp_Object Qname, Qnas, Qnatnump;
extern Lisp_Object Qno_ascii_cntl, Qno_ascii_eol, Qno_catch;
extern Lisp_Object Qno_conversion, Qno_iso6429, Qnone, Qnot, Qnothing;
extern Lisp_Object Qnothing_image_instance_p, Qnotice;
extern Lisp_Object Qnumber_char_or_marker_p, Qnumberp;
extern Lisp_Object Qobject, Qold_assoc, Qold_delete, Qold_delq, Qold_rassoc;
-extern Lisp_Object Qold_rassq, Qonly, Qor, Qother, Qoutput_charset_conversion;
+extern Lisp_Object Qold_rassq, Qonly, Qor, Qother;
+extern Lisp_Object Qorientation, Qoutput_charset_conversion;
extern Lisp_Object Qoverflow_error, Qpoint, Qpointer, Qpointer_glyph_p;
-extern Lisp_Object Qpointer_image_instance_p, Qpost_read_conversion;
+extern Lisp_Object Qpointer_image_instance_p, Qportrait, Qpost_read_conversion;
extern Lisp_Object Qpre_write_conversion, Qprint, Qprint_length;
extern Lisp_Object Qprint_string_length, Qprocess, Qprogn, Qprovide, Qquit;
extern Lisp_Object Qquote, Qrange_error, Qrassoc, Qrassq, Qread_char;
extern Lisp_Object Qread_from_minibuffer, Qreally_early_error_handler;
extern Lisp_Object Qregion_beginning, Qregion_end, Qrequire, Qresource;
-extern Lisp_Object Qreturn, Qreverse, Qright, Qrun_hooks, Qsans_modifiers;
+extern Lisp_Object Qreturn, Qreverse, Qright, Qright_margin;
+extern Lisp_Object Qrun_hooks, Qsans_modifiers;
extern Lisp_Object Qsave_buffers_kill_emacs, Qsearch, Qselected;
extern Lisp_Object Qself_insert_command, Qself_insert_defer_undo;
-extern Lisp_Object Qsequencep, Qsetting_constant, Qseven, Qshift_jis, Qshort;
+extern Lisp_Object Qsequencep, Qset, Qsetting_constant;
+extern Lisp_Object Qseven, Qshift_jis, Qshort;
extern Lisp_Object Qsignal, Qsimple, Qsingularity_error, Qsize, Qspace;
extern Lisp_Object Qspecifier, Qstandard_input, Qstandard_output, Qstart_open;
extern Lisp_Object Qstream, Qstring, Qstring_lessp, Qsubwindow;
-extern Lisp_Object Qsubwindow_image_instance_p, Qsymbol, Qsyntax, Qt, Qtest;
+extern Lisp_Object Qsubwindow_image_instance_p;
+extern Lisp_Object Qsymbol, Qsyntax, Qt, Qterminal, Qtest;
extern Lisp_Object Qtext, Qtext_image_instance_p, Qtimeout, Qtimestamp;
-extern Lisp_Object Qtoolbar, Qtop, Qtop_level, Qtrue_list_p, Qtty, Qtype;
+extern Lisp_Object Qtoolbar, Qtop, Qtop_margin, Qtop_level;
+extern Lisp_Object Qtrue_list_p, Qtty, Qtype;
extern Lisp_Object Qunbound, Qundecided, Qundefined, Qunderflow_error;
extern Lisp_Object Qunderline, Qunimplemented, Quser_files_and_directories;
extern Lisp_Object Qvalue_assoc, Qvalues;
extern Lisp_Object Qvariable_documentation, Qvariable_domain, Qvertical;
-extern Lisp_Object Qvoid_function, Qvoid_variable, Qwarning, Qwidth, Qwidget, Qwindow;
+extern Lisp_Object Qvoid_function, Qvoid_variable, Qwarning;
+extern Lisp_Object Qwidth, Qwidget, Qwindow;
extern Lisp_Object Qwindow_live_p, Qwindow_system, Qwrong_number_of_arguments;
extern Lisp_Object Qwrong_type_argument, Qx, Qy, Qyes_or_no_p;
extern Lisp_Object Vactivate_menubar_hook, Vascii_canon_table;
extern Lisp_Object Vascii_downcase_table, Vascii_eqv_table;
-extern Lisp_Object Vascii_upcase_table, Vautoload_queue, Vbinary_process_input;
-extern Lisp_Object Vbinary_process_output, Vblank_menubar;
+extern Lisp_Object Vascii_upcase_table, Vautoload_queue, Vblank_menubar;
extern Lisp_Object Vcharset_ascii, Vcharset_composite, Vcharset_control_1;
extern Lisp_Object Vcharset_latin_iso8859_1, Vcharset_greek_iso8859_7;
extern Lisp_Object Vcharset_cyrillic_iso8859_5, Vcharset_hebrew_iso8859_8;
extern Lisp_Object Vstandard_input, Vstandard_output, Vstdio_str;
extern Lisp_Object Vsynchronous_sounds, Vsystem_name, Vterminal_coding_system;
extern Lisp_Object Vthis_command_keys, Vunread_command_event;
-extern Lisp_Object Vwin32_generate_fake_inodes, Vwin32_pipe_read_delay;
extern Lisp_Object Vx_initial_argv_list;
-extern Lisp_Object Qmakunbound, Qset;
-
-#endif /* _XEMACS_LISP_H_ */
+#endif /* INCLUDED_lisp_h_ */
{
unsigned_char_dynarr *dyn = Dynarr_new (unsigned_char);
Emchar c;
+ Lisp_Object val;
while (1)
{
if (c >= 0)
unreadchar (readcharfun, c);
- return make_bit_vector_from_byte_vector (Dynarr_atp (dyn, 0),
- Dynarr_length (dyn));
+ val = make_bit_vector_from_byte_vector (Dynarr_atp (dyn, 0),
+ Dynarr_length (dyn));
+
+ Dynarr_free (dyn);
+
+ return val;
}
\f
i < len;
i++, p++)
{
- struct Lisp_Cons *otem = XCONS (tem);
+ Lisp_Cons *otem = XCONS (tem);
tem = Fcar (tem);
*p = tem;
tem = otem->cdr;
for (iii = 0; CONSP (stuff); iii++)
{
- struct Lisp_Cons *victim = XCONS (stuff);
+ Lisp_Cons *victim = XCONS (stuff);
make_byte_code_args[iii] = Fcar (stuff);
if ((purify_flag || load_force_doc_strings)
&& CONSP (make_byte_code_args[iii])
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_LRECORD_H_
-#define _XEMACS_LRECORD_H_
+#ifndef INCLUDED_lrecord_h_
+#define INCLUDED_lrecord_h_
/* The "lrecord" type of Lisp object is used for all object types
other than a few simple ones. This allows many types to be
The description ends with a "XD_END" or "XD_SPECIFIER_END" record.
Some example descriptions :
+
static const struct lrecord_description cons_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Cons, car), 2 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Cons, car) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Cons, cdr) },
{ XD_END }
};
- Which means "two lisp objects starting at the 'car' element"
+ Which means "two lisp objects starting at the 'car' and 'cdr' elements"
static const struct lrecord_description string_description[] = {
- { XD_BYTECOUNT, offsetof(Lisp_String, size) },
- { XD_OPAQUE_DATA_PTR, offsetof(Lisp_String, data), XD_INDIRECT(0, 1) },
- { XD_LISP_OBJECT, offsetof(Lisp_String, plist), 1 },
+ { XD_BYTECOUNT, offsetof (Lisp_String, size) },
+ { XD_OPAQUE_DATA_PTR, offsetof (Lisp_String, data), XD_INDIRECT(0, 1) },
+ { XD_LISP_OBJECT, offsetof (Lisp_String, plist) },
{ XD_END }
};
"A pointer to string data at 'data', the size of the pointed array being the value
The existing types :
XD_LISP_OBJECT
- Lisp objects. The third element is the count. This is also the type to use
- for pointers to other lrecords.
+ A Lisp object. This is also the type to use for pointers to other lrecords.
+
+ XD_LISP_OBJECT_ARRAY
+ An array of Lisp objects or pointers to lrecords.
+ The third element is the count.
- XD_LO_RESET_NIL
+ XD_LO_RESET_NIL
Lisp objects which will be reset to Qnil when dumping. Useful for cleaning
up caches.
*/
enum lrecord_description_type {
+ XD_LISP_OBJECT_ARRAY,
XD_LISP_OBJECT,
XD_LO_RESET_NIL,
XD_LO_LINK,
#define XD_INDIRECT_DELTA(code) (((-1-code)>>8) & 255)
#define XD_DYNARR_DESC(base_type, sub_desc) \
- { XD_STRUCT_PTR, offsetof(base_type, base), XD_INDIRECT(1, 0), sub_desc }, \
- { XD_INT, offsetof(base_type, cur) }, \
- { XD_INT_RESET, offsetof(base_type, max), XD_INDIRECT(1, 0) }
+ { XD_STRUCT_PTR, offsetof (base_type, base), XD_INDIRECT(1, 0), sub_desc }, \
+ { XD_INT, offsetof (base_type, cur) }, \
+ { XD_INT_RESET, offsetof (base_type, max), XD_INDIRECT(1, 0) }
/* Declaring the following structures as const puts them in the
text (read-only) segment, which makes debugging inconvenient
memset ((char *) (lcr) + sizeof (struct lcrecord_header), 0, \
sizeof (*(lcr)) - sizeof (struct lcrecord_header))
-#endif /* _XEMACS_LRECORD_H_ */
+#endif /* INCLUDED_lrecord_h_ */
/* If the stream is not line-buffered, then we can just call
Lstream_write_1(), which writes in chunks. Otherwise, we
repeatedly call Lstream_putc(), which knows how to handle
- line buffering. */
+ line buffering. Returns number of bytes written. */
ssize_t
Lstream_write (Lstream *lstr, CONST void *data, size_t size)
if (Lstream_putc (lstr, p[i]) < 0)
break;
}
- return i == 0 ? -1 : 0;
+ return i == 0 ? -1 : (ssize_t) i;
}
int
sizeof (struct fixed_buffer_stream));
Lisp_Object
-make_fixed_buffer_input_stream (CONST unsigned char *buf, size_t size)
+make_fixed_buffer_input_stream (CONST void *buf, size_t size)
{
Lisp_Object obj;
Lstream *lstr = Lstream_new (lstream_fixed_buffer, "r");
struct fixed_buffer_stream *str = FIXED_BUFFER_STREAM_DATA (lstr);
- str->inbuf = buf;
+ str->inbuf = (const unsigned char *) buf;
str->size = size;
XSETLSTREAM (obj, lstr);
return obj;
}
Lisp_Object
-make_fixed_buffer_output_stream (unsigned char *buf, size_t size)
+make_fixed_buffer_output_stream (void *buf, size_t size)
{
Lisp_Object obj;
Lstream *lstr = Lstream_new (lstream_fixed_buffer, "w");
struct fixed_buffer_stream *str = FIXED_BUFFER_STREAM_DATA (lstr);
- str->outbuf = buf;
+ str->outbuf = (unsigned char *) buf;
str->size = size;
XSETLSTREAM (obj, lstr);
return obj;
/* Written by Ben Wing. */
-#ifndef _XEMACS_LSTREAM_H_
-#define _XEMACS_LSTREAM_H_
+#ifndef INCLUDED_lstream_h_
+#define INCLUDED_lstream_h_
/************************************************************************/
/* definition of Lstream object */
Lisp_Object make_lisp_string_input_stream (Lisp_Object string,
Bytecount offset,
Bytecount len);
-Lisp_Object make_fixed_buffer_input_stream (CONST unsigned char *buf,
- size_t size);
-Lisp_Object make_fixed_buffer_output_stream (unsigned char *buf,
- size_t size);
+Lisp_Object make_fixed_buffer_input_stream (CONST void *buf, size_t size);
+Lisp_Object make_fixed_buffer_output_stream (void *buf, size_t size);
CONST unsigned char *fixed_buffer_input_stream_ptr (Lstream *stream);
unsigned char *fixed_buffer_output_stream_ptr (Lstream *stream);
Lisp_Object make_resizing_buffer_output_stream (void);
int flags);
Bufpos lisp_buffer_stream_startpos (Lstream *stream);
-#endif /* _XEMACS_LSTREAM_H_ */
+#endif /* INCLUDED_lstream_h_ */
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_MACROS_H_
-#define _XEMACS_MACROS_H_
+#ifndef INCLUDED_macros_h_
+#define INCLUDED_macros_h_
/* Index of next character to fetch from that macro */
extern Lisp_Object Vexecuting_macro;
-#endif /* _XEMACS_MACROS_H_ */
+#endif /* INCLUDED_macros_h_ */
static Lisp_Object
mark_marker (Lisp_Object obj)
{
- struct Lisp_Marker *marker = XMARKER (obj);
+ Lisp_Marker *marker = XMARKER (obj);
Lisp_Object buf;
/* DO NOT mark through the marker's chain.
The buffer's markers chain does not preserve markers from gc;
static void
print_marker (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Marker *marker = XMARKER (obj);
+ Lisp_Marker *marker = XMARKER (obj);
char buf[200];
if (print_readably)
static int
marker_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Marker *marker1 = XMARKER (obj1);
- struct Lisp_Marker *marker2 = XMARKER (obj2);
+ Lisp_Marker *marker1 = XMARKER (obj1);
+ Lisp_Marker *marker2 = XMARKER (obj2);
return ((marker1->buffer == marker2->buffer) &&
(marker1->memind == marker2->memind ||
}
static const struct lrecord_description marker_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Marker, next), 3 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Marker, next) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Marker, prev) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Marker, buffer) },
{ XD_END }
};
DEFINE_BASIC_LRECORD_IMPLEMENTATION ("marker", marker,
mark_marker, print_marker, 0,
marker_equal, marker_hash, marker_description,
- struct Lisp_Marker);
+ Lisp_Marker);
\f
/* Operations on markers. */
static void
check_marker_circularities (struct buffer *buf)
{
- struct Lisp_Marker *tortoise, *hare;
+ Lisp_Marker *tortoise, *hare;
tortoise = BUF_MARKERS (buf);
hare = tortoise;
{
Bufpos charno;
struct buffer *b;
- struct Lisp_Marker *m;
+ Lisp_Marker *m;
int point_p;
CHECK_MARKER (marker);
void
unchain_marker (Lisp_Object m)
{
- struct Lisp_Marker *marker = XMARKER (m);
+ Lisp_Marker *marker = XMARKER (m);
struct buffer *b = marker->buffer;
if (b == 0)
Bytind
bi_marker_position (Lisp_Object marker)
{
- struct Lisp_Marker *m = XMARKER (marker);
+ Lisp_Marker *m = XMARKER (marker);
struct buffer *buf = m->buffer;
Bytind pos;
void
set_bi_marker_position (Lisp_Object marker, Bytind pos)
{
- struct Lisp_Marker *m = XMARKER (marker);
+ Lisp_Marker *m = XMARKER (marker);
struct buffer *buf = m->buffer;
if (!buf)
*/
(position))
{
- struct Lisp_Marker *marker;
+ Lisp_Marker *marker;
Memind pos;
/* A small optimization trick: convert POS to memind now, rather
int
compute_buffer_marker_usage (struct buffer *b, struct overhead_stats *ovstats)
{
- struct Lisp_Marker *m;
+ Lisp_Marker *m;
int total = 0;
int overhead;
for (m = BUF_MARKERS (b); m; m = m->next)
- total += sizeof (struct Lisp_Marker);
+ total += sizeof (Lisp_Marker);
ovstats->was_requested += total;
overhead = fixed_type_block_overhead (total);
/* #### claiming this is all malloc overhead is not really right,
{
/* Unchain all markers of this buffer
and leave them pointing nowhere. */
- REGISTER struct Lisp_Marker *m, *next;
+ REGISTER Lisp_Marker *m, *next;
for (m = BUF_MARKERS (b); m; m = next)
{
m->buffer = 0;
/* Does this byte represent the first byte of a character? */
+INLINE int BUFBYTE_FIRST_BYTE_P(Bufbyte c);
INLINE int
BUFBYTE_FIRST_BYTE_P(Bufbyte c)
{
getrlimit() should be preferred to ulimit().
On Linux, ulimit() is deprecated and always returns -1. */
-#ifndef _XEMACS_MEM_LIMITS_H_
-#define _XEMACS_MEM_LIMITS_H_
+#ifndef INCLUDED_mem_limits_h_
+#define INCLUDED_mem_limits_h_
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /* not NO_LIM_DATA */
#endif /* not HEAP_IN_DATA */
-#endif /* _XEMACS_MEM_LIMITS_H_ */
+#endif /* INCLUDED_mem_limits_h_ */
/* Submenu */
HMENU submenu;
Lisp_Object gui_item = allocate_gui_item ();
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
struct gcpro gcpro1;
GCPRO1 (gui_item);
/* An ordinary item */
Lisp_Object style, id;
Lisp_Object gui_item = gui_parse_item_keywords (item);
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
struct gcpro gcpro1;
GCPRO1 (gui_item);
struct gcpro gcpro1;
unsigned long checksum;
Lisp_Object gui_item = allocate_gui_item ();
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
GCPRO1 (gui_item);
/* We are sometimes called with the menubar unchanged, and with changed
mswindows_popup_menu (Lisp_Object menu_desc, Lisp_Object event)
{
struct frame *f = selected_frame ();
- struct Lisp_Event *eev = NULL;
+ Lisp_Event *eev = NULL;
HMENU menu;
POINT pt;
int ok;
Initially written by kkm 12/24/97,
*/
-#ifndef _XEMACS_MENUBAR_MSW_H_
-#define _XEMACS_MENUBAR_MSW_H_
+#ifndef INCLUDED_menubar_msw_h_
+#define INCLUDED_menubar_msw_h_
#ifdef HAVE_MENUBARS
#endif /* HAVE_MENUBARS */
-#endif /* _XEMACS_MENUBAR_MSW_H_ */
+#endif /* INCLUDED_menubar_msw_h_ */
\f
static void
-make_dummy_xbutton_event (XEvent *dummy,
- Widget daddy,
- struct Lisp_Event *eev)
+make_dummy_xbutton_event (XEvent *dummy, Widget daddy, Lisp_Event *eev)
/* NULL for eev means query pointer */
{
XButtonPressedEvent *btn = (XButtonPressedEvent *) dummy;
widget_value *data;
Widget parent;
Widget menu;
- struct Lisp_Event *eev = NULL;
+ Lisp_Event *eev = NULL;
XEvent xev;
Lisp_Object frame;
Lisp_Object
menu_parse_submenu_keywords (Lisp_Object desc, Lisp_Object gui_item)
{
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
/* Menu descriptor should be a list */
CHECK_CONS (desc);
Lisp_Object path_entry, submenu_desc, submenu;
struct gcpro gcpro1;
Lisp_Object gui_item = allocate_gui_item ();
- struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+ Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
GCPRO1 (gui_item);
(name, buffer))
{
struct buffer *buf = decode_buffer (buffer, 0);
- struct Lisp_String *n;
+ Lisp_String *n;
Charcount end;
int i;
Bufbyte *name_data;
void
vars_of_menubar (void)
{
- {
- /* put in Vblank_menubar a menubar value which has no visible
- * items. This is a bit tricky due to various quirks. We
- * could use '(["" nil nil]), but this is apparently equivalent
- * to '(nil), and a new frame created with this menubar will
- * get a vertically-squished menubar. If we use " " as the
- * button title instead of "", we get an etched button border.
- * So we use
- * '(("No active menubar" ["" nil nil]))
- * which creates a menu whose title is "No active menubar",
- * and this works fine.
- */
-
- Lisp_Object menu_item[3];
- static CONST char *blank_msg = "No active menubar";
-
- menu_item[0] = build_string ("");
- menu_item[1] = Qnil;
- menu_item[2] = Qnil;
- Vblank_menubar = Fcons (Fcons (build_string (blank_msg),
- Fcons (Fvector (3, &menu_item[0]),
- Qnil)),
- Qnil);
- staticpro (&Vblank_menubar);
- }
+ /* put in Vblank_menubar a menubar value which has no visible
+ * items. This is a bit tricky due to various quirks. We
+ * could use '(["" nil nil]), but this is apparently equivalent
+ * to '(nil), and a new frame created with this menubar will
+ * get a vertically-squished menubar. If we use " " as the
+ * button title instead of "", we get an etched button border.
+ * So we use
+ * '(("No active menubar" ["" nil nil]))
+ * which creates a menu whose title is "No active menubar",
+ * and this works fine.
+ */
+
+ Vblank_menubar = list1 (list2 (build_string ("No active menubar"),
+ vector3 (build_string (""), Qnil, Qnil)));
+ staticpro (&Vblank_menubar);
DEFVAR_BOOL ("popup-menu-titles", &popup_menu_titles /*
If true, popup menus will have title bars at the top.
side-effects.
:key-sequence keys Used in FSF Emacs as an hint to an equivalent keybinding.
- Ignored by XEnacs for easymenu.el compatability.
+ Ignored by XEnacs for easymenu.el compatibility.
:label <form> (unimplemented!) Like :suffix, but replaces label
completely.
/* #### Not properly abstracted for device-independence. */
-#ifndef _XEMACS_MENUBAR_H_
-#define _XEMACS_MENUBAR_H_
+#ifndef INCLUDED_menubar_h_
+#define INCLUDED_menubar_h_
#ifdef HAVE_MENUBARS
#include "gui.h"
#endif /* HAVE_MENUBARS */
-#endif /* _XEMACS_MENUBAR_H_ */
+#endif /* INCLUDED_menubar_h_ */
{
if (!ZEROP (bucket))
{
- struct Lisp_Symbol *next;
+ Lisp_Symbol *next;
if (!SYMBOLP (bucket))
{
signal_simple_error ("Bad obarray passed to try-completions",
{
if (!ZEROP (bucket))
{
- struct Lisp_Symbol *next = symbol_next (XSYMBOL (bucket));
+ Lisp_Symbol *next = symbol_next (XSYMBOL (bucket));
elt = bucket;
eltstring = Fsymbol_name (elt);
if (next)
else
{
write_string_to_stdio_stream (stderr, 0, (CONST Bufbyte *) "\n", 0, 1,
- FORMAT_TERMINAL);
+ Qterminal);
return Qnil;
}
}
struct gcpro gcpro1;
Lisp_Object frame;
+ /* There is an inlining bug in egcs-20000131 c++ that can be worked
+ around as follows: */
+#if defined (__GNUC__) && defined (__cplusplus)
+ alloca (4);
+#endif
+
/* some callers pass in a null string as a way of clearing the echo area.
check for length == 0 now; if this case, neither nonreloc nor reloc
may be valid. */
if (STRINGP (reloc))
nonreloc = XSTRING_DATA (reloc);
write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length,
- FORMAT_TERMINAL);
+ Qterminal);
}
}
** implied warranty.
*/
+#ifndef INCLUDED_miscplay_h_
+#define INCLUDED_miscplay_h_
+
#include <stdlib.h>
#define HEADERSZ 256 /* has to be at least as big as the biggest header */
void **));
void reset_parsestate(void);
int parse_wave_complete(void);
+
+#endif /* INCLUDED_miscplay_h_ */
IC += 2;
*/
-#define CCL_Extention 0x1F /* Extended CCL code
+#define CCL_Extension 0x1F /* Extended CCL code
1:ExtendedCOMMNDRrrRRRrrrXXXXX
2:ARGUEMENT
3:...
ic = jump_address;
break;
- case CCL_Extention:
+ case CCL_Extension:
switch (EXCMD)
{
#ifndef UTF2000
/* Synched up with: FSF Emacs 20.3.10 */
-#ifndef _CCL_H
-#define _CCL_H
+#ifndef INCLUDED_mule_ccl_h_
+#define INCLUDED_mule_ccl_h_
/* Macros for exit status of CCL program. */
#define CCL_STAT_SUCCESS 0 /* Terminated successfully. */
extern Lisp_Object Vfont_ccl_encoder_alist;
extern Lisp_Object Qccl_program;
-#endif /* _CCL_H */
+#endif /* INCLUDED_mule_ccl_h_ */
struct charset_lookup *chlook;
static const struct lrecord_description charset_lookup_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct charset_lookup, charset_by_leading_byte),
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte),
#ifdef UTF2000
128+4*128
#else
};
static const struct struct_description charset_lookup_description = {
- sizeof(struct charset_lookup),
+ sizeof (struct charset_lookup),
charset_lookup_description_1
};
return cpt->property [(unsigned char) code];
}
+void put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table);
void
put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table)
{
Lisp_Object Qsmall;
Lisp_Object Qfont;
+Emchar to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg);
Emchar
to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
{
return Fcdr (Fassq (attribute, ret));
}
+Lisp_Object put_char_attribute (Lisp_Object character,
+ Lisp_Object attribute, Lisp_Object value);
Lisp_Object
put_char_attribute (Lisp_Object character, Lisp_Object attribute,
Lisp_Object value)
return ret;
}
+Lisp_Object remove_char_attribute (Lisp_Object character,
+ Lisp_Object attribute);
Lisp_Object
remove_char_attribute (Lisp_Object character, Lisp_Object attribute)
{
rest = Fcdr (value);
while (!NILP (rest))
{
- int i;
+ int j;
if (!CONSP (rest))
signal_simple_error ("Invalid value for coded-charset",
if (!INTP (ret))
signal_simple_error ("Invalid value for coded-charset",
value);
- i = XINT (ret);
+ j = XINT (ret);
if (XCHARSET_GRAPHIC (ccs) == 1)
- i &= 0x7F;
- code_point = (code_point << 8) | i;
+ j &= 0x7F;
+ code_point = (code_point << 8) | j;
rest = Fcdr (rest);
}
value = make_int (code_point);
static Lisp_Object
mark_charset (Lisp_Object obj)
{
- struct Lisp_Charset *cs = XCHARSET (obj);
+ Lisp_Charset *cs = XCHARSET (obj);
mark_object (cs->short_name);
mark_object (cs->long_name);
static void
print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Charset *cs = XCHARSET (obj);
+ Lisp_Charset *cs = XCHARSET (obj);
char buf[200];
if (print_readably)
}
static const struct lrecord_description charset_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, name), 7 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, doc_string) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, registry) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, short_name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, long_name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, reverse_direction_charset) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, ccl_program) },
#ifdef UTF2000
- { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, decoding_table), 2 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, decoding_table) },
#endif
{ XD_END }
};
DEFINE_LRECORD_IMPLEMENTATION ("charset", charset,
mark_charset, print_charset, 0, 0, 0,
charset_description,
- struct Lisp_Charset);
+ Lisp_Charset);
/* Make a new charset. */
static Lisp_Object
{
unsigned char type = 0;
Lisp_Object obj;
- struct Lisp_Charset *cs =
- alloc_lcrecord_type (struct Lisp_Charset, &lrecord_charset);
+ Lisp_Charset *cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
+
+ zero_lcrecord (cs);
+
XSETCHARSET (obj, cs);
CHARSET_ID (cs) = id;
int id, chars, dimension, columns, graphic, final;
int direction;
Lisp_Object registry, doc_string, short_name, long_name;
- struct Lisp_Charset *cs;
+ Lisp_Charset *cs;
charset = Fget_charset (charset);
if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset)))
*/
(charset, prop))
{
- struct Lisp_Charset *cs;
+ Lisp_Charset *cs;
charset = Fget_charset (charset);
cs = XCHARSET (charset);
*/
(charset, arg1, arg2))
{
- struct Lisp_Charset *cs;
+ Lisp_Charset *cs;
int a1, a2;
int lowlim, highlim;
/* Rewritten by Ben Wing <ben@xemacs.org>. */
-#ifndef _XEMACS_MULE_CHARSET_H
-#define _XEMACS_MULE_CHARSET_H
+#ifndef INCLUDED_mule_charset_h_
+#define INCLUDED_mule_charset_h_
/*
1. Character Sets
int id;
Lisp_Object name;
- Lisp_Object doc_string, registry, short_name, long_name;
+ Lisp_Object doc_string;
+ Lisp_Object registry;
+ Lisp_Object short_name;
+ Lisp_Object long_name;
Lisp_Object reverse_direction_charset;
/* Which half of font to be used to display this character set */
unsigned int graphic;
};
+typedef struct Lisp_Charset Lisp_Charset;
-DECLARE_LRECORD (charset, struct Lisp_Charset);
-#define XCHARSET(x) XRECORD (x, charset, struct Lisp_Charset)
+DECLARE_LRECORD (charset, Lisp_Charset);
+#define XCHARSET(x) XRECORD (x, charset, Lisp_Charset)
#define XSETCHARSET(x, p) XSETRECORD (x, p, charset)
#define CHARSETP(x) RECORDP (x, charset)
#define CHECK_CHARSET(x) CHECK_RECORD (x, charset)
struct charset_lookup {
/* Table of charsets indexed by (leading byte - MIN_LEADING_BYTE). */
Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES];
-
+
/* Table of charsets indexed by type/final-byte/direction. */
Lisp_Object charset_by_attributes[4][128][2];
};
Bytecount copy_external_to_internal (CONST unsigned char *external,
int len, Bufbyte *internal);
-#endif /* _XEMACS_MULE_CHARSET_H */
+#endif /* INCLUDED_mule_charset_h_ */
Lisp_Object Qpathname_coding_system = 0;
static void
-mcpath_encode_code (struct Lisp_Coding_System *cp)
+mcpath_encode_code (Lisp_Coding_System *cp)
{
Lisp_Object coding_system;
mule_encode_path_1 (unsigned char *src, unsigned int srcsize,
unsigned char *dst, unsigned int dstsize)
{
- struct Lisp_Coding_System code;
+ Lisp_Coding_System code;
mcpath_encode_code (&code);
if (CODE_TYPE (&code) > MULE_AUTOCONV)
mule_decode_path_1 (unsigned char *src, unsigned char *dst,
unsigned int dstsize)
{
- struct Lisp_Coding_System code;
+ Lisp_Coding_System code;
mcpath_encode_code (&code);
if (CODE_TYPE (&code) > MULE_AUTOCONV)
mc_getwd (unsigned char path[])
{
unsigned char *p;
-
+
p = getwd (path);
if (p)
{
unsigned char buffer[MC_MAXPATHLEN];
int len;
-
+
len = mule_encode_path_1 (path, strlen (path) + 1, buffer, sizeof buffer);
if (len > 0)
{
int i, len;
char *p;
Lisp_Object temp;
- struct Lisp_String *s;
+ Lisp_String *s;
CHECK_CONS (pattern);
len = XINT (Flength (pattern));
/* Like ftell, but for a buffer in memory */
static long
-dtell()
+dtell (void)
{
return file_posn;
}
/* Data buffer analogs for FileReadS and FileReadL in NAS. */
static unsigned short
-DataReadS(int swapit)
+DataReadS (int swapit)
{
unsigned short us;
}
static AuUint32
-DataReadL(int swapit)
+DataReadL (int swapit)
{
AuUint32 ul;
}
static int
-readChunk(RiffChunk *c)
+readChunk (RiffChunk *c)
{
int status;
char n;
read the wave data from a buffer in memory. */
static WaveInfo *
-WaveOpenDataForReading(CONST char *data,
- int length)
+WaveOpenDataForReading (CONST char *data,
+ int length)
{
RiffChunk ck;
RIFF_FOURCC fourcc;
last edit: 09-Jul-1983 D A Gwyn
*/
+#ifndef INCLUDED_ndir_h_
+#define INCLUDED_ndir_h_
+
#define DIRBLKSIZ 512 /* size of directory block */
#ifdef WINDOWSNT
#define MAXNAMLEN 255
void seekdir (DIR *dirp, long loc);
#define rewinddir( dirp ) seekdir( dirp, 0L )
+
+#endif /* INCLUDED_ndir_h_ */
#endif
extern Lisp_Object Vmswindows_get_true_file_attributes;
-extern char *get_home_directory(void);
+int nt_fake_unix_uid;
static char startup_dir[ MAXPATHLEN ];
uid_t
getuid ()
-{
- return the_passwd.pw_uid;
+{
+ return nt_fake_unix_uid;
}
uid_t
geteuid ()
{
- /* I could imagine arguing for checking to see whether the user is
- in the Administrators group and returning a UID of 0 for that
- case, but I don't know how wise that would be in the long run. */
- return getuid ();
+ return nt_fake_unix_uid;
}
gid_t
struct passwd *
getpwuid (uid_t uid)
{
- if (uid == the_passwd.pw_uid)
- return &the_passwd;
- return NULL;
+ if (uid == nt_fake_unix_uid)
+ {
+ the_passwd.pw_gid = the_passwd.pw_uid = uid;
+ return &the_passwd;
+ }
+ else
+ return NULL;
}
struct passwd *
void
init_user_info ()
{
+ /* This code is pretty much of ad hoc nature. There is no unix-like
+ UIDs under Windows NT. There is no concept of root user, because
+ all security is ACL-based. Instead, let's use a simple variable,
+ nt-fake-unix-uid, which would allow the user to have a uid of
+ choice. --kkm, 02/03/2000 */
+#if 0
/* Find the user's real name by opening the process token and
looking up the name associated with the user-sid in that token.
the_passwd.pw_gid = 123;
}
+ if (token)
+ CloseHandle (token);
+#else
+ /* Obtain only logon id here, uid part is moved to getuid */
+ char name[256];
+ DWORD length = sizeof (name);
+ if (GetUserName (name, &length))
+ strcpy (the_passwd.pw_name, name);
+ else
+ strcpy (the_passwd.pw_name, "unknown");
+#endif
+
/* Ensure HOME and SHELL are defined. */
#if 0
/*
/* Set dir and shell from environment variables. */
strcpy (the_passwd.pw_dir, get_home_directory());
strcpy (the_passwd.pw_shell, getenv ("SHELL"));
-
- if (token)
- CloseHandle (token);
}
/* Normalize filename by converting all path separators to
#endif /* 0 */
static FILETIME utc_base_ft;
-static long double utc_base;
static int init = 0;
+#if 0
+
+static long double utc_base;
+
time_t
convert_time (FILETIME ft)
{
ret -= utc_base;
return (time_t) (ret * 1e-7);
}
+#else
+
+static LARGE_INTEGER utc_base_li;
+
+time_t
+convert_time (FILETIME uft)
+{
+ time_t ret;
+#ifndef MAXLONGLONG
+ SYSTEMTIME st;
+ struct tm t;
+ FILETIME ft;
+ TIME_ZONE_INFORMATION tzi;
+ DWORD tzid;
+#else
+ LARGE_INTEGER lft;
+#endif
+
+ if (!init)
+ {
+ /* Determine the delta between 1-Jan-1601 and 1-Jan-1970. */
+ SYSTEMTIME st;
+
+ st.wYear = 1970;
+ st.wMonth = 1;
+ st.wDay = 1;
+ st.wHour = 0;
+ st.wMinute = 0;
+ st.wSecond = 0;
+ st.wMilliseconds = 0;
+
+ SystemTimeToFileTime (&st, &utc_base_ft);
+
+ utc_base_li.LowPart = utc_base_ft.dwLowDateTime;
+ utc_base_li.HighPart = utc_base_ft.dwHighDateTime;
+
+ init = 1;
+ }
+
+#ifdef MAXLONGLONG
+
+ /* On a compiler that supports long integers, do it the easy way */
+ lft.LowPart = uft.dwLowDateTime;
+ lft.HighPart = uft.dwHighDateTime;
+ ret = (time_t) ((lft.QuadPart - utc_base_li.QuadPart) / 10000000);
+
+#else
+
+ /* Do it the hard way using mktime. */
+ FileTimeToLocalFileTime(&uft, &ft);
+ FileTimeToSystemTime (&ft, &st);
+ tzid = GetTimeZoneInformation (&tzi);
+ t.tm_year = st.wYear - 1900;
+ t.tm_mon = st.wMonth - 1;
+ t.tm_mday = st.wDay;
+ t.tm_hour = st.wHour;
+ t.tm_min = st.wMinute;
+ t.tm_sec = st.wSecond;
+ t.tm_isdst = (tzid == TIME_ZONE_ID_DAYLIGHT);
+ /* st.wMilliseconds not applicable */
+ ret = mktime(&t);
+ if (ret == -1)
+ {
+ ret = 0;
+ }
+
+#endif
+
+ return ret;
+}
+#endif
#if 0
/* in case we ever have need of this */
#endif
+/* stat has been fixed since MSVC 5.0.
+ Oh, and do not encapsulater stat for non-MS compilers, too */
+/* #### popineau@ese-metz.fr says they still might be broken.
+ Oh well... Let's add that `1 ||' condition.... --kkm */
+#if 1 || defined(_MSC_VER) && _MSC_VER < 1100
+
/* Since stat is encapsulated on Windows NT, we need to encapsulate
the equally broken fstat as well. */
-int
+int _cdecl
fstat (int handle, struct stat *buffer)
{
int ret;
buf->st_ino = (unsigned short) (fake_inode ^ (fake_inode >> 16));
/* consider files to belong to current user */
- buf->st_uid = the_passwd.pw_uid;
- buf->st_gid = the_passwd.pw_gid;
+ buf->st_uid = buf->st_gid = nt_fake_unix_uid;
/* volume_info is set indirectly by map_win32_filename */
buf->st_dev = volume_info.serialnum;
buf->st_rdev = volume_info.serialnum;
-
buf->st_size = wfd.nFileSizeLow;
/* Convert timestamps to Unix format. */
return 0;
}
+#endif /* defined(_MSC_VER) && _MSC_VER < 1100 */
/* From callproc.c */
extern Lisp_Object Vbinary_process_input;
CloseHandle (p_file->file);
}
+void
+vars_of_nt (void)
+{
+ DEFVAR_INT ("nt-fake-unix-uid", &nt_fake_unix_uid /*
+*Set uid returned by `user-uid' and `user-real-uid'.
+Under NT and 9x, there is no uids, and even no almighty user called root.
+By setting this variable, you can have any uid of choice. Default is 0.
+Changes to this variable take effect immediately.
+*/ );
+ nt_fake_unix_uid = 0;
+}
+
/* end of nt.c */
-#ifndef _NT_H_
-#define _NT_H_
-
/* Support routines for the NT version of XEmacs.
Copyright (C) 1994 Free Software Foundation, Inc.
/* #define FULL_DEBUG */
+#ifndef INCLUDED_nt_h_
+#define INCLUDED_nt_h_
+
#ifdef DEBUG_XEMACS
#define DebPrint(stuff) _DebPrint stuff
#else
extern void init_ntproc ();
extern void term_ntproc ();
-#endif /* _NT_H_ */
+#endif /* INCLUDED_nt_h_ */
int edata;
int etext;
-/* The major and minor versions of NT. */
-int nt_major_version;
-int nt_minor_version;
-
-/* Distinguish between Windows NT and Windows 95. */
-int os_subtype;
-
/* Cache information describing the NT system for later use. */
void
cache_system_info (void)
{
- union
- {
- struct info
- {
- char major;
- char minor;
- short platform;
- } info;
- DWORD data;
- } version;
-
- /* Cache the version of the operating system. */
- version.data = GetVersion ();
- nt_major_version = version.info.major;
- nt_minor_version = version.info.minor;
-
- if (version.info.platform & 0x8000)
- os_subtype = OS_WIN95;
- else
- os_subtype = OS_NT;
-
/* Cache page size, allocation unit, processor type, etc. */
GetSystemInfo (&sysinfo_cache);
syspage_mask = sysinfo_cache.dwPageSize - 1;
return result;
}
-#if !defined (CANNOT_DUMP) && !defined(HEAP_IN_DATA)
+#if !defined (CANNOT_DUMP) && !defined(HEAP_IN_DATA) && !defined(PDUMP)
/* Recreate the heap from the data that was dumped to the executable.
EXECUTABLE_PATH tells us where to find the executable. */
/* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */
/* Synced with FSF Emacs 19.34.6 by Marc Paquette <marcpa@cam.org> */
-#ifndef NTHEAP_H_
-#define NTHEAP_H_
+#ifndef INCLUDED_ntheap_h_
+#define INCLUDED_ntheap_h_
#include <windows.h>
#define UNINIT_PTR ((void *) 0xF0A0F0A0)
#define UNINIT_LONG (0xF0A0F0A0L)
-enum {
- OS_WIN95 = 1,
- OS_NT
-};
-
-extern int os_subtype;
-
/* Emulation of Unix sbrk(). */
extern void *sbrk (unsigned long size);
int open_output_file (file_data *p_file, CONST char *name, unsigned long size);
void close_file_data (file_data *p_file);
-#endif /* NTHEAP_H_ */
+#endif /* INCLUDED_ntheap_h_ */
#include <signal.h>
/* must include CRT headers *before* config.h */
-/* ### I don't believe it - martin */
+/* #### I don't believe it - martin */
#include <config.h>
#undef signal
#undef wait
DWORD WINAPI reader_thread (void *arg);
+/* Determine if running on Windows 9x and not NT */
+static int
+windows9x_p (void)
+{
+ return GetVersion () & 0x80000000;
+}
+
/* Find an unused process slot. */
child_process *
new_child (void)
errno = EINVAL;
return -1;
}
- GET_C_STRING_FILENAME_DATA_ALLOCA (full, cmdname);
+ TO_EXTERNAL_FORMAT (LISP_STRING, full,
+ C_STRING_ALLOCA, cmdname,
+ Qfile_name);
}
else
{
GetClassName (hwnd, window_class, sizeof (window_class));
if (strcmp (window_class,
- (os_subtype == OS_WIN95)
+ windows9x_p()
? "tty"
: "ConsoleWindowClass") == 0)
{
if (NILP (Vwin32_start_process_share_console) && cp && cp->hwnd)
{
#if 1
- if (os_subtype == OS_WIN95)
+ if (windows9x_p())
{
/*
Another possibility is to try terminating the VDM out-right by
/* Sync with FSF Emacs 19.34.6 note: dwWinThreadId declared in
w32term.h and defined in w32fns.c, both of which are not in current
- XEmacs. ### Check what we lose by ifdef'ing out these. --marcpa */
+ XEmacs. #### Check what we lose by ifdef'ing out these. --marcpa */
#if 0
/* Need to set input thread locale if present. */
if (dwWinThreadId)
struct font_enum_t
{
HDC hdc;
- struct device *d;
+ Lisp_Object list;
};
static int CALLBACK
font_enum_callback_2 (ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme,
int FontType, struct font_enum_t *font_enum)
{
- struct mswindows_font_enum *fontlist, **fonthead;
char fontname[MSW_FONTSIZE];
+ Lisp_Object fontname_lispstr;
int i;
/*
/* Formula for pointsize->height from LOGFONT docs in Platform SDK */
sprintf (fontname, "%s::%d::", lpelfe->elfLogFont.lfFaceName,
MulDiv (lpntme->ntmTm.tmHeight - lpntme->ntmTm.tmInternalLeading,
- 72, DEVICE_MSWINDOWS_LOGPIXELSY (font_enum->d)));
+ 72, GetDeviceCaps (font_enum->hdc, LOGPIXELSY)));
/*
* The enumerated font character set strings are not to be trusted because
if (i==countof (charset_map))
strcpy (fontname, charset_map[0].name);
- /* Check that the new font is not a duplicate */
- fonthead = &DEVICE_MSWINDOWS_FONTLIST (font_enum->d);
- fontlist = *fonthead;
- while (fontlist)
- if (!strcmp (fontname, fontlist->fontname))
- return 1; /* found a duplicate */
- else
- fontlist = fontlist->next;
-
- /* Insert entry at head */
- fontlist = *fonthead;
- *fonthead = xmalloc (sizeof (struct mswindows_font_enum));
- if (*fonthead == NULL)
- {
- *fonthead = fontlist;
- return 0;
- }
- strcpy ((*fonthead)->fontname, fontname);
- (*fonthead)->next = fontlist;
+ /* Add the font name to the list if not already there */
+ fontname_lispstr = build_string (fontname);
+ if (NILP (memq_no_quit (fontname_lispstr, font_enum->list)))
+ font_enum->list = Fcons (fontname_lispstr, font_enum->list);
+
return 1;
}
}
/*
- * Enumerate the available fonts. Called by mswindows_init_device().
- * Fills in the device's device-type-specfic fontlist.
+ * Enumerate the available on the HDC fonts and return a list of string
+ * font names.
*/
-void
-mswindows_enumerate_fonts (struct device *d)
+Lisp_Object
+mswindows_enumerate_fonts (HDC hdc)
{
- HDC hdc = CreateCompatibleDC (NULL);
+ /* This cannot CG */
LOGFONT logfont;
struct font_enum_t font_enum;
logfont.lfFaceName[0] = '\0';
logfont.lfPitchAndFamily = DEFAULT_PITCH;
font_enum.hdc = hdc;
- font_enum.d = d;
- DEVICE_MSWINDOWS_FONTLIST (d) = NULL;
+ font_enum.list = Qnil;
EnumFontFamiliesEx (hdc, &logfont, (FONTENUMPROC) font_enum_callback_1,
(LPARAM) (&font_enum), 0);
- DeleteDC (hdc);
+ return font_enum.list;
+}
+
+static void
+mswindows_create_font_variant (Lisp_Font_Instance* f,
+ int under, int strike)
+{
+ /* Cannot GC */
+
+ LOGFONT lf;
+ HFONT hfont;
+
+ assert (FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, under, strike) == NULL);
+
+ if (GetObject (FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, 0, 0),
+ sizeof (lf), (void*) &lf) == 0)
+ {
+ hfont = MSWINDOWS_BAD_HFONT;
+ }
+ else
+ {
+ lf.lfUnderline = under;
+ lf.lfStrikeOut = strike;
+
+ hfont = CreateFontIndirect (&lf);
+ if (hfont == NULL)
+ hfont = MSWINDOWS_BAD_HFONT;
+ }
+
+ FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, under, strike) = hfont;
}
+HFONT
+mswindows_get_hfont (Lisp_Font_Instance* f,
+ int under, int strike)
+{
+ /* Cannot GC */
+ HFONT hfont;
+
+ if (FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, under, strike) == NULL)
+ mswindows_create_font_variant (f, under, strike);
+
+ assert (FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, under, strike) != NULL);
+
+ hfont = FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, under, strike);
+
+ /* If strikeout/underline variant of the font could not be
+ created, then use the base version of the font */
+ if (hfont == MSWINDOWS_BAD_HFONT)
+ hfont = FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, 0, 0);
+
+ assert (hfont != NULL && hfont != MSWINDOWS_BAD_HFONT);
+
+ return hfont;
+}
\f
/************************************************************************/
/* methods */
/************************************************************************/
static int
-mswindows_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
+mswindows_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
CONST char *extname;
COLORREF color;
- GET_C_STRING_CTEXT_DATA_ALLOCA (name, extname);
+ TO_EXTERNAL_FORMAT (LISP_STRING, name,
+ C_STRING_ALLOCA, extname,
+ Qctext);
color = mswindows_string_to_color(extname);
if (color != -1)
{
#if 0
static void
-mswindows_mark_color_instance (struct Lisp_Color_Instance *c)
+mswindows_mark_color_instance (Lisp_Color_Instance *c)
{
}
#endif
static void
-mswindows_print_color_instance (struct Lisp_Color_Instance *c,
- Lisp_Object printcharfun,
- int escapeflag)
+mswindows_print_color_instance (Lisp_Color_Instance *c,
+ Lisp_Object printcharfun,
+ int escapeflag)
{
char buf[32];
COLORREF color = COLOR_INSTANCE_MSWINDOWS_COLOR (c);
}
static void
-mswindows_finalize_color_instance (struct Lisp_Color_Instance *c)
+mswindows_finalize_color_instance (Lisp_Color_Instance *c)
{
if (c->data)
{
}
static int
-mswindows_color_instance_equal (struct Lisp_Color_Instance *c1,
- struct Lisp_Color_Instance *c2,
- int depth)
+mswindows_color_instance_equal (Lisp_Color_Instance *c1,
+ Lisp_Color_Instance *c2,
+ int depth)
{
return (COLOR_INSTANCE_MSWINDOWS_COLOR(c1) == COLOR_INSTANCE_MSWINDOWS_COLOR(c2));
}
static unsigned long
-mswindows_color_instance_hash (struct Lisp_Color_Instance *c, int depth)
+mswindows_color_instance_hash (Lisp_Color_Instance *c, int depth)
{
return (unsigned long) COLOR_INSTANCE_MSWINDOWS_COLOR(c);
}
static Lisp_Object
-mswindows_color_instance_rgb_components (struct Lisp_Color_Instance *c)
+mswindows_color_instance_rgb_components (Lisp_Color_Instance *c)
{
COLORREF color = COLOR_INSTANCE_MSWINDOWS_COLOR (c);
return list3 (make_int (GetRValue (color) * 257),
{
CONST char *extname;
- GET_C_STRING_CTEXT_DATA_ALLOCA (color, extname);
+ TO_EXTERNAL_FORMAT (LISP_STRING, color,
+ C_STRING_ALLOCA, extname,
+ Qctext);
return (mswindows_string_to_color(extname)!=-1);
}
\f
static void
-mswindows_finalize_font_instance (struct Lisp_Font_Instance *f)
-{
- if (f->data)
- {
- DeleteObject(f->data);
- f->data=0;
- }
-}
-
+mswindows_finalize_font_instance (Lisp_Font_Instance *f);
+/*
+ * This is a work horse for both mswindows_initialize_font_instanc and
+ * msprinter_initialize_font_instance.
+ */
static int
-mswindows_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
- Lisp_Object device, Error_behavior errb)
+initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
+ Lisp_Object device_font_list, HDC hdc,
+ Error_behavior errb)
{
CONST char *extname;
LOGFONT logfont;
char fontname[LF_FACESIZE], weight[LF_FACESIZE], *style, points[8];
char effects[LF_FACESIZE], charset[LF_FACESIZE];
char *c;
- HDC hdc;
- HFONT holdfont;
+ HFONT hfont, holdfont;
TEXTMETRIC metrics;
extname = XSTRING_DATA (name);
}
/* Formula for pointsize->height from LOGFONT docs in MSVC5 Platform SDK */
- logfont.lfHeight = -MulDiv(pt, DEVICE_MSWINDOWS_LOGPIXELSY (XDEVICE (device)), 72);
+ logfont.lfHeight = -MulDiv(pt, GetDeviceCaps (hdc, LOGPIXELSY), 72);
logfont.lfWidth = 0;
/* Effects */
/* Default to monospaced if the specified fontname doesn't exist. */
logfont.lfPitchAndFamily = FF_MODERN;
- /* Windows will silently substitute a default font if the fontname
- * specifies a non-existent font. So we check the font against the device's
- * list of font patterns to make sure that at least one of them matches. */
- {
- struct mswindows_font_enum *fontlist;
- char truename[MSW_FONTSIZE];
- int done = 0;
-
- sprintf (truename, "%s:%s:%d:%s:%s", fontname, weight, pt, effects, charset);
- fontlist = DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device));
- while (fontlist && !done)
- {
- done = match_font (fontlist->fontname, truename, NULL);
- fontlist = fontlist->next;
- }
- if (!done)
- {
- maybe_signal_simple_error ("No matching font", name, Qfont, errb);
- return 0;
- }
- }
+ /* Windows will silently substitute a default font if the fontname
+ specifies a non-existent font. So we check the font against the
+ device's list of font patterns to make sure that at least one of
+ them matches.
+
+ Personally, I do not like the idea - it is better to come out with
+ some font than completely without one. The diversity of printer
+ fonts is much greater than that of screen font. We can tread on
+ that. -- kkm. */
+
+ if (!NILP (device_font_list))
+ {
+ Lisp_Object fonttail;
+ char truename[MSW_FONTSIZE];
- if ((f->data = CreateFontIndirect(&logfont)) == NULL)
+ sprintf (truename, "%s:%s:%d:%s:%s", fontname, weight, pt, effects, charset);
+ LIST_LOOP (fonttail, device_font_list)
+ {
+ if (match_font (XSTRING_DATA (XCAR (fonttail)), truename, NULL))
+ break;
+ }
+ if (NILP (fonttail))
+ {
+ maybe_signal_simple_error ("No matching font", name, Qfont, errb);
+ return 0;
+ }
+ }
+
+ if ((hfont = CreateFontIndirect(&logfont)) == NULL)
{
maybe_signal_simple_error ("Couldn't create font", name, Qfont, errb);
return 0;
}
- hdc = CreateCompatibleDC (NULL);
- if (hdc)
+ f->data = xnew_and_zero (struct mswindows_font_instance_data);
+ FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f,0,0) = hfont;
+
+ holdfont = SelectObject(hdc, hfont);
+ if (!holdfont)
+ {
+ mswindows_finalize_font_instance (f);
+ maybe_signal_simple_error ("Couldn't map font", name, Qfont, errb);
+ return 0;
+ }
+
+ GetTextMetrics (hdc, &metrics);
+ SelectObject(hdc, holdfont);
+
+ f->width = (unsigned short) metrics.tmAveCharWidth;
+ f->height = (unsigned short) metrics.tmHeight;
+ /* Font variant metrics hack. The problem is that in Windows
+ some underlined fonts have the descent of one pixel more
+ than their non-underlined counterparts. Font variants
+ though are assumed to have identical metrics. Lowering
+ the font's baseline one pixel down cures the problem, and
+ is visually undetectable. - kkm */
+ f->ascent = (unsigned short) metrics.tmAscent - 1;
+ f->descent = (unsigned short) metrics.tmDescent + 1;
+ f->proportional_p = (metrics.tmPitchAndFamily & TMPF_FIXED_PITCH);
+
+ return 1;
+}
+
+static int
+mswindows_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
+ Lisp_Object device, Error_behavior errb)
+{
+ HDC hdc = CreateCompatibleDC (NULL);
+ Lisp_Object font_list = DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device));
+ int res = initialize_font_instance (f, name, font_list, hdc, errb);
+ DeleteDC (hdc);
+ return res;
+}
+
+static int
+msprinter_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
+ Lisp_Object device, Error_behavior errb)
+{
+ HDC hdc = DEVICE_MSPRINTER_HDC (XDEVICE (device));
+ Lisp_Object font_list = DEVICE_MSPRINTER_FONTLIST (XDEVICE (device));
+ return initialize_font_instance (f, name, font_list, hdc, errb);
+}
+
+static void
+mswindows_finalize_font_instance (Lisp_Font_Instance *f)
+{
+ int i;
+
+ if (f->data)
{
- holdfont = SelectObject(hdc, f->data);
- if (holdfont)
+ for (i = 0; i < MSWINDOWS_NUM_FONT_VARIANTS; i++)
{
- GetTextMetrics (hdc, &metrics);
- SelectObject(hdc, holdfont);
- DeleteDC (hdc);
- f->width = (unsigned short) metrics.tmAveCharWidth;
- f->height = (unsigned short) metrics.tmHeight;
- f->ascent = (unsigned short) metrics.tmAscent;
- f->descent = (unsigned short) metrics.tmDescent;
- f->proportional_p = (metrics.tmPitchAndFamily & TMPF_FIXED_PITCH);
- return 1;
+ if (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != NULL
+ && FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != MSWINDOWS_BAD_HFONT)
+ DeleteObject (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i));
}
- DeleteDC (hdc);
- }
- mswindows_finalize_font_instance (f);
- maybe_signal_simple_error ("Couldn't map font", name, Qfont, errb);
- return 0;
+
+ xfree (f->data);
+ f->data = 0;
+ }
}
#if 0
static void
-mswindows_mark_font_instance (struct Lisp_Font_Instance *f)
+mswindows_mark_font_instance (Lisp_Font_Instance *f)
{
}
#endif
static void
-mswindows_print_font_instance (struct Lisp_Font_Instance *f,
- Lisp_Object printcharfun,
- int escapeflag)
+mswindows_print_font_instance (Lisp_Font_Instance *f,
+ Lisp_Object printcharfun,
+ int escapeflag)
{
+ char buf[10];
+ sprintf (buf, " 0x%lx",
+ (unsigned long)FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f,0,0));
+ write_c_string (buf, printcharfun);
}
static Lisp_Object
mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device)
{
- Lisp_Object result = Qnil;
- struct mswindows_font_enum *fontlist;
- char fontname[MSW_FONTSIZE], *extpattern;
+ Lisp_Object fonttail, result = Qnil;
+ char *extpattern;
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, pattern,
+ C_STRING_ALLOCA, extpattern,
+ Qctext);
- GET_C_STRING_CTEXT_DATA_ALLOCA (pattern, extpattern);
- fontlist = DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device));
- while (fontlist)
+ LIST_LOOP (fonttail, DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device)))
{
- if (match_font (fontlist->fontname, extpattern, fontname))
- result = Fcons (build_string (fontname), result);
- fontlist = fontlist->next;
+ if (match_font (XSTRING_DATA (XCAR (fonttail)), extpattern, NULL))
+ result = Fcons (XCAR (fonttail), result);
}
return Fnreverse (result);
* Missing parts of the font spec should be filled in with these values:
* Courier New:Regular:10::Western */
static Lisp_Object
-mswindows_font_instance_truename (struct Lisp_Font_Instance *f, Error_behavior errb)
+mswindows_font_instance_truename (Lisp_Font_Instance *f, Error_behavior errb)
{
int nsep=0;
char *name = (char *) XSTRING_DATA (f->name);
default:;
}
- return build_ext_string (extname, FORMAT_OS);
+ return build_ext_string (extname, Qnative);
}
#ifdef MULE
CONSOLE_HAS_METHOD (mswindows, font_spec_matches_charset);
CONSOLE_HAS_METHOD (mswindows, find_charset_font);
#endif
+
+ /* Printer methods - delegate most to windows methods,
+ since graphical objects behave the same way. */
+
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, initialize_color_instance);
+/* CONSOLE_INHERITS_METHOD (msprinter, mswindows, mark_color_instance); */
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, print_color_instance);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, finalize_color_instance);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, color_instance_equal);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, color_instance_hash);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, color_instance_rgb_components);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, valid_color_name_p);
+
+ CONSOLE_HAS_METHOD (msprinter, initialize_font_instance);
+/* CONSOLE_INHERITS_METHOD (msprinter, mswindows, mark_font_instance); */
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, print_font_instance);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, finalize_font_instance);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, font_instance_truename);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, list_fonts);
+#ifdef MULE
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, font_spec_matches_charset);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, find_charset_font);
+#endif
}
void
*/
-#ifndef _XEMACS_OBJECTS_MSW_H_
-#define _XEMACS_OBJECTS_MSW_H_
+#ifndef INCLUDED_objects_msw_h_
+#define INCLUDED_objects_msw_h_
#include "objects.h"
#define COLOR_INSTANCE_MSWINDOWS_COLOR(c) \
(MSWINDOWS_COLOR_INSTANCE_DATA (c)->color)
-#define FONT_INSTANCE_MSWINDOWS_HFONT(c) ((HFONT) (c)->data)
+/* The four HFONTS are for the 4 (underlined, strikethrough)
+ combinations. Only the one at index 0, neither underlined nor
+ struk through is created with the font instance. Other fonts are
+ created as necessary during redisplay, using the one at index 0
+ as protptype */
+#define MSWINDOWS_NUM_FONT_VARIANTS 4
+struct mswindows_font_instance_data
+{
+ HFONT hfont [MSWINDOWS_NUM_FONT_VARIANTS];
+};
+
+#define MSWINDOWS_FONT_INSTANCE_DATA(c) \
+ ((struct mswindows_font_instance_data *) (c)->data)
+
+#define FONT_INSTANCE_MSWINDOWS_HFONT_I(c,i) \
+ (MSWINDOWS_FONT_INSTANCE_DATA(c)->hfont[(i)])
+
+#define FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT(c,under,strike) \
+ FONT_INSTANCE_MSWINDOWS_HFONT_I (c, (!!(strike)<<1)|!!(under))
+
+/* If font creation during redisplay fails, then the following
+ value is used to prevent future attempts to create this font.
+ Redisplay uses the "main" font when encounters this value */
+#define MSWINDOWS_BAD_HFONT INVALID_HANDLE_VALUE
+
+HFONT mswindows_get_hfont (Lisp_Font_Instance* f, int under, int strike);
-#endif /* _XEMACS_OBJECTS_MSW_H_ */
+#endif /* INCLUDED_objects_msw_h_ */
#endif /* 0 */
static int
-tty_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
+tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
Lisp_Object result;
}
static void
-tty_mark_color_instance (struct Lisp_Color_Instance *c)
+tty_mark_color_instance (Lisp_Color_Instance *c)
{
mark_object (COLOR_INSTANCE_TTY_SYMBOL (c));
}
static void
-tty_print_color_instance (struct Lisp_Color_Instance *c,
+tty_print_color_instance (Lisp_Color_Instance *c,
Lisp_Object printcharfun,
int escapeflag)
{
}
static void
-tty_finalize_color_instance (struct Lisp_Color_Instance *c)
+tty_finalize_color_instance (Lisp_Color_Instance *c)
{
if (c->data)
xfree (c->data);
}
static int
-tty_color_instance_equal (struct Lisp_Color_Instance *c1,
- struct Lisp_Color_Instance *c2,
+tty_color_instance_equal (Lisp_Color_Instance *c1,
+ Lisp_Color_Instance *c2,
int depth)
{
return (EQ (COLOR_INSTANCE_TTY_SYMBOL (c1),
}
static unsigned long
-tty_color_instance_hash (struct Lisp_Color_Instance *c, int depth)
+tty_color_instance_hash (Lisp_Color_Instance *c, int depth)
{
return LISP_HASH (COLOR_INSTANCE_TTY_SYMBOL (c));
}
\f
static int
-tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
+tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
Bufbyte *str = XSTRING_DATA (name);
}
static void
-tty_mark_font_instance (struct Lisp_Font_Instance *f)
+tty_mark_font_instance (Lisp_Font_Instance *f)
{
mark_object (FONT_INSTANCE_TTY_CHARSET (f));
}
static void
-tty_print_font_instance (struct Lisp_Font_Instance *f,
+tty_print_font_instance (Lisp_Font_Instance *f,
Lisp_Object printcharfun,
int escapeflag)
{
}
static void
-tty_finalize_font_instance (struct Lisp_Font_Instance *f)
+tty_finalize_font_instance (Lisp_Font_Instance *f)
{
if (f->data)
xfree (f->data);
return 0;
the_nonreloc++;
{
- struct Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
+ Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
return !strcmp ((CONST char *) the_nonreloc,
(CONST char *) string_data (s));
}
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_OBJECTS_TTY_H_
-#define _XEMACS_OBJECTS_TTY_H_
+#ifndef INCLUDED_objects_tty_h_
+#define INCLUDED_objects_tty_h_
#include "objects.h"
extern Lisp_Object Vtty_color_alist, Vtty_dynamic_color_bg;
extern Lisp_Object Vtty_dynamic_color_fg;
-#endif /* _XEMACS_OBJECTS_TTY_H_ */
+#endif /* INCLUDED_objects_tty_h_ */
{
/* We're dealing with a TrueColor/DirectColor visual, so play games
with the RGB values in the XColor struct. */
- /* ### JH: I'm not sure how a call to XAllocColor can fail in a
+ /* #### JH: I'm not sure how a call to XAllocColor can fail in a
TrueColor or DirectColor visual, so I will just reformat the
request to match the requirements of the visual, and re-issue
the request. If this fails for anybody, I wanna know about it
else
{
int rd, gr, bl;
- /* ### JH: I'm punting here, knowing that doing this will at
+ /* #### JH: I'm punting here, knowing that doing this will at
least draw the color correctly. However, unless we convert
all of the functions that allocate colors (graphics
libraries, etc) to use this function doing this is very
CONST Extbyte *extname;
Extcount extnamelen;
- GET_CHARPTR_EXT_BINARY_DATA_ALLOCA (name, len, extname, extnamelen);
+ TO_EXTERNAL_FORMAT (DATA, (name, len),
+ ALLOCA, (extname, extnamelen),
+ Qbinary);
result = XParseColor (dpy, cmap, (char *) extname, color);
}
if (!result)
}
static int
-x_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
+x_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
XColor color;
}
static void
-x_print_color_instance (struct Lisp_Color_Instance *c,
+x_print_color_instance (Lisp_Color_Instance *c,
Lisp_Object printcharfun,
int escapeflag)
{
}
static void
-x_finalize_color_instance (struct Lisp_Color_Instance *c)
+x_finalize_color_instance (Lisp_Color_Instance *c)
{
if (c->data)
{
be comparing their names or pixel values instead. */
static int
-x_color_instance_equal (struct Lisp_Color_Instance *c1,
- struct Lisp_Color_Instance *c2,
+x_color_instance_equal (Lisp_Color_Instance *c1,
+ Lisp_Color_Instance *c2,
int depth)
{
XColor color1 = COLOR_INSTANCE_X_COLOR (c1);
}
static unsigned long
-x_color_instance_hash (struct Lisp_Color_Instance *c, int depth)
+x_color_instance_hash (Lisp_Color_Instance *c, int depth)
{
XColor color = COLOR_INSTANCE_X_COLOR (c);
return HASH3 (color.red, color.green, color.blue);
}
static Lisp_Object
-x_color_instance_rgb_components (struct Lisp_Color_Instance *c)
+x_color_instance_rgb_components (Lisp_Color_Instance *c)
{
XColor color = COLOR_INSTANCE_X_COLOR (c);
return (list3 (make_int (color.red),
CONST char *extname;
- GET_C_STRING_CTEXT_DATA_ALLOCA (color, extname);
+ TO_EXTERNAL_FORMAT (LISP_STRING, color, C_STRING_ALLOCA, extname, Qctext);
- return XParseColor (dpy, cmap,
- extname, &c);
+ return XParseColor (dpy, cmap, extname, &c);
}
\f
/************************************************************************/
static int
-x_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
+x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
- Display *dpy;
+ Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device));
XFontStruct *xf;
CONST char *extname;
- dpy = DEVICE_X_DISPLAY (XDEVICE (device));
- GET_C_STRING_CTEXT_DATA_ALLOCA (f->name, extname);
+ TO_EXTERNAL_FORMAT (LISP_STRING, f->name, C_STRING_ALLOCA, extname, Qctext);
xf = XLoadQueryFont (dpy, extname);
if (!xf)
}
static void
-x_mark_font_instance (struct Lisp_Font_Instance *f)
+x_mark_font_instance (Lisp_Font_Instance *f)
{
mark_object (FONT_INSTANCE_X_TRUENAME (f));
}
static void
-x_print_font_instance (struct Lisp_Font_Instance *f,
+x_print_font_instance (Lisp_Font_Instance *f,
Lisp_Object printcharfun,
int escapeflag)
{
}
static void
-x_finalize_font_instance (struct Lisp_Font_Instance *f)
+x_finalize_font_instance (Lisp_Font_Instance *f)
{
if (f->data)
}
static Lisp_Object
-x_font_instance_truename (struct Lisp_Font_Instance *f, Error_behavior errb)
+x_font_instance_truename (Lisp_Font_Instance *f, Error_behavior errb)
{
struct device *d = XDEVICE (f->device);
}
static Lisp_Object
-x_font_instance_properties (struct Lisp_Font_Instance *f)
+x_font_instance_properties (Lisp_Font_Instance *f)
{
struct device *d = XDEVICE (f->device);
int i;
Lisp_Object result = Qnil;
CONST char *patternext;
- GET_C_STRING_BINARY_DATA_ALLOCA (pattern, patternext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, pattern,
+ C_STRING_ALLOCA, patternext,
+ Qbinary);
names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
patternext, MAX_FONT_COUNT, &count);
while (count--)
- result = Fcons (build_ext_string (names [count], FORMAT_BINARY), result);
+ result = Fcons (build_ext_string (names [count], Qbinary), result);
if (names)
XFreeFontNames (names);
return result;
CONST char *patternext;
int i;
- GET_C_STRING_BINARY_DATA_ALLOCA (font, patternext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, font,
+ C_STRING_ALLOCA, patternext,
+ Qbinary);
names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
patternext, MAX_FONT_COUNT, &count);
- /* ### This code seems awfully bogus -- mrb */
+ /* #### This code seems awfully bogus -- mrb */
for (i = 0; i < count; i ++)
{
- CONST Bufbyte *intname;
+ CONST char *intname;
- GET_C_CHARPTR_INT_BINARY_DATA_ALLOCA (names[i], intname);
+ TO_INTERNAL_FORMAT (C_STRING, names[i],
+ C_STRING_ALLOCA, intname,
+ Qbinary);
if (x_font_spec_matches_charset (XDEVICE (device), charset,
- intname, Qnil, 0, -1))
+ (Bufbyte *) intname, Qnil, 0, -1))
{
- result = build_string ((char *) intname);
+ result = build_string (intname);
break;
}
}
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_OBJECTS_X_H_
-#define _XEMACS_OBJECTS_X_H_
+#ifndef INCLUDED_objects_x_h_
+#define INCLUDED_objects_x_h_
#include "objects.h"
#define FONT_INSTANCE_X_TRUENAME(f) (X_FONT_INSTANCE_DATA (f)->truename)
#endif /* HAVE_X_WINDOWS */
-#endif /* _XEMACS_OBJECTS_X_H_ */
+
+#endif /* INCLUDED_objects_x_h_ */
static Lisp_Object
mark_color_instance (Lisp_Object obj)
{
- struct Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
mark_object (c->name);
if (!NILP (c->device)) /* Vthe_null_color_instance */
MAYBE_DEVMETH (XDEVICE (c->device), mark_color_instance, (c));
int escapeflag)
{
char buf[100];
- struct Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
if (print_readably)
error ("printing unreadable object #<color-instance 0x%x>",
c->header.uid);
static void
finalize_color_instance (void *header, int for_disksave)
{
- struct Lisp_Color_Instance *c = (struct Lisp_Color_Instance *) header;
+ Lisp_Color_Instance *c = (Lisp_Color_Instance *) header;
if (!NILP (c->device))
{
static int
color_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Color_Instance *c1 = XCOLOR_INSTANCE (obj1);
- struct Lisp_Color_Instance *c2 = XCOLOR_INSTANCE (obj2);
+ Lisp_Color_Instance *c1 = XCOLOR_INSTANCE (obj1);
+ Lisp_Color_Instance *c2 = XCOLOR_INSTANCE (obj2);
return (c1 == c2) ||
(EQ (c1->device, c2->device) &&
static unsigned long
color_instance_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
struct device *d = DEVICEP (c->device) ? XDEVICE (c->device) : 0;
return HASH2 ((unsigned long) d,
mark_color_instance, print_color_instance,
finalize_color_instance, color_instance_equal,
color_instance_hash, 0,
- struct Lisp_Color_Instance);
+ Lisp_Color_Instance);
\f
DEFUN ("make-color-instance", Fmake_color_instance, 1, 3, 0, /*
Return a new `color-instance' object named NAME (a string).
*/
(name, device, no_error))
{
- struct Lisp_Color_Instance *c;
+ Lisp_Color_Instance *c;
Lisp_Object val;
int retval;
CHECK_STRING (name);
XSETDEVICE (device, decode_device (device));
- c = alloc_lcrecord_type (struct Lisp_Color_Instance, &lrecord_color_instance);
+ c = alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
c->name = name;
c->device = device;
c->data = 0;
*/
(color_instance))
{
- struct Lisp_Color_Instance *c;
+ Lisp_Color_Instance *c;
CHECK_COLOR_INSTANCE (color_instance);
c = XCOLOR_INSTANCE (color_instance);
static Lisp_Object
mark_font_instance (Lisp_Object obj)
{
- struct Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
+ Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
mark_object (f->name);
if (!NILP (f->device)) /* Vthe_null_font_instance */
print_font_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
char buf[200];
- struct Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
+ Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
if (print_readably)
error ("printing unreadable object #<font-instance 0x%x>", f->header.uid);
write_c_string ("#<font-instance ", printcharfun);
static void
finalize_font_instance (void *header, int for_disksave)
{
- struct Lisp_Font_Instance *f = (struct Lisp_Font_Instance *) header;
+ Lisp_Font_Instance *f = (Lisp_Font_Instance *) header;
if (!NILP (f->device))
{
DEFINE_LRECORD_IMPLEMENTATION ("font-instance", font_instance,
mark_font_instance, print_font_instance,
finalize_font_instance, font_instance_equal,
- font_instance_hash, 0, struct Lisp_Font_Instance);
+ font_instance_hash, 0, Lisp_Font_Instance);
\f
DEFUN ("make-font-instance", Fmake_font_instance, 1, 3, 0, /*
Return a new `font-instance' object named NAME.
*/
(name, device, no_error))
{
- struct Lisp_Font_Instance *f;
+ Lisp_Font_Instance *f;
Lisp_Object val;
int retval = 0;
Error_behavior errb = decode_error_behavior_flag (no_error);
XSETDEVICE (device, decode_device (device));
- f = alloc_lcrecord_type (struct Lisp_Font_Instance, &lrecord_font_instance);
+ f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
f->name = name;
f->device = device;
font_instance_truename_internal (Lisp_Object font_instance,
Error_behavior errb)
{
- struct Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance);
-
+ Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance);
+
if (NILP (f->device))
{
maybe_signal_simple_error ("Couldn't determine font truename",
font_instance, Qfont, errb);
return Qnil;
}
-
+
return DEVMETH_OR_GIVEN (XDEVICE (f->device),
font_instance_truename, (f, errb), f->name);
}
*/
(font_instance))
{
- struct Lisp_Font_Instance *f;
+ Lisp_Font_Instance *f;
CHECK_FONT_INSTANCE (font_instance);
f = XFONT_INSTANCE (font_instance);
static void
color_create (Lisp_Object obj)
{
- struct Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
+ Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
COLOR_SPECIFIER_FACE (color) = Qnil;
COLOR_SPECIFIER_FACE_PROPERTY (color) = Qnil;
static void
color_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
+ Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
mark_object (COLOR_SPECIFIER_FACE (color));
mark_object (COLOR_SPECIFIER_FACE_PROPERTY (color));
void
set_color_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property)
{
- struct Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
+ Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
COLOR_SPECIFIER_FACE (color) = face;
COLOR_SPECIFIER_FACE_PROPERTY (color) = property;
static void
font_create (Lisp_Object obj)
{
- struct Lisp_Specifier *font = XFONT_SPECIFIER (obj);
+ Lisp_Specifier *font = XFONT_SPECIFIER (obj);
FONT_SPECIFIER_FACE (font) = Qnil;
FONT_SPECIFIER_FACE_PROPERTY (font) = Qnil;
static void
font_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *font = XFONT_SPECIFIER (obj);
+ Lisp_Specifier *font = XFONT_SPECIFIER (obj);
mark_object (FONT_SPECIFIER_FACE (font));
mark_object (FONT_SPECIFIER_FACE_PROPERTY (font));
void
set_font_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property)
{
- struct Lisp_Specifier *font = XFONT_SPECIFIER (obj);
+ Lisp_Specifier *font = XFONT_SPECIFIER (obj);
FONT_SPECIFIER_FACE (font) = face;
FONT_SPECIFIER_FACE_PROPERTY (font) = property;
static void
face_boolean_create (Lisp_Object obj)
{
- struct Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
+ Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
FACE_BOOLEAN_SPECIFIER_FACE (face_boolean) = Qnil;
FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean) = Qnil;
static void
face_boolean_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
+ Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
mark_object (FACE_BOOLEAN_SPECIFIER_FACE (face_boolean));
mark_object (FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean));
set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face,
Lisp_Object property)
{
- struct Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
+ Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
FACE_BOOLEAN_SPECIFIER_FACE (face_boolean) = face;
FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean) = property;
}
static const struct lrecord_description color_specifier_description[] = {
- { XD_LISP_OBJECT, specifier_data_offset + offsetof(struct color_specifier, face), 2 },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct color_specifier, face) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct color_specifier, face_property) },
{ XD_END }
};
static const struct lrecord_description font_specifier_description[] = {
- { XD_LISP_OBJECT, specifier_data_offset + offsetof(struct font_specifier, face), 2 },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct font_specifier, face) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct font_specifier, face_property) },
{ XD_END }
};
static const struct lrecord_description face_boolean_specifier_description[] = {
- { XD_LISP_OBJECT, specifier_data_offset + offsetof(struct face_boolean_specifier, face), 2 },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct face_boolean_specifier, face) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct face_boolean_specifier, face_property) },
{ XD_END }
};
{
staticpro_nodump (&Vthe_null_color_instance);
{
- struct Lisp_Color_Instance *c =
- alloc_lcrecord_type (struct Lisp_Color_Instance, &lrecord_color_instance);
+ Lisp_Color_Instance *c =
+ alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
c->name = Qnil;
c->device = Qnil;
c->data = 0;
staticpro_nodump (&Vthe_null_font_instance);
{
- struct Lisp_Font_Instance *f =
- alloc_lcrecord_type (struct Lisp_Font_Instance, &lrecord_font_instance);
+ Lisp_Font_Instance *f =
+ alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
f->name = Qnil;
f->device = Qnil;
f->data = 0;
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_OBJECTS_H_
-#define _XEMACS_OBJECTS_H_
+#ifndef INCLUDED_objects_h_
+#define INCLUDED_objects_h_
#include "specifier.h"
* Color Instance Object *
****************************************************************************/
-DECLARE_LRECORD (color_instance, struct Lisp_Color_Instance);
-#define XCOLOR_INSTANCE(x) \
- XRECORD (x, color_instance, struct Lisp_Color_Instance)
-#define XSETCOLOR_INSTANCE(x, p) XSETRECORD (x, p, color_instance)
-#define COLOR_INSTANCEP(x) RECORDP (x, color_instance)
-#define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance)
-#define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance)
-
EXFUN (Fmake_color_instance, 3);
extern Lisp_Object Vthe_null_color_instance;
void *data;
};
+DECLARE_LRECORD (color_instance, Lisp_Color_Instance);
+#define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance)
+#define XSETCOLOR_INSTANCE(x, p) XSETRECORD (x, p, color_instance)
+#define COLOR_INSTANCEP(x) RECORDP (x, color_instance)
+#define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance)
+#define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance)
+
#define COLOR_INSTANCE_NAME(c) ((c)->name)
#define COLOR_INSTANCE_DEVICE(c) ((c)->device)
* Font Instance Object *
****************************************************************************/
-DECLARE_LRECORD (font_instance, struct Lisp_Font_Instance);
-#define XFONT_INSTANCE(x) XRECORD (x, font_instance, struct Lisp_Font_Instance)
+DECLARE_LRECORD (font_instance, Lisp_Font_Instance);
+#define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance)
#define XSETFONT_INSTANCE(x, p) XSETRECORD (x, p, font_instance)
#define FONT_INSTANCEP(x) RECORDP (x, font_instance)
#define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance)
#define FONT_INSTANCE_WIDTH(f) ((f)->width)
#define FONT_INSTANCE_HEIGHT(f) ((f)->height)
-#endif /* _XEMACS_OBJECTS_H_ */
+#endif /* INCLUDED_objects_h_ */
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef __DragAndDropTypesH__
-#define __DragAndDropTypesH__
+#ifndef INCLUDED_offix_types_h_
+#define INCLUDED_offix_types_h_
#define DndNotDnd -1
#define DndUnknown 0
#define DndEND 10
-#endif
+#endif /* INCLUDED_offix_types_h_ */
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef __DragAndDropH__
-#define __DragAndDropH__ 1L
+#ifndef INCLUDED_offix_h_
+#define INCLUDED_offix_h_
/* The standard DND types are defined here */
#include "offix-types.h"
int width,int height,
char *image,char *mask,
int hot_x,int hot_y);
-#endif
+
+#endif /* INCLUDED_offix_h_ */
If DATA is OPAQUE_UNINIT, the object's data is uninitialized.
Else the object's data is initialized by copying from DATA. */
Lisp_Object
-make_opaque (size_t size, CONST void *data)
+make_opaque (CONST void *data, size_t size)
{
Lisp_Opaque *p = (Lisp_Opaque *)
alloc_lcrecord (offsetof (Lisp_Opaque, data) + size, &lrecord_opaque);
/* Written by Ben Wing, October 1993. */
-#ifndef _XEMACS_OPAQUE_H_
-#define _XEMACS_OPAQUE_H_
+#ifndef INCLUDED_opaque_h_
+#define INCLUDED_opaque_h_
typedef union {
struct { Lisp_Object obj; } obj;
Opaque pointers should never escape to the Lisp level, so
functions should not be doing this. */
-/* Alternative DATA arguments to make_opaque */
+/* Alternative DATA arguments to make_opaque() */
#define OPAQUE_CLEAR ((CONST void *) 0)
#define OPAQUE_UNINIT ((CONST void *) -1)
#define XOPAQUE_DATA(op) OPAQUE_DATA (XOPAQUE (op))
#define XOPAQUE_MARKFUN(op) OPAQUE_MARKFUN (XOPAQUE (op))
-Lisp_Object make_opaque (size_t size, CONST void *data);
+Lisp_Object make_opaque (CONST void *data, size_t size);
typedef struct Lisp_Opaque_Ptr
{
#define get_opaque_ptr(op) (XOPAQUE_PTR (op)->ptr)
#define set_opaque_ptr(op, ptr_) (XOPAQUE_PTR (op)->ptr = (ptr_))
-#endif /* _XEMACS_OPAQUE_H_ */
+#endif /* INCLUDED_opaque_h_ */
write_string_to_stdio_stream (FILE *stream, struct console *con,
CONST Bufbyte *str,
Bytecount offset, Bytecount len,
- enum external_data_format fmt)
+ Lisp_Object coding_system)
{
- int extlen;
+ Extcount extlen;
CONST Extbyte *extptr;
- GET_CHARPTR_EXT_DATA_ALLOCA (str + offset, len, fmt, extptr, extlen);
+ TO_EXTERNAL_FORMAT (DATA, (str + offset, len),
+ ALLOCA, (extptr, extlen),
+ coding_system);
if (stream)
{
fwrite (extptr, 1, extlen, stream);
else if (EQ (function, Qt) || EQ (function, Qnil))
{
write_string_to_stdio_stream (stdout, 0, newnonreloc, offset, len,
- FORMAT_TERMINAL);
+ Qterminal);
}
else
{
/*
* This buffer should be at least as large as the max string size of the
- * largest float, printed in the biggest notation. This is undoubtably
+ * largest float, printed in the biggest notation. This is undoubtedly
* 20d float_output_format, with the negative of the C-constant "HUGE"
* from <math.h>.
*
void
print_string (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_String *s = XSTRING (obj);
+ Lisp_String *s = XSTRING (obj);
/* We distinguish between Bytecounts and Charcounts, to make
Vprint_string_length work correctly under Mule. */
Charcount size = string_char_length (s);
{
p += set_charptr_emchar ((Bufbyte *) p, ch);
}
-
+
output_string (printcharfun, (Bufbyte *) buf, Qnil, 0, p - buf);
break;
/* This function can GC */
/* #### Bug!! (intern "") isn't printed in some distinguished way */
/* #### (the reader also loses on it) */
- struct Lisp_String *name = symbol_name (XSYMBOL (obj));
+ Lisp_String *name = symbol_name (XSYMBOL (obj));
Bytecount size = string_length (name);
struct gcpro gcpro1, gcpro2;
CHECK_CHAR_COERCE_INT (character);
len = set_charptr_emchar (str, XCHAR (character));
- GET_CHARPTR_EXT_DATA_ALLOCA (str, len, FORMAT_TERMINAL, extptr, extlen);
+ TO_EXTERNAL_FORMAT (DATA, (str, len),
+ ALLOCA, (extptr, extlen),
+ Qterminal);
memcpy (alternate_do_string + alternate_do_pointer, extptr, extlen);
alternate_do_pointer += extlen;
alternate_do_string[alternate_do_pointer] = 0;
write_string_to_stdio_stream (file, con,
XSTRING_DATA (char_or_string),
0, XSTRING_LENGTH (char_or_string),
- FORMAT_TERMINAL);
+ Qterminal);
else
{
Bufbyte str[MAX_EMCHAR_LEN];
CHECK_CHAR_COERCE_INT (char_or_string);
len = set_charptr_emchar (str, XCHAR (char_or_string));
- write_string_to_stdio_stream (file, con, str, 0, len, FORMAT_TERMINAL);
+ write_string_to_stdio_stream (file, con, str, 0, len, Qterminal);
}
return char_or_string;
#if 1
/* Debugging kludge -- unbuffered */
-static int debug_print_length = 50;
-static int debug_print_level = 15;
+static int debug_print_length = 50;
+static int debug_print_level = 15;
+static int debug_print_readably = -1;
static void
debug_print_no_newline (Lisp_Object debug_print_obj)
{
/* This function can GC */
- int old_print_readably = print_readably;
- int old_print_depth = print_depth;
- Lisp_Object old_print_length = Vprint_length;
- Lisp_Object old_print_level = Vprint_level;
- Lisp_Object old_inhibit_quit = Vinhibit_quit;
+ int save_print_readably = print_readably;
+ int save_print_depth = print_depth;
+ Lisp_Object save_Vprint_length = Vprint_length;
+ Lisp_Object save_Vprint_level = Vprint_level;
+ Lisp_Object save_Vinhibit_quit = Vinhibit_quit;
struct gcpro gcpro1, gcpro2, gcpro3;
- GCPRO3 (old_print_level, old_print_length, old_inhibit_quit);
+ GCPRO3 (save_Vprint_level, save_Vprint_length, save_Vinhibit_quit);
if (gc_in_progress)
stderr_out ("** gc-in-progress! Bad idea to print anything! **\n");
print_depth = 0;
- print_readably = 0;
+ print_readably = debug_print_readably != -1 ? debug_print_readably : 0;
print_unbuffered++;
/* Could use unwind-protect, but why bother? */
if (debug_print_length > 0)
Vprint_length = make_int (debug_print_length);
if (debug_print_level > 0)
Vprint_level = make_int (debug_print_level);
+
print_internal (debug_print_obj, Qexternal_debugging_output, 1);
- Vinhibit_quit = old_inhibit_quit;
- Vprint_level = old_print_level;
- Vprint_length = old_print_length;
- print_depth = old_print_depth;
- print_readably = old_print_readably;
+
+ Vinhibit_quit = save_Vinhibit_quit;
+ Vprint_level = save_Vprint_level;
+ Vprint_length = save_Vprint_length;
+ print_depth = save_print_depth;
+ print_readably = save_print_readably;
print_unbuffered--;
UNGCPRO;
}
#include "procimpl.h"
#include "sysdep.h"
-#include <windows.h>
#ifndef __MINGW32__
#include <shellapi.h>
#else
/* This one breaks process abstraction. Prototype is in console-msw.h,
used by select_process method in event-msw.c */
HANDLE
-get_nt_process_handle (struct Lisp_Process *p)
+get_nt_process_handle (Lisp_Process *p)
{
return (NT_DATA (p)->h_process);
}
*/
static void
-nt_alloc_process_data (struct Lisp_Process *p)
+nt_alloc_process_data (Lisp_Process *p)
{
p->process_data = xnew_and_zero (struct nt_process_data);
}
static void
-nt_finalize_process_data (struct Lisp_Process *p, int for_disksave)
+nt_finalize_process_data (Lisp_Process *p, int for_disksave)
{
assert (!for_disksave);
if (NT_DATA(p)->h_process)
}
static int
-nt_create_process (struct Lisp_Process *p,
+nt_create_process (Lisp_Process *p,
Lisp_Object *argv, int nargv,
Lisp_Object program, Lisp_Object cur_dir)
{
*/
static void
-nt_update_status_if_terminated (struct Lisp_Process* p)
+nt_update_status_if_terminated (Lisp_Process* p)
{
DWORD exit_code;
nt_send_process (Lisp_Object proc, struct lstream* lstream)
{
volatile Lisp_Object vol_proc = proc;
- struct Lisp_Process *volatile p = XPROCESS (proc);
+ Lisp_Process *volatile p = XPROCESS (proc);
/* use a reasonable-sized buffer (somewhere around the size of the
stream buffer) so as to avoid inundating the stream with blocked
nt_kill_child_process (Lisp_Object proc, int signo,
int current_group, int nomsg)
{
- struct Lisp_Process *p = XPROCESS (proc);
+ Lisp_Process *p = XPROCESS (proc);
/* Enable child signals if necessary. This may lose the first
but it's better than nothing. */
Kirill M. Katsnelson <kkm@kis.ru>, so please bash him and not
the original author(s) */
+/* The IPv6 support is derived from the code for GNU Emacs-20.3
+ written by Wolfgang S. Rupprecht */
+
#include <config.h>
#if !defined (NO_SUBPROCESSES)
#ifdef HAVE_SOCKETS
+#if !(defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO))
static int
get_internet_address (Lisp_Object host, struct sockaddr_in *address,
Error_behavior errb)
return 1;
}
+#endif /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
static void
set_socket_nonblocking_maybe (int fd, int port, CONST char* proto)
the numeric status that was returned by `wait'. */
static void
-update_status_from_wait_code (struct Lisp_Process *p, int *w_fmh)
+update_status_from_wait_code (Lisp_Process *p, int *w_fmh)
{
/* C compiler lossage when attempting to pass w directly */
int w = *w_fmh;
}
/* For any processes that have changed status and are recorded
- and such, update the corresponding struct Lisp_Process.
+ and such, update the corresponding Lisp_Process.
We separate this from record_exited_processes() so that
we never have to call this function from within a signal
handler. We block SIGCHLD in case record_exited_processes()
*/
static void
-unix_alloc_process_data (struct Lisp_Process *p)
+unix_alloc_process_data (Lisp_Process *p)
{
p->process_data = xnew (struct unix_process_data);
*/
static void
-unix_mark_process_data (struct Lisp_Process *proc)
+unix_mark_process_data (Lisp_Process *proc)
{
mark_object (UNIX_DATA(proc)->tty_name);
}
*/
static void
-unix_init_process_io_handles (struct Lisp_Process *p, void* in, void* out, int flags)
+unix_init_process_io_handles (Lisp_Process *p, void* in, void* out, int flags)
{
UNIX_DATA(p)->infd = (int)in;
}
*/
static int
-unix_create_process (struct Lisp_Process *p,
+unix_create_process (Lisp_Process *p,
Lisp_Object *argv, int nargv,
Lisp_Object program, Lisp_Object cur_dir)
{
}
new_argv[i + 1] = 0;
- GET_C_STRING_FILENAME_DATA_ALLOCA (cur_dir, current_dir);
+ TO_EXTERNAL_FORMAT (LISP_STRING, cur_dir,
+ C_STRING_ALLOCA, current_dir,
+ Qfile_name);
child_setup (xforkin, xforkout, xforkout, new_argv, current_dir);
}
/* Return nonzero if this process is a ToolTalk connection. */
static int
-unix_tooltalk_connection_p (struct Lisp_Process *p)
+unix_tooltalk_connection_p (Lisp_Process *p)
{
return UNIX_DATA(p)->connected_via_filedesc_p;
}
/* This is called to set process' virtual terminal size */
static int
-unix_set_window_size (struct Lisp_Process* p, int cols, int rows)
+unix_set_window_size (Lisp_Process* p, int cols, int rows)
{
return set_window_size (UNIX_DATA(p)->infd, cols, rows);
}
#ifdef HAVE_WAITPID
static void
-unix_update_status_if_terminated (struct Lisp_Process* p)
+unix_update_status_if_terminated (Lisp_Process* p)
{
int w;
#ifdef SIGCHLD
unix_reap_exited_processes (void)
{
int i;
- struct Lisp_Process *p;
+ Lisp_Process *p;
#ifndef OBNOXIOUS_SYSV_SIGCLD_BEHAVIOR
record_exited_processes (1);
/* Use volatile to protect variables from being clobbered by longjmp. */
SIGTYPE (*volatile old_sigpipe) (int) = 0;
volatile Lisp_Object vol_proc = proc;
- struct Lisp_Process *volatile p = XPROCESS (proc);
+ Lisp_Process *volatile p = XPROCESS (proc);
if (!SETJMP (send_process_frame))
{
*/
static USID
-unix_deactivate_process (struct Lisp_Process *p)
+unix_deactivate_process (Lisp_Process *p)
{
SIGTYPE (*old_sigpipe) (int) = 0;
USID usid;
int gid;
int no_pgrp = 0;
int kill_retval;
- struct Lisp_Process *p = XPROCESS (proc);
+ Lisp_Process *p = XPROCESS (proc);
if (!UNIX_DATA(p)->pty_flag)
current_group = 0;
*/
static Lisp_Object
-unix_get_tty_name (struct Lisp_Process *p)
+unix_get_tty_name (Lisp_Process *p)
{
return UNIX_DATA (p)->tty_name;
}
static Lisp_Object
unix_canonicalize_host_name (Lisp_Object host)
{
+#if defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO)
+ struct addrinfo hints, *res;
+ static char addrbuf[NI_MAXHOST];
+ Lisp_Object canonname;
+ int retval;
+ char *ext_host;
+
+ xzero (hints);
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = 0;
+ TO_EXTERNAL_FORMAT (LISP_STRING, host, C_STRING_ALLOCA, ext_host, Qnative);
+ retval = getaddrinfo (ext_host, NULL, &hints, &res);
+ if (retval != 0)
+ {
+ char *gai_error;
+
+ TO_INTERNAL_FORMAT (C_STRING, gai_strerror (retval),
+ C_STRING_ALLOCA, gai_error,
+ Qnative);
+ maybe_error (Qprocess, ERROR_ME_NOT,
+ "%s \"%s\"", gai_error, XSTRING_DATA (host));
+ canonname = host;
+ }
+ else
+ {
+ int gni = getnameinfo (res->ai_addr, res->ai_addrlen,
+ addrbuf, sizeof(addrbuf),
+ NULL, 0, NI_NUMERICHOST);
+ canonname = gni ? host : build_ext_string (addrbuf, Qnative);
+
+ freeaddrinfo (res);
+ }
+
+ return canonname;
+#else /* ! HAVE_GETADDRINFO */
struct sockaddr_in address;
if (!get_internet_address (host, &address, ERROR_ME_NOT))
else
/* #### any clue what to do here? */
return host;
+#endif /* ! HAVE_GETADDRINFO */
}
/* open a TCP network connection to a given HOST/SERVICE. Treated
unix_open_network_stream (Lisp_Object name, Lisp_Object host, Lisp_Object service,
Lisp_Object protocol, void** vinfd, void** voutfd)
{
- struct sockaddr_in address;
int inch;
int outch;
volatile int s;
error ("Unsupported protocol \"%s\"",
string_data (symbol_name (XSYMBOL (protocol))));
- if (INTP (service))
- port = htons ((unsigned short) XINT (service));
- else
- {
- struct servent *svc_info;
- CHECK_STRING (service);
+ {
+#if defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO)
+ struct addrinfo hints, *res;
+ struct addrinfo * volatile lres;
+ char *portstring;
+ volatile int xerrno = 0;
+ volatile int failed_connect = 0;
+ char *ext_host;
+ /*
+ * Caution: service can either be a string or int.
+ * Convert to a C string for later use by getaddrinfo.
+ */
+ if (INTP (service))
+ {
+ char portbuf[128];
+ snprintf (portbuf, sizeof (portbuf), "%ld", (long) XINT (service));
+ portstring = portbuf;
+ port = htons ((unsigned short) XINT (service));
+ }
+ else
+ {
+ CHECK_STRING (service);
+ TO_EXTERNAL_FORMAT (LISP_STRING, service,
+ C_STRING_ALLOCA, portstring,
+ Qnative);
+ port = 0;
+ }
+
+ xzero (hints);
+ hints.ai_flags = 0;
+ hints.ai_family = AF_UNSPEC;
+ if (EQ (protocol, Qtcp))
+ hints.ai_socktype = SOCK_STREAM;
+ else /* EQ (protocol, Qudp) */
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = 0;
+ TO_EXTERNAL_FORMAT (LISP_STRING, host, C_STRING_ALLOCA, ext_host, Qnative);
+ retval = getaddrinfo (ext_host, portstring, &hints, &res);
+ if (retval != 0)
+ {
+ char *gai_error;
+
+ TO_INTERNAL_FORMAT (C_STRING, gai_strerror (retval),
+ C_STRING_ALLOCA, gai_error,
+ Qnative);
+ error ("%s/%s %s", XSTRING_DATA (host), portstring, gai_error);
+ }
+
+ /* address loop */
+ for (lres = res; lres ; lres = lres->ai_next)
+ {
+ if (EQ (protocol, Qtcp))
+ s = socket (lres->ai_family, SOCK_STREAM, 0);
+ else /* EQ (protocol, Qudp) */
+ s = socket (lres->ai_family, SOCK_DGRAM, 0);
+
+ if (s < 0)
+ continue;
+
+ /* Turn off interrupts here -- see comments below. There used to
+ be code which called bind_polling_period() to slow the polling
+ period down rather than turn it off, but that seems rather
+ bogus to me. Best thing here is to use a non-blocking connect
+ or something, to check for QUIT. */
+
+ /* Comments that are not quite valid: */
+
+ /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
+ when connect is interrupted. So let's not let it get interrupted.
+ Note we do not turn off polling, because polling is only used
+ when not interrupt_input, and thus not normally used on the systems
+ which have this bug. On systems which use polling, there's no way
+ to quit if polling is turned off. */
+
+ /* Slow down polling. Some kernels have a bug which causes retrying
+ connect to fail after a connect. */
+
+ slow_down_interrupts ();
+
+ loop:
+
+ /* A system call interrupted with a SIGALRM or SIGIO comes back
+ here, with can_break_system_calls reset to 0. */
+ SETJMP (break_system_call_jump);
+ if (QUITP)
+ {
+ speed_up_interrupts ();
+ REALLY_QUIT;
+ /* In case something really weird happens ... */
+ slow_down_interrupts ();
+ }
+
+ /* Break out of connect with a signal (it isn't otherwise possible).
+ Thus you don't get screwed with a hung network. */
+ can_break_system_calls = 1;
+ retval = connect (s, lres->ai_addr, lres->ai_addrlen);
+ can_break_system_calls = 0;
+ if (retval == -1)
+ {
+ xerrno = errno;
+ if (errno != EISCONN)
+ {
+ if (errno == EINTR)
+ goto loop;
+ if (errno == EADDRINUSE && retry < 20)
+ {
+ /* A delay here is needed on some FreeBSD systems,
+ and it is harmless, since this retrying takes time anyway
+ and should be infrequent.
+ `sleep-for' allowed for quitting this loop with interrupts
+ slowed down so it can't be used here. Async timers should
+ already be disabled at this point so we can use `sleep'. */
+ sleep (1);
+ retry++;
+ goto loop;
+ }
+ }
+
+ failed_connect = 1;
+ close (s);
+
+ speed_up_interrupts ();
+
+ continue;
+ }
+
+ if (port == 0)
+ {
+ int gni;
+ char servbuf[NI_MAXSERV];
+
+ if (EQ (protocol, Qtcp))
+ gni = getnameinfo (lres->ai_addr, lres->ai_addrlen,
+ NULL, 0, servbuf, sizeof(servbuf),
+ NI_NUMERICSERV);
+ else /* EQ (protocol, Qudp) */
+ gni = getnameinfo (lres->ai_addr, lres->ai_addrlen,
+ NULL, 0, servbuf, sizeof(servbuf),
+ NI_NUMERICSERV | NI_DGRAM);
+
+ if (gni == 0)
+ port = strtol (servbuf, NULL, 10);
+ }
+
+ break;
+ } /* address loop */
+
+ speed_up_interrupts ();
- if (EQ (protocol, Qtcp))
+ freeaddrinfo (res);
+ if (s < 0)
+ {
+ errno = xerrno;
+
+ if (failed_connect)
+ report_file_error ("connection failed", list2 (host, name));
+ else
+ report_file_error ("error creating socket", list1 (name));
+ }
+#else /* ! HAVE_GETADDRINFO */
+ struct sockaddr_in address;
+
+ if (INTP (service))
+ port = htons ((unsigned short) XINT (service));
+ else
+ {
+ struct servent *svc_info;
+ CHECK_STRING (service);
+
+ if (EQ (protocol, Qtcp))
svc_info = getservbyname ((char *) XSTRING_DATA (service), "tcp");
- else /* EQ (protocol, Qudp) */
+ else /* EQ (protocol, Qudp) */
svc_info = getservbyname ((char *) XSTRING_DATA (service), "udp");
- if (svc_info == 0)
- error ("Unknown service \"%s\"", XSTRING_DATA (service));
- port = svc_info->s_port;
- }
+ if (svc_info == 0)
+ error ("Unknown service \"%s\"", XSTRING_DATA (service));
+ port = svc_info->s_port;
+ }
- get_internet_address (host, &address, ERROR_ME);
- address.sin_port = port;
+ get_internet_address (host, &address, ERROR_ME);
+ address.sin_port = port;
- if (EQ (protocol, Qtcp))
+ if (EQ (protocol, Qtcp))
s = socket (address.sin_family, SOCK_STREAM, 0);
- else /* EQ (protocol, Qudp) */
+ else /* EQ (protocol, Qudp) */
s = socket (address.sin_family, SOCK_DGRAM, 0);
- if (s < 0)
- report_file_error ("error creating socket", list1 (name));
+ if (s < 0)
+ report_file_error ("error creating socket", list1 (name));
- /* Turn off interrupts here -- see comments below. There used to
- be code which called bind_polling_period() to slow the polling
- period down rather than turn it off, but that seems rather
- bogus to me. Best thing here is to use a non-blocking connect
- or something, to check for QUIT. */
+ /* Turn off interrupts here -- see comments below. There used to
+ be code which called bind_polling_period() to slow the polling
+ period down rather than turn it off, but that seems rather
+ bogus to me. Best thing here is to use a non-blocking connect
+ or something, to check for QUIT. */
- /* Comments that are not quite valid: */
+ /* Comments that are not quite valid: */
- /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
- when connect is interrupted. So let's not let it get interrupted.
- Note we do not turn off polling, because polling is only used
- when not interrupt_input, and thus not normally used on the systems
- which have this bug. On systems which use polling, there's no way
- to quit if polling is turned off. */
+ /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
+ when connect is interrupted. So let's not let it get interrupted.
+ Note we do not turn off polling, because polling is only used
+ when not interrupt_input, and thus not normally used on the systems
+ which have this bug. On systems which use polling, there's no way
+ to quit if polling is turned off. */
- /* Slow down polling. Some kernels have a bug which causes retrying
- connect to fail after a connect. */
+ /* Slow down polling. Some kernels have a bug which causes retrying
+ connect to fail after a connect. */
- slow_down_interrupts ();
+ slow_down_interrupts ();
- loop:
+ loop:
- /* A system call interrupted with a SIGALRM or SIGIO comes back
- here, with can_break_system_calls reset to 0. */
- SETJMP (break_system_call_jump);
- if (QUITP)
- {
- speed_up_interrupts ();
- REALLY_QUIT;
- /* In case something really weird happens ... */
- slow_down_interrupts ();
- }
+ /* A system call interrupted with a SIGALRM or SIGIO comes back
+ here, with can_break_system_calls reset to 0. */
+ SETJMP (break_system_call_jump);
+ if (QUITP)
+ {
+ speed_up_interrupts ();
+ REALLY_QUIT;
+ /* In case something really weird happens ... */
+ slow_down_interrupts ();
+ }
- /* Break out of connect with a signal (it isn't otherwise possible).
- Thus you don't get screwed with a hung network. */
- can_break_system_calls = 1;
- retval = connect (s, (struct sockaddr *) &address, sizeof (address));
- can_break_system_calls = 0;
- if (retval == -1 && errno != EISCONN)
- {
- int xerrno = errno;
- if (errno == EINTR)
- goto loop;
- if (errno == EADDRINUSE && retry < 20)
- {
- /* A delay here is needed on some FreeBSD systems,
- and it is harmless, since this retrying takes time anyway
- and should be infrequent.
- `sleep-for' allowed for quitting this loop with interrupts
- slowed down so it can't be used here. Async timers should
- already be disabled at this point so we can use `sleep'. */
- sleep (1);
- retry++;
+ /* Break out of connect with a signal (it isn't otherwise possible).
+ Thus you don't get screwed with a hung network. */
+ can_break_system_calls = 1;
+ retval = connect (s, (struct sockaddr *) &address, sizeof (address));
+ can_break_system_calls = 0;
+ if (retval == -1 && errno != EISCONN)
+ {
+ int xerrno = errno;
+ if (errno == EINTR)
goto loop;
- }
+ if (errno == EADDRINUSE && retry < 20)
+ {
+ /* A delay here is needed on some FreeBSD systems,
+ and it is harmless, since this retrying takes time anyway
+ and should be infrequent.
+ `sleep-for' allowed for quitting this loop with interrupts
+ slowed down so it can't be used here. Async timers should
+ already be disabled at this point so we can use `sleep'. */
+ sleep (1);
+ retry++;
+ goto loop;
+ }
- close (s);
+ close (s);
- speed_up_interrupts ();
+ speed_up_interrupts ();
- errno = xerrno;
- report_file_error ("connection failed", list2 (host, name));
- }
+ errno = xerrno;
+ report_file_error ("connection failed", list2 (host, name));
+ }
- speed_up_interrupts ();
+ speed_up_interrupts ();
+#endif /* ! HAVE_GETADDRINFO */
+ }
inch = s;
outch = dup (s);
#include "systty.h"
#include "syswait.h"
-Lisp_Object Qprocessp;
+Lisp_Object Qprocessp, Qprocess_live_p;
/* Process methods */
struct process_methods the_process_methods;
static Lisp_Object
mark_process (Lisp_Object obj)
{
- struct Lisp_Process *proc = XPROCESS (obj);
+ Lisp_Process *proc = XPROCESS (obj);
MAYBE_PROCMETH (mark_process_data, (proc));
mark_object (proc->name);
mark_object (proc->command);
static void
print_process (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Process *proc = XPROCESS (obj);
+ Lisp_Process *proc = XPROCESS (obj);
if (print_readably)
error ("printing unreadable object #<process %s>",
}
#ifdef HAVE_WINDOW_SYSTEM
-extern void debug_process_finalization (struct Lisp_Process *p);
+extern void debug_process_finalization (Lisp_Process *p);
#endif /* HAVE_WINDOW_SYSTEM */
static void
{
/* #### this probably needs to be tied into the tty event loop */
/* #### when there is one */
- struct Lisp_Process *p = (struct Lisp_Process *) header;
+ Lisp_Process *p = (Lisp_Process *) header;
#ifdef HAVE_WINDOW_SYSTEM
if (!for_disksave)
{
DEFINE_LRECORD_IMPLEMENTATION ("process", process,
mark_process, print_process, finalize_process,
- 0, 0, 0, struct Lisp_Process);
+ 0, 0, 0, Lisp_Process);
\f
/************************************************************************/
/* basic process accessors */
directly to the child process, rather than en/decoding FILE_CODING
streams */
void
-get_process_streams (struct Lisp_Process *p,
- Lisp_Object *instr, Lisp_Object *outstr)
+get_process_streams (Lisp_Process *p, Lisp_Object *instr, Lisp_Object *outstr)
{
assert (p);
assert (NILP (p->pipe_instream) || LSTREAMP(p->pipe_instream));
*outstr = p->pipe_outstream;
}
-struct Lisp_Process *
+Lisp_Process *
get_process_from_usid (USID usid)
{
CONST void *vval;
}
int
-get_process_selected_p (struct Lisp_Process *p)
+get_process_selected_p (Lisp_Process *p)
{
return p->selected;
}
void
-set_process_selected_p (struct Lisp_Process *p, int selected_p)
+set_process_selected_p (Lisp_Process *p, int selected_p)
{
p->selected = !!selected_p;
}
int
-connected_via_filedesc_p (struct Lisp_Process *p)
+connected_via_filedesc_p (Lisp_Process *p)
{
return MAYBE_INT_PROCMETH (tooltalk_connection_p, (p));
}
return PROCESSP (obj) ? Qt : Qnil;
}
+DEFUN ("process-live-p", Fprocess_live_p, 1, 1, 0, /*
+Return t if OBJECT is a process that is alive.
+*/
+ (obj))
+{
+ return PROCESSP (obj) && PROCESS_LIVE_P (XPROCESS (obj)) ? Qt : Qnil;
+}
+
DEFUN ("process-list", Fprocess_list, 0, 0, 0, /*
Return a list of all processes.
*/
{
Lisp_Object val, name1;
int i;
- struct Lisp_Process *p =
- alloc_lcrecord_type (struct Lisp_Process, &lrecord_process);
+ Lisp_Process *p = alloc_lcrecord_type (Lisp_Process, &lrecord_process);
/* If name is already in use, modify it until it is unused. */
name1 = name;
}
void
-init_process_io_handles (struct Lisp_Process *p, void* in, void* out, int flags)
+init_process_io_handles (Lisp_Process *p, void* in, void* out, int flags)
{
USID usid = event_stream_create_stream_pair (in, out,
&p->pipe_instream, &p->pipe_outstream,
create_process (Lisp_Object process, Lisp_Object *argv, int nargv,
Lisp_Object program, Lisp_Object cur_dir)
{
- struct Lisp_Process *p = XPROCESS (process);
+ Lisp_Process *p = XPROCESS (process);
int pid;
/* *_create_process may change status_symbol, if the process
pid = PROCMETH (create_process, (p, argv, nargv, program, cur_dir));
p->pid = make_int (pid);
- if (!NILP(p->pipe_instream))
+ if (PROCESS_LIVE_P (p))
event_stream_select_process (p);
}
Bytecount nbytes, nchars;
Bufbyte chars[1024];
Lisp_Object outstream;
- struct Lisp_Process *p = XPROCESS (proc);
+ Lisp_Process *p = XPROCESS (proc);
/* If there is a lot of output from the subprocess, the loop in
execute_internal_event() might call read_process_output() more
Really, the loop in execute_internal_event() should check itself
for a process-filter change, like in status_notify(); but the
struct Lisp_Process is not exported outside of this file. */
- if (NILP(p->pipe_instream))
+ if (!PROCESS_LIVE_P (p))
return -1; /* already closed */
if (!NILP (p->filter) && (p->filter_does_read))
set_process_filter (Lisp_Object proc, Lisp_Object filter, int filter_does_read)
{
CHECK_PROCESS (proc);
- if (PROCESS_LIVE_P (proc)) {
+ if (PROCESS_LIVE_P (XPROCESS (proc))) {
if (EQ (filter, Qt))
event_stream_unselect_process (XPROCESS (proc));
else
(process))
{
process = get_process (process);
+ CHECK_LIVE_PROCESS (process);
return decoding_stream_coding_system (XLSTREAM (XPROCESS (process)->coding_instream) );
}
(process))
{
process = get_process (process);
+ CHECK_LIVE_PROCESS (process);
return encoding_stream_coding_system (XLSTREAM (XPROCESS (process)->coding_outstream));
}
(process))
{
process = get_process (process);
+ CHECK_LIVE_PROCESS (process);
return Fcons (decoding_stream_coding_system
(XLSTREAM (XPROCESS (process)->coding_instream)),
encoding_stream_coding_system
{
codesys = Fget_coding_system (codesys);
process = get_process (process);
+ CHECK_LIVE_PROCESS (process);
+
set_decoding_stream_coding_system
(XLSTREAM (XPROCESS (process)->coding_instream), codesys);
return Qnil;
{
codesys = Fget_coding_system (codesys);
process = get_process (process);
+ CHECK_LIVE_PROCESS (process);
+
set_encoding_stream_coding_system
(XLSTREAM (XPROCESS (process)->coding_outstream), codesys);
return Qnil;
DEFUN ("set-process-coding-system", Fset_process_coding_system,
1, 3, 0, /*
Set coding-systems of PROCESS to DECODING and ENCODING.
+DECODING will be used to decode subprocess output and ENCODING to
+encode subprocess input.
*/
(process, decoding, encoding))
{
static Lisp_Object
exec_sentinel_unwind (Lisp_Object datum)
{
- struct Lisp_Cons *d = XCONS (datum);
+ Lisp_Cons *d = XCONS (datum);
XPROCESS (d->car)->sentinel = d->cdr;
free_cons (d);
return Qnil;
{
/* This function can GC */
int speccount = specpdl_depth ();
- struct Lisp_Process *p = XPROCESS (proc);
+ Lisp_Process *p = XPROCESS (proc);
Lisp_Object sentinel = p->sentinel;
if (NILP (sentinel))
/* Return a string describing a process status list. */
static Lisp_Object
-status_message (struct Lisp_Process *p)
+status_message (Lisp_Process *p)
{
Lisp_Object symbol = p->status_symbol;
int code = p->exit_code;
for (tail = Vprocess_list; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object proc = XCAR (tail);
- struct Lisp_Process *p = XPROCESS (proc);
+ Lisp_Process *p = XPROCESS (proc);
/* p->tick is also volatile. Same thing as above applies. */
int this_process_tick;
if (network_connection_p (proc))
error ("Network connection %s is not a subprocess",
XSTRING_DATA (XPROCESS(proc)->name));
- if (!PROCESS_LIVE_P (proc))
- error ("Process %s is not active",
- XSTRING_DATA (XPROCESS(proc)->name));
+ CHECK_LIVE_PROCESS (proc);
MAYBE_PROCMETH (kill_child_process, (proc, signo, current_group, nomsg));
}
void
deactivate_process (Lisp_Object proc)
{
- struct Lisp_Process *p = XPROCESS (proc);
+ Lisp_Process *p = XPROCESS (proc);
USID usid;
/* It's possible that we got as far in the process-creation
(proc))
{
/* This function can GC */
- struct Lisp_Process *p;
+ Lisp_Process *p;
proc = get_process (proc);
p = XPROCESS (proc);
if (network_connection_p (proc))
p->tick++;
process_tick++;
}
- else if (!NILP(p->pipe_instream))
+ else if (PROCESS_LIVE_P (p))
{
Fkill_process (proc, Qnil);
/* Do this now, since remove_process will make sigchld_handler do nothing. */
{
if (network_connection_p (proc))
Fdelete_process (proc);
- else if (!NILP (XPROCESS (proc)->pipe_instream))
+ else if (PROCESS_LIVE_P (XPROCESS (proc)))
process_send_signal (proc, SIGHUP, 0, 1);
}
}
syms_of_process (void)
{
defsymbol (&Qprocessp, "processp");
+ defsymbol (&Qprocess_live_p, "process-live-p");
defsymbol (&Qrun, "run");
defsymbol (&Qstop, "stop");
defsymbol (&Qopen, "open");
#endif
DEFSUBR (Fprocessp);
+ DEFSUBR (Fprocess_live_p);
DEFSUBR (Fget_process);
DEFSUBR (Fget_buffer_process);
DEFSUBR (Fdelete_process);
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _XEMACS_PROCESS_H_
-#define _XEMACS_PROCESS_H_
+#ifndef INCLUDED_process_h_
+#define INCLUDED_process_h_
#if defined (NO_SUBPROCESSES)
#undef XPROCESS
#else /* not NO_SUBPROCESSES */
/* Only process.c needs to know about the guts of this */
-struct Lisp_Process;
-DECLARE_LRECORD (process, struct Lisp_Process);
-#define XPROCESS(x) XRECORD (x, process, struct Lisp_Process)
+DECLARE_LRECORD (process, Lisp_Process);
+#define XPROCESS(x) XRECORD (x, process, Lisp_Process)
#define XSETPROCESS(x, p) XSETRECORD (x, p, process)
#define PROCESSP(x) RECORDP (x, process)
#define CHECK_PROCESS(x) CHECK_RECORD (x, process)
-#define PROCESS_LIVE_P(x) (!NILP (XPROCESS(x)->pipe_instream))
+#define PROCESS_LIVE_P(x) (!NILP ((x)->pipe_instream))
+
+#define CHECK_LIVE_PROCESS(x) do { \
+ CHECK_PROCESS (x); \
+ if (! PROCESS_LIVE_P (XPROCESS (x))) \
+ dead_wrong_type_argument (Qprocess_live_p, (x)); \
+} while (0)
#ifdef emacs
Lisp_Object buffer,
Lisp_Object infd,
Lisp_Object outfd);
-int connected_via_filedesc_p (struct Lisp_Process *p);
+int connected_via_filedesc_p (Lisp_Process *p);
void kill_buffer_processes (Lisp_Object buffer);
void close_process_descs (void);
Lisp_Object status_symbol,
int exit_code, int core_dumped);
-void get_process_streams (struct Lisp_Process *p,
+void get_process_streams (Lisp_Process *p,
Lisp_Object *instr, Lisp_Object *outstr);
-int get_process_selected_p (struct Lisp_Process *p);
-void set_process_selected_p (struct Lisp_Process *p, int selected_p);
+int get_process_selected_p (Lisp_Process *p);
+void set_process_selected_p (Lisp_Process *p, int selected_p);
-struct Lisp_Process *get_process_from_usid (USID usid);
+Lisp_Process *get_process_from_usid (USID usid);
#ifdef HAVE_SOCKETS
int network_connection_p (Lisp_Object process);
#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ptsname (fd));
#endif
-#endif /* _XEMACS_PROCESS_H_ */
+#endif /* INCLUDED_process_h_ */
process-unix.c, process-msw.c etc. The Lisp_Process structure and other
contents of this file is not exported to the rest of the world */
-#ifndef _XEMACS_PROCIMPL_H_
-#define _XEMACS_PROCIMPL_H_
-
-struct Lisp_Process;
+#ifndef INCLUDED_procimpl_h_
+#define INCLUDED_procimpl_h_
/*
* Structure which keeps methods of the process implementation.
struct process_methods
{
- void (*mark_process_data) (struct Lisp_Process *proc);
- void (*print_process_data) (struct Lisp_Process *proc,
- Lisp_Object printcharfun);
- void (*finalize_process_data) (struct Lisp_Process *proc, int for_disksave);
- void (*alloc_process_data) (struct Lisp_Process *p);
- void (*init_process_io_handles) (struct Lisp_Process *p,
+ void (*mark_process_data) (Lisp_Process *proc);
+ void (*print_process_data) (Lisp_Process *proc, Lisp_Object printcharfun);
+ void (*finalize_process_data) (Lisp_Process *proc, int for_disksave);
+ void (*alloc_process_data) (Lisp_Process *p);
+ void (*init_process_io_handles) (Lisp_Process *p,
void* in, void* out, int flags);
- int (*create_process) (struct Lisp_Process *p,
+ int (*create_process) (Lisp_Process *p,
Lisp_Object *argv, int nargv,
Lisp_Object program, Lisp_Object cur_dir);
- int (*tooltalk_connection_p) (struct Lisp_Process *p);
+ int (*tooltalk_connection_p) (Lisp_Process *p);
#ifdef HAVE_SOCKETS
void (*open_network_stream) (Lisp_Object name, Lisp_Object host,
Lisp_Object service, Lisp_Object protocol,
#endif /* HAVE_MULTICAST */
#endif /* HAVE_SOCKETS */
Lisp_Object (*canonicalize_host_name) (Lisp_Object host);
- int (*set_window_size) (struct Lisp_Process* p, int height, int width);
+ int (*set_window_size) (Lisp_Process* p, int height, int width);
void (*send_process) (Lisp_Object proc, struct lstream* lstream);
void (*reap_exited_processes) (void);
- void (*update_status_if_terminated) (struct Lisp_Process* p);
+ void (*update_status_if_terminated) (Lisp_Process* p);
void (*kill_child_process) (Lisp_Object proc, int signo,
int current_group, int nomsg);
int (*kill_process_by_pid) (int pid, int sigcode);
int (*process_send_eof) (Lisp_Object proc);
- Lisp_Object (*get_tty_name) (struct Lisp_Process *p);
- USID (*deactivate_process) (struct Lisp_Process *p);
+ Lisp_Object (*get_tty_name) (Lisp_Process *p);
+ USID (*deactivate_process) (Lisp_Process *p);
void (*init_process) (void);
};
#endif /* PROCESS_IO_BLOCKING */
Lisp_Object make_process_internal (Lisp_Object name);
-void init_process_io_handles (struct Lisp_Process *p, void* in,
+void init_process_io_handles (Lisp_Process *p, void* in,
void* out, int flags);
void send_process (Lisp_Object proc,
Lisp_Object relocatable,
CONST Bufbyte *nonrelocatable,
int start, int len);
-#endif /* _XEMACS_PROCIMPL_H_ */
+#endif /* INCLUDED_procimpl_h_ */
/* Unconditionally use unsigned char * for this. */
typedef unsigned char *POINTER;
-typedef unsigned long SIZE;
-
#ifdef DOUG_LEA_MALLOC
#define M_TOP_PAD -2
#include <malloc.h>
#include <stddef.h>
-typedef size_t SIZE;
typedef void *POINTER;
#include <unistd.h>
#endif /* emacs. */
void init_ralloc (void);
-#define safe_bcopy(x, y, z) memmove (y, x, z)
#define NIL ((POINTER) 0)
struct bp *prev;
POINTER *variable;
POINTER data;
- SIZE size;
+ size_t size;
POINTER new_data; /* temporarily used for relocation */
struct heap *heap; /* Heap this bloc is in. */
} *bloc_ptr;
allocate the memory. */
static POINTER
-obtain (POINTER address, SIZE size)
+obtain (POINTER address, size_t size)
{
heap_ptr heap;
- SIZE already_available;
+ size_t already_available;
/* Find the heap that ADDRESS falls within. */
for (heap = last_heap; heap; heap = heap->prev)
if (heap == NIL_HEAP)
{
POINTER new = (*real_morecore)(0);
- SIZE get;
+ size_t get;
already_available = (char *)last_heap->end - (char *)address;
If we could not allocate the space, return zero. */
static POINTER
-get_more_space (SIZE size)
+get_more_space (size_t size)
{
POINTER ptr = break_value;
if (obtain (size))
long r_alloc_size_in_use (void);
long
-r_alloc_size_in_use ()
+r_alloc_size_in_use (void)
{
return break_value - virtual_break_value;
}
memory for the new block. */
static bloc_ptr
-get_bloc (SIZE size)
+get_bloc (size_t size)
{
register bloc_ptr new_bloc;
register heap_ptr heap;
if (heap == NIL_HEAP)
{
register bloc_ptr tb = b;
- register SIZE s = 0;
+ register size_t s = 0;
/* Add up the size of all the following blocs. */
while (tb != NIL_BLOC)
that come after BLOC in memory. */
static int
-resize_bloc (bloc_ptr bloc, SIZE size)
+resize_bloc (bloc_ptr bloc, size_t size)
{
register bloc_ptr b;
heap_ptr heap;
POINTER address;
- SIZE old_size;
+ size_t old_size;
/* No need to ever call this if arena is frozen, bug somewhere! */
if (r_alloc_freeze_level)
}
else
{
- safe_bcopy (b->data, b->new_data, b->size);
+ memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}
}
else
{
- safe_bcopy (bloc->data, bloc->new_data, old_size);
+ memmove (bloc->new_data, bloc->data, old_size);
memset (bloc->new_data + old_size, 0, size - old_size);
*bloc->variable = bloc->data = bloc->new_data;
}
}
else
{
- safe_bcopy (b->data, b->new_data, b->size);
+ memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}
not always find a space which is contiguous to the previous. */
POINTER new_bloc_start;
heap_ptr h = first_heap;
- SIZE get = ROUNDUP (size);
+ size_t get = ROUNDUP (size);
address = (POINTER) ROUNDUP (virtual_break_value);
header. */
for (b = last_bloc; b != NIL_BLOC; b = b->prev)
{
- safe_bcopy (b->data, b->new_data, b->size);
+ memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}
else /* size < 0 */
{
- SIZE excess = (char *)first_heap->bloc_start
+ size_t excess = (char *)first_heap->bloc_start
- ((char *)virtual_break_value + size);
address = virtual_break_value;
for (b = first_bloc; b != NIL_BLOC; b = b->next)
{
- safe_bcopy (b->data, b->new_data, b->size);
+ memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}
If we can't allocate the necessary memory, set *PTR to zero, and
return zero. */
-POINTER r_alloc (POINTER *ptr, SIZE size);
+POINTER r_alloc (POINTER *ptr, size_t size);
POINTER
-r_alloc (POINTER *ptr, SIZE size)
+r_alloc (POINTER *ptr, size_t size)
{
bloc_ptr new_bloc;
If more memory cannot be allocated, then leave *PTR unchanged, and
return zero. */
-POINTER r_re_alloc (POINTER *ptr, SIZE size);
+POINTER r_re_alloc (POINTER *ptr, size_t size);
POINTER
-r_re_alloc (POINTER *ptr, SIZE size)
+r_re_alloc (POINTER *ptr, size_t size)
{
register bloc_ptr bloc;
abort ();
/* This frees all unused blocs. It is not too inefficient, as the resize
- and bcopy is done only once. Afterwards, all unreferenced blocs are
+ and memmove is done only once. Afterwards, all unreferenced blocs are
already shrunk to zero size. */
if (!r_alloc_freeze_level)
{
{
assert (b->prev == pb);
assert ((POINTER) MEM_ROUNDUP (b->data) == b->data);
- assert ((SIZE) MEM_ROUNDUP (b->size) == b->size);
+ assert ((size_t) MEM_ROUNDUP (b->size) == b->size);
ph = 0;
for (h = first_heap; h; h = h->next)
static void Addr_Block_initialize(void);
/* Get a suitable VM_ADDR via mmap */
-static VM_ADDR New_Addr_Block( SIZE sz );
+static VM_ADDR New_Addr_Block (size_t sz);
/* Free a VM_ADDR allocated via New_Addr_Block */
-static void Free_Addr_Block( VM_ADDR addr, SIZE sz );
+static void Free_Addr_Block (VM_ADDR addr, size_t sz);
#ifdef MMAP_GENERATE_ADDRESSES
/* Implementation of the three calls for address picking when XEmacs is incharge */
typedef struct addr_chain
{
POINTER addr;
- SIZE sz;
+ size_t sz;
addr_status flag;
struct addr_chain *next;
} ADDRESS_BLOCK, *ADDRESS_CHAIN;
WRT the addition/deletion of address blocks because of the assert
in Coalesce() and the strict ordering of blocks by their address
*/
-static void Addr_Block_initialize()
+static void
+Addr_Block_initialize (void)
{
MEMMETER( MVAL( M_Addrlist_Size )++)
addr_chain = (ADDRESS_CHAIN) UNDERLYING_MALLOC( sizeof( ADDRESS_BLOCK ));
/* Coalesce address blocks if they are contiguous. Only empty and
unavailable slots are coalesced. */
-static void Coalesce_Addr_Blocks()
+static void
+Coalesce_Addr_Blocks (void)
{
ADDRESS_CHAIN p;
for (p = addr_chain; p; p = p->next)
}
/* Get an empty address block of specified size. */
-static VM_ADDR New_Addr_Block( SIZE sz )
+static VM_ADDR
+New_Addr_Block (size_t sz)
{
ADDRESS_CHAIN p = addr_chain;
VM_ADDR new_addr = VM_FAILURE_ADDR;
/* Free an address block. We mark the block as being empty, and attempt to
do any coalescing that may have resulted from this. */
-static void Free_Addr_Block( VM_ADDR addr, SIZE sz )
+static void
+Free_Addr_Block (VM_ADDR addr, size_t sz)
{
ADDRESS_CHAIN p = addr_chain;
for (; p; p = p->next )
/* This is an alternate (simpler) implementation in cases where the
address is picked by the kernel. */
-static void Addr_Block_initialize(void)
+static void
+Addr_Block_initialize (void)
{
/* Nothing. */
}
-static VM_ADDR New_Addr_Block( SIZE sz )
+static VM_ADDR
+New_Addr_Block (size_t sz)
{
return mmap (0, sz, PROT_READ|PROT_WRITE, MAP_FLAGS,
DEV_ZERO_FD, 0 );
}
-static void Free_Addr_Block( VM_ADDR addr, SIZE sz )
+static void
+Free_Addr_Block (VM_ADDR addr, size_t sz)
{
munmap ((caddr_t) addr, sz );
}
/* IMPLEMENTATION OF EXPORTED RELOCATOR INTERFACE */
/*
- r_alloc( POINTER, SIZE ): Allocate a relocatable area with the start
+ r_alloc (POINTER, SIZE): Allocate a relocatable area with the start
address aliased to the first parameter.
*/
-POINTER r_alloc (POINTER *ptr, SIZE size);
+POINTER r_alloc (POINTER *ptr, size_t size);
POINTER
-r_alloc (POINTER *ptr, SIZE size)
+r_alloc (POINTER *ptr, size_t size)
{
MMAP_HANDLE mh;
mh = new_mmap_handle( size );
if (mh)
{
- SIZE hysteresis = (mmap_hysteresis > 0 ? mmap_hysteresis : 0);
- SIZE mmapped_size = ROUNDUP( size + hysteresis );
+ size_t hysteresis = (mmap_hysteresis > 0 ? mmap_hysteresis : 0);
+ size_t mmapped_size = ROUNDUP( size + hysteresis );
MEMMETER( MVAL(M_Map)++ )
MEMMETER( MVAL(M_Pages_Map) += (mmapped_size/page_size) )
MEMMETER( MVAL(M_Wastage) += mmapped_size - size )
If more memory cannot be allocated, then leave *PTR unchanged, and
return zero. */
-POINTER r_re_alloc (POINTER *ptr, SIZE sz);
+POINTER r_re_alloc (POINTER *ptr, size_t sz);
POINTER
-r_re_alloc (POINTER *ptr, SIZE sz)
+r_re_alloc (POINTER *ptr, size_t sz)
{
if (r_alloc_initialized == 0)
{
}
else
{
- SIZE hysteresis = (mmap_hysteresis > 0 ? mmap_hysteresis : 0);
- SIZE actual_sz = ROUNDUP( sz + hysteresis );
+ size_t hysteresis = (mmap_hysteresis > 0 ? mmap_hysteresis : 0);
+ size_t actual_sz = ROUNDUP( sz + hysteresis );
MMAP_HANDLE h = find_mmap_handle( ptr );
VM_ADDR new_vm_addr;
static Lisp_Object
mark_range_table (Lisp_Object obj)
{
- struct Lisp_Range_Table *rt = XRANGE_TABLE (obj);
+ Lisp_Range_Table *rt = XRANGE_TABLE (obj);
int i;
for (i = 0; i < Dynarr_length (rt->entries); i++)
static void
print_range_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Range_Table *rt = XRANGE_TABLE (obj);
+ Lisp_Range_Table *rt = XRANGE_TABLE (obj);
char buf[200];
int i;
static int
range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Range_Table *rt1 = XRANGE_TABLE (obj1);
- struct Lisp_Range_Table *rt2 = XRANGE_TABLE (obj2);
+ Lisp_Range_Table *rt1 = XRANGE_TABLE (obj1);
+ Lisp_Range_Table *rt2 = XRANGE_TABLE (obj2);
int i;
if (Dynarr_length (rt1->entries) != Dynarr_length (rt2->entries))
static unsigned long
range_table_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Range_Table *rt = XRANGE_TABLE (obj);
+ Lisp_Range_Table *rt = XRANGE_TABLE (obj);
int i;
int size = Dynarr_length (rt->entries);
unsigned long hash = size;
}
static const struct lrecord_description rte_description_1[] = {
- { XD_LISP_OBJECT, offsetof(range_table_entry, val), 1 },
+ { XD_LISP_OBJECT, offsetof (range_table_entry, val) },
{ XD_END }
};
static const struct struct_description rte_description = {
- sizeof(range_table_entry),
+ sizeof (range_table_entry),
rte_description_1
};
static const struct lrecord_description rted_description_1[] = {
- XD_DYNARR_DESC(range_table_entry_dynarr, &rte_description),
+ XD_DYNARR_DESC (range_table_entry_dynarr, &rte_description),
{ XD_END }
};
static const struct struct_description rted_description = {
- sizeof(range_table_entry_dynarr),
+ sizeof (range_table_entry_dynarr),
rted_description_1
};
static const struct lrecord_description range_table_description[] = {
- { XD_STRUCT_PTR, offsetof(struct Lisp_Range_Table, entries), 1, &rted_description },
+ { XD_STRUCT_PTR, offsetof (Lisp_Range_Table, entries), 1, &rted_description },
{ XD_END }
};
mark_range_table, print_range_table, 0,
range_table_equal, range_table_hash,
range_table_description,
- struct Lisp_Range_Table);
+ Lisp_Range_Table);
\f
/************************************************************************/
/* Range table operations */
#ifdef ERROR_CHECK_TYPECHECK
static void
-verify_range_table (struct Lisp_Range_Table *rt)
+verify_range_table (Lisp_Range_Table *rt)
{
int i;
())
{
Lisp_Object obj;
- struct Lisp_Range_Table *rt = alloc_lcrecord_type (struct Lisp_Range_Table,
- &lrecord_range_table);
+ Lisp_Range_Table *rt = alloc_lcrecord_type (Lisp_Range_Table,
+ &lrecord_range_table);
rt->entries = Dynarr_new (range_table_entry);
XSETRANGE_TABLE (obj, rt);
return obj;
*/
(old_table))
{
- struct Lisp_Range_Table *rt, *rtnew;
+ Lisp_Range_Table *rt, *rtnew;
Lisp_Object obj;
CHECK_RANGE_TABLE (old_table);
rt = XRANGE_TABLE (old_table);
- rtnew = alloc_lcrecord_type (struct Lisp_Range_Table, &lrecord_range_table);
+ rtnew = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table);
rtnew->entries = Dynarr_new (range_table_entry);
Dynarr_add_many (rtnew->entries, Dynarr_atp (rt->entries, 0),
*/
(pos, table, default_))
{
- struct Lisp_Range_Table *rt;
+ Lisp_Range_Table *rt;
CHECK_RANGE_TABLE (table);
rt = XRANGE_TABLE (table);
{
int i;
int insert_me_here = -1;
- struct Lisp_Range_Table *rt = XRANGE_TABLE (table);
+ Lisp_Range_Table *rt = XRANGE_TABLE (table);
/* Now insert in the proper place. This gets tricky because
we may be overlapping one or more existing ranges and need
/* Extracted from rangetab.c by O. Galibert, 1998. */
-#ifndef _XEMACS_RANGETAB_H_
-#define _XEMACS_RANGETAB_H_
+#ifndef INCLUDED_rangetab_h_
+#define INCLUDED_rangetab_h_
typedef struct range_table_entry range_table_entry;
struct range_table_entry
struct lcrecord_header header;
range_table_entry_dynarr *entries;
};
+typedef struct Lisp_Range_Table Lisp_Range_Table;
-DECLARE_LRECORD (range_table, struct Lisp_Range_Table);
-#define XRANGE_TABLE(x) \
- XRECORD (x, range_table, struct Lisp_Range_Table)
+DECLARE_LRECORD (range_table, Lisp_Range_Table);
+#define XRANGE_TABLE(x) XRECORD (x, range_table, Lisp_Range_Table)
#define XSETRANGE_TABLE(x, p) XSETRECORD (x, p, range_table)
#define RANGE_TABLEP(x) RECORDP (x, range_table)
#define CHECK_RANGE_TABLE(x) CHECK_RECORD (x, range_table)
-#endif
+#endif /* INCLUDED_rangetab_h_ */
#include <sys/stat.h> /* for S_IFLNK */
-#ifndef PATH_MAX
-#ifdef _POSIX_VERSION
-#define PATH_MAX _POSIX_PATH_MAX
-#else
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
+#if !defined (HAVE_GETCWD) && defined (HAVE_GETWD)
+#undef getcwd
+#define getcwd(buffer, len) getwd (buffer)
#endif
+
+#ifndef PATH_MAX
+# if defined (_POSIX_PATH_MAX)
+# define PATH_MAX _POSIX_PATH_MAX
+# elif defined (MAXPATHLEN)
+# define PATH_MAX MAXPATHLEN
+# else
+# define PATH_MAX 1024
+# endif
#endif
#define MAX_READLINKS 32
+char * xrealpath (const char *path, char resolved_path []);
char *
xrealpath (const char *path, char resolved_path [])
{
*/
else if (*path == '/')
{
- getcwd(new_path, PATH_MAX - 1);
+ getcwd (new_path, PATH_MAX - 1);
new_path += 3;
path++;
}
*/
else
{
- getcwd(new_path, PATH_MAX - 1);
+ getcwd (new_path, PATH_MAX - 1);
new_path += strlen(new_path);
if (new_path[-1] != '/')
*new_path++ = '/';
}
#else
- /* If it's a relative pathname use getwd for starters. */
+ /* If it's a relative pathname use getcwd for starters. */
if (*path != '/')
{
-#ifdef HAVE_GETCWD
- getcwd(new_path, PATH_MAX - 1);
-#else
- getwd(new_path);
-#endif
+ getcwd (new_path, PATH_MAX - 1);
new_path += strlen(new_path);
if (new_path[-1] != '/')
*new_path++ = '/';
#include "sysdep.h"
#include "window.h"
-#include "windows.h"
#ifdef MULE
#include "mule-ccl.h"
#include "character.h"
/*
* Random forward declarations
*/
-static void mswindows_update_dc (HDC hdc, Lisp_Object font, Lisp_Object fg,
- Lisp_Object bg, Lisp_Object bg_pmap);
+static void mswindows_update_dc (HDC hdc, Lisp_Object fg, Lisp_Object bg,
+ Lisp_Object bg_pmap);
+static void mswindows_set_dc_font (HDC hdc, Lisp_Object font,
+ int under, int strike);
static void mswindows_output_vertical_divider (struct window *w, int clear);
static void mswindows_redraw_exposed_windows (Lisp_Object window, int x,
int y, int width, int height);
static void mswindows_output_dibitmap (struct frame *f,
- struct Lisp_Image_Instance *p,
+ Lisp_Image_Instance *p,
struct display_box* db,
struct display_glyph_area* dga);
textual_run *run)
{
Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
SIZE size;
if (!fi->proportional_p || !hdc)
else
{
assert(run->dimension == 1); /* #### FIXME! */
- mswindows_update_dc (hdc, font_inst, Qnil, Qnil, Qnil);
+ mswindows_set_dc_font (hdc, font_inst,
+ cachel->underline, cachel->strikethru);
GetTextExtentPoint32 (hdc, run->ptr, run->len, &size);
return(size.cx);
}
}
+/*
+ * Given F, retrieve device context. F can be a display frame, or
+ * a print job.
+ */
+static HDC
+get_frame_dc (struct frame *f)
+{
+ if (FRAME_MSWINDOWS_P (f))
+ return FRAME_MSWINDOWS_DC (f);
+ else
+ return DEVICE_MSPRINTER_HDC (XDEVICE (FRAME_DEVICE (f)));
+}
+
+/*
+ * Given F, retrieve compatible device context. F can be a display
+ * frame, or a print job.
+ */
+static HDC
+get_frame_compdc (struct frame *f)
+{
+ if (FRAME_MSWINDOWS_P (f))
+ return FRAME_MSWINDOWS_CDC (f);
+ else
+ return FRAME_MSPRINTER_CDC (f);
+}
/*****************************************************************************
mswindows_update_dc
Given a number of parameters munge the DC so it has those properties.
****************************************************************************/
static void
-mswindows_update_dc (HDC hdc, Lisp_Object font, Lisp_Object fg,
- Lisp_Object bg, Lisp_Object bg_pmap)
+mswindows_update_dc (HDC hdc, Lisp_Object fg, Lisp_Object bg,
+ Lisp_Object bg_pmap)
{
- if (!NILP (font))
- SelectObject(hdc, FONT_INSTANCE_MSWINDOWS_HFONT (XFONT_INSTANCE (font)));
-
-
if (!NILP (fg))
{
SetTextColor (hdc, COLOR_INSTANCE_MSWINDOWS_COLOR
(XCOLOR_INSTANCE (fg)));
}
+
if (!NILP (bg))
{
SetBkMode (hdc, OPAQUE);
}
}
-
-/*****************************************************************************
- mswindows_apply_face_effects
-
- Draw underline and strikeout as if this was X.
- #### On mswindows this really should be done as part of drawing the font.
- The line width used is chosen arbitrarily from the font height.
- ****************************************************************************/
-static void
-mswindows_apply_face_effects (HDC hdc, struct display_line *dl, int xpos,
- int width, struct Lisp_Font_Instance *fi,
- struct face_cachel *cachel,
- struct face_cachel *color_cachel)
+static void mswindows_set_dc_font (HDC hdc, Lisp_Object font,
+ int under, int strike)
{
- int yclip;
- HBRUSH brush, oldbrush;
- RECT rect;
-
- brush = CreateSolidBrush (COLOR_INSTANCE_MSWINDOWS_COLOR (
- XCOLOR_INSTANCE (color_cachel->foreground)));
- if (brush)
- {
- yclip = dl->ypos + dl->descent - dl->clip;
- rect.left = xpos;
- rect.right = xpos + width;
- oldbrush = SelectObject (hdc, brush);
-
- if (cachel->underline)
- {
- rect.top = dl->ypos + dl->descent/2;
- rect.bottom = rect.top + (fi->height >= 0x20 ? 2 : 1);
- if (rect.bottom <= yclip)
- FillRect (hdc, &rect, brush);
- }
- if (cachel->strikethru)
- {
- rect.top = dl->ypos + dl->descent - (dl->ascent + dl->descent)/2;
- rect.bottom = rect.top + (fi->height >= 0x20 ? 2 : 1);
- if (rect.bottom <= yclip)
- FillRect (hdc, &rect, brush);
- }
-
- SelectObject (hdc, oldbrush);
- DeleteObject (brush);
- }
+ SelectObject(hdc, mswindows_get_hfont (XFONT_INSTANCE (font),
+ under, strike));
}
-
/*****************************************************************************
mswindows_output_hline
struct rune *rb, int start_pixpos)
{
struct frame *f = XFRAME (w->frame);
+ HDC hdc = get_frame_dc (f);
RECT rect = { rb->xpos, DISPLAY_LINE_YPOS (dl),
rb->xpos+rb->width,
DISPLAY_LINE_YEND (dl) };
start_pixpos, rb->width,
&db, &dga);
/* blank the background in the appropriate color */
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f), Qnil, cachel->foreground,
+ mswindows_update_dc (hdc, cachel->foreground,
cachel->background, Qnil);
redisplay_output_pixmap (w, bg_pmap, &db, &dga, rb->findex,
0, 0, 0, TRUE);
}
else
{
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f), Qnil, Qnil,
- cachel->background, Qnil);
-
- ExtTextOut (FRAME_MSWINDOWS_DC (f), 0, 0, ETO_OPAQUE,
- &rect, NULL, 0, NULL);
+ mswindows_update_dc (hdc, Qnil, cachel->background, Qnil);
+ ExtTextOut (hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);
}
}
struct face_cachel *cachel=0;
Lisp_Object font = Qnil;
int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
- HDC hdc = FRAME_MSWINDOWS_DC (f);
- unsigned int face_index=0;
+ HDC hdc = get_frame_dc (f);
+ unsigned int local_face_index=0;
char *p_char = NULL;
int n_char = 0;
RECT rect = { xpos,
/* Use cursor fg/bg for block cursor, or character fg/bg for the bar
or when we need to erase the cursor. Output nothing at eol if bar
cursor */
- face_index = get_builtin_face_cache_index (w, Vtext_cursor_face);
+ local_face_index = get_builtin_face_cache_index (w, Vtext_cursor_face);
color_cachel = WINDOW_FACE_CACHEL (w, ((!cursor_p || bar_p) ?
- findex : face_index));
- mswindows_update_dc (hdc, font, color_cachel->foreground,
+ findex : local_face_index));
+ mswindows_update_dc (hdc, color_cachel->foreground,
color_cachel->background, Qnil);
+ if (real_char_p)
+ mswindows_set_dc_font (hdc, font,
+ cachel->underline, cachel->strikethru);
+
ExtTextOut (hdc, xpos, dl->ypos, ETO_OPAQUE|ETO_CLIPPED, &rect, p_char, n_char, NULL);
- if (real_char_p && (cachel->underline || cachel->strikethru))
- mswindows_apply_face_effects (hdc, dl, xpos, width,
- XFONT_INSTANCE (font),
- cachel, color_cachel);
}
if (!cursor_p)
if (focus && bar_p)
{
rect.right = rect.left + (EQ (bar, Qt) ? 1 : min (2, width));
- face_index = get_builtin_face_cache_index (w, Vtext_cursor_face);
- cachel = WINDOW_FACE_CACHEL (w, face_index);
- mswindows_update_dc (hdc, Qnil, Qnil, cachel->background, Qnil);
+ local_face_index = get_builtin_face_cache_index (w, Vtext_cursor_face);
+ cachel = WINDOW_FACE_CACHEL (w, local_face_index);
+ mswindows_update_dc (hdc, Qnil, cachel->background, Qnil);
ExtTextOut (hdc, xpos, dl->ypos, ETO_OPAQUE, &rect, NULL, 0, NULL);
}
else if (!focus)
n_char = 1;
}
- face_index = get_builtin_face_cache_index (w, Vdefault_face);
- cachel = WINDOW_FACE_CACHEL (w, (real_char_p ? findex : face_index));
- mswindows_update_dc (hdc, Qnil, cachel->foreground,
- cachel->background, Qnil);
+ local_face_index = get_builtin_face_cache_index (w, Vdefault_face);
+ cachel = WINDOW_FACE_CACHEL (w, (real_char_p ? findex : local_face_index));
+ mswindows_update_dc (hdc,
+ cachel->foreground, cachel->background, Qnil);
ExtTextOut (hdc, xpos, dl->ypos, ETO_OPAQUE | ETO_CLIPPED,
&rect, p_char, n_char, NULL);
- if (cachel->underline || cachel->strikethru)
- mswindows_apply_face_effects (hdc, dl, xpos+1, width-2,
- XFONT_INSTANCE (font),
- cachel, cachel);
}
}
FINDEX Index for the face cache element describing how to display
the text.
****************************************************************************/
-void
+static void
mswindows_output_string (struct window *w, struct display_line *dl,
Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
int width, face_index findex,
struct frame *f = XFRAME (w->frame);
/* struct device *d = XDEVICE (f->device);*/
Lisp_Object window;
- HDC hdc = FRAME_MSWINDOWS_DC (f);
+ HDC hdc = get_frame_dc (f);
int clip_end;
Lisp_Object bg_pmap;
int len = Dynarr_length (buf);
redisplay_calculate_display_boxes (dl, xpos + xoffset, 0,
clip_start, width, &db, &dga);
/* blank the background in the appropriate color */
- mswindows_update_dc (hdc, Qnil, cachel->foreground,
- cachel->background, Qnil);
+ mswindows_update_dc (hdc,
+ cachel->foreground, cachel->background, Qnil);
redisplay_output_pixmap (w, bg_pmap, &db, &dga, findex,
0, 0, 0, TRUE);
/* output pixmap calls this so we have to recall to get correct
for (i = 0; i < nruns; i++)
{
Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
int this_width;
if (EQ (font, Vthe_null_font_instance))
continue;
- mswindows_update_dc (hdc, font, cachel->foreground,
+ mswindows_update_dc (hdc, cachel->foreground,
NILP(bg_pmap) ? cachel->background : Qnil, Qnil);
+ mswindows_set_dc_font (hdc, font, cachel->underline, cachel->strikethru);
this_width = mswindows_text_width_single_run (hdc, cachel, runs + i);
NILP(bg_pmap) ? ETO_CLIPPED | ETO_OPAQUE : ETO_CLIPPED,
&rect, (char *) runs[i].ptr, runs[i].len, NULL);
- /* #### X does underline/strikethrough here so we do the same.
- On mswindows, underline/strikethrough really belongs to the font */
- if (cachel->underline || cachel->strikethru)
- mswindows_apply_face_effects (hdc, dl, xpos, this_width, fi,
- cachel, cachel);
xpos += this_width;
}
}
static void
-mswindows_output_dibitmap (struct frame *f, struct Lisp_Image_Instance *p,
+mswindows_output_dibitmap (struct frame *f, Lisp_Image_Instance *p,
struct display_box* db,
struct display_glyph_area* dga)
{
- HDC hdc = FRAME_MSWINDOWS_DC (f);
+ HDC hdc = get_frame_dc (f);
+ HDC hcompdc = get_frame_compdc (f);
HGDIOBJ old=NULL;
COLORREF bgcolor = GetBkColor (hdc);
col.rgbGreen = GetGValue (bgcolor);
col.rgbReserved = 0;
- old = SelectObject (FRAME_MSWINDOWS_CDC (f),
- IMAGE_INSTANCE_MSWINDOWS_MASK (p));
+ old = SelectObject (hcompdc, IMAGE_INSTANCE_MSWINDOWS_MASK (p));
- SetDIBColorTable (FRAME_MSWINDOWS_CDC (f), 1, 1, &col);
+ SetDIBColorTable (hcompdc, 1, 1, &col);
BitBlt (hdc,
db->xpos, db->ypos,
dga->width, dga->height,
- FRAME_MSWINDOWS_CDC (f),
+ hcompdc,
dga->xoffset, dga->yoffset,
SRCCOPY);
- SelectObject (FRAME_MSWINDOWS_CDC (f), old);
+ SelectObject (hcompdc, old);
}
/* Now blt the bitmap itself, or one of its slices. */
- old = SelectObject (FRAME_MSWINDOWS_CDC (f),
+ old = SelectObject (hcompdc,
IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE
(p, IMAGE_INSTANCE_PIXMAP_SLICE (p)));
BitBlt (hdc,
db->xpos, db->ypos,
dga->width, dga->height,
- FRAME_MSWINDOWS_CDC (f),
+ hcompdc,
dga->xoffset, dga->yoffset,
IMAGE_INSTANCE_MSWINDOWS_MASK (p) ? SRCINVERT : SRCCOPY);
- SelectObject (FRAME_MSWINDOWS_CDC (f),old);
+ SelectObject (hcompdc, old);
}
/* X gc's have this nice property that setting the bg pixmap will
* outputted once and are scrollable */
static void
mswindows_output_dibitmap_region (struct frame *f,
- struct Lisp_Image_Instance *p,
+ Lisp_Image_Instance *p,
struct display_box *db,
struct display_glyph_area *dga)
{
int cursor_height, int bg_pixmap)
{
struct frame *f = XFRAME (w->frame);
- HDC hdc = FRAME_MSWINDOWS_DC (f);
+ HDC hdc = get_frame_dc (f);
- struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object window;
XSETWINDOW (window, w);
/* Output the pixmap. Have to do this as many times as is required
to fill the given area */
- mswindows_update_dc (hdc, Qnil,
+ mswindows_update_dc (hdc,
WINDOW_FACE_CACHEL_FOREGROUND (w, findex),
WINDOW_FACE_CACHEL_BACKGROUND (w, findex), Qnil);
if (IntersectRect (&rect_paint, &rect_dead, prc))
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
- FillRect (FRAME_MSWINDOWS_DC (f), &rect_paint,
+ FillRect (get_frame_dc (f), &rect_paint,
(HBRUSH) (COLOR_BTNFACE+1));
}
}
{
RECT rect = { x, y, x + width, y + height };
Lisp_Object color = WINDOW_FACE_CACHEL_BACKGROUND (w, findex);
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f), Qnil, Qnil, color, Qnil);
+ HDC hdc = get_frame_dc (f);
- DrawEdge (FRAME_MSWINDOWS_DC (f), &rect, edge, border);
+ mswindows_update_dc (hdc, Qnil, color, Qnil);
+ DrawEdge (hdc, &rect, edge, border);
}
}
mswindows_flash (struct device *d)
{
struct frame *f = device_selected_frame (d);
+ HDC hdc = get_frame_dc (f);
RECT rc;
GetClientRect (FRAME_MSWINDOWS_HANDLE (f), &rc);
- InvertRect (FRAME_MSWINDOWS_DC (f), &rc);
+ InvertRect (hdc, &rc);
GdiFlush ();
Sleep (25);
- InvertRect (FRAME_MSWINDOWS_DC (f), &rc);
+ InvertRect (hdc, &rc);
return 1;
}
else if (rb->type == RUNE_DGLYPH)
{
Lisp_Object instance;
- struct display_box db;
+ struct display_box dbox;
struct display_glyph_area dga;
redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
start_pixpos, rb->width,
- &db, &dga);
+ &dbox, &dga);
XSETWINDOW (window, w);
instance = glyph_image_instance (rb->object.dglyph.glyph,
case IMAGE_MONO_PIXMAP:
case IMAGE_COLOR_PIXMAP:
- redisplay_output_pixmap (w, instance, &db, &dga, findex,
+ redisplay_output_pixmap (w, instance, &dbox, &dga, findex,
cursor_start, cursor_width,
cursor_height, 0);
if (rb->cursor_type == CURSOR_ON)
case IMAGE_SUBWINDOW:
case IMAGE_WIDGET:
- redisplay_output_subwindow (w, instance, &db, &dga, findex,
+ redisplay_output_subwindow (w, instance, &dbox, &dga, findex,
cursor_start, cursor_width,
cursor_height);
if (rb->cursor_type == CURSOR_ON)
break;
case IMAGE_LAYOUT:
- redisplay_output_layout (w, instance, &db, &dga, findex,
+ redisplay_output_layout (w, instance, &dbox, &dga, findex,
cursor_start, cursor_width,
cursor_height);
if (rb->cursor_type == CURSOR_ON)
mswindows_output_vertical_divider (struct window *w, int clear_unused)
{
struct frame *f = XFRAME (w->frame);
+ HDC hdc = get_frame_dc (f);
RECT rect;
int spacing = XINT (w->vertical_divider_spacing);
int shadow = XINT (w->vertical_divider_shadow_thickness);
{
rect.top = y1;
rect.bottom = y2;
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f), Qnil, Qnil,
+ mswindows_update_dc (hdc, Qnil,
WINDOW_FACE_CACHEL_BACKGROUND (w, DEFAULT_INDEX), Qnil);
rect.right = WINDOW_RIGHT (w);
rect.left = rect.right - spacing;
- ExtTextOut (FRAME_MSWINDOWS_DC (f), 0, 0, ETO_OPAQUE,
+ ExtTextOut (hdc, 0, 0, ETO_OPAQUE,
&rect, NULL, 0, NULL);
rect.left = div_left;
rect.right = div_left + spacing;
- ExtTextOut (FRAME_MSWINDOWS_DC (f), 0, 0, ETO_OPAQUE,
+ ExtTextOut (hdc, 0, 0, ETO_OPAQUE,
&rect, NULL, 0, NULL);
}
{
face_index div_face
= get_builtin_face_cache_index (w, Vvertical_divider_face);
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f), Qnil, Qnil,
+ mswindows_update_dc (hdc, Qnil,
WINDOW_FACE_CACHEL_BACKGROUND (w, div_face), Qnil);
- ExtTextOut (FRAME_MSWINDOWS_DC (f), 0, 0, ETO_OPAQUE,
- &rect, NULL, 0, NULL);
+ ExtTextOut (hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);
}
/* Draw a shadow around the divider */
{
/* #### This will be fixed to support arbitrary thickness */
InflateRect (&rect, abs_shadow, abs_shadow);
- DrawEdge (FRAME_MSWINDOWS_DC (f), &rect,
+ DrawEdge (hdc, &rect,
shadow > 0 ? EDGE_RAISED : EDGE_SUNKEN, BF_RECT);
}
}
mswindows_text_width (struct frame *f, struct face_cachel *cachel,
CONST Emchar *str, Charcount len)
{
+ HDC hdc = get_frame_dc (f);
int width_so_far = 0;
unsigned char *text_storage = (unsigned char *) alloca (2 * len);
textual_run *runs = alloca_array (textual_run, len);
nruns = separate_textual_runs (text_storage, runs, str, len);
for (i = 0; i < nruns; i++)
- width_so_far += mswindows_text_width_single_run (FRAME_MSWINDOWS_DC (f),
+ width_so_far += mswindows_text_width_single_run (hdc,
cachel, runs + i);
return width_so_far;
Lisp_Object background_pixmap)
{
RECT rect = { x, y, x+width, y+height };
+ HDC hdc = get_frame_dc (f);
if (!NILP (background_pixmap))
{
struct display_box db = { x, y, width, height };
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f),
- Qnil, fcolor, bcolor, background_pixmap);
+ mswindows_update_dc (hdc,
+ fcolor, bcolor, background_pixmap);
mswindows_output_dibitmap_region
( f, XIMAGE_INSTANCE (background_pixmap), &db, 0);
}
else
{
- mswindows_update_dc (FRAME_MSWINDOWS_DC (f), Qnil, Qnil, fcolor, Qnil);
- ExtTextOut (FRAME_MSWINDOWS_DC (f), 0, 0, ETO_OPAQUE,
+ mswindows_update_dc (hdc, Qnil, fcolor, Qnil);
+ ExtTextOut (hdc, 0, 0, ETO_OPAQUE,
&rect, NULL, 0, NULL);
}
void
console_type_create_redisplay_mswindows (void)
{
- /* redisplay methods */
+ /* redisplay methods - display*/
CONSOLE_HAS_METHOD (mswindows, text_width);
CONSOLE_HAS_METHOD (mswindows, output_display_block);
CONSOLE_HAS_METHOD (mswindows, divider_height);
CONSOLE_HAS_METHOD (mswindows, bevel_area);
CONSOLE_HAS_METHOD (mswindows, output_string);
CONSOLE_HAS_METHOD (mswindows, output_pixmap);
+
+ /* redisplay methods - printer */
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, text_width);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_display_block);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, divider_height);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, eol_cursor_width);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_vertical_divider);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_region);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_frame);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_begin);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_end);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, bevel_area);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_string);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_pixmap);
}
face_index findex, int cursor_start, int cursor_width,
int cursor_height)
{
- struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object window;
struct display_glyph_area sdga;
face_index findex, int cursor_start, int cursor_width,
int cursor_height)
{
- struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object window, rest;
Emchar_dynarr *buf = Dynarr_new (Emchar);
struct frame *f = XFRAME (w->frame);
int layout_height, layout_width;
/* We bogusly don't take f->extents_changed and f->glyphs_changed
into account. This is because if we do we always redisplay the
- entire layout. So far I have seen no ill effects to we'll see. */
+ entire layout. So far I have seen no ill effects so we'll see. */
int frame_really_changed = (f->buffers_changed ||
f->clip_changed ||
f->faces_changed ||
/* First determine if the image is visible at all */
if (IMAGE_INSTANCEP (child))
{
- struct Lisp_Image_Instance* childii = XIMAGE_INSTANCE (child);
+ Lisp_Image_Instance* childii = XIMAGE_INSTANCE (child);
/* The enclosing layout offsets are +ve at this point */
struct display_glyph_area cdga;
cdga.xoffset = IMAGE_INSTANCE_XOFFSET (childii) - dga->xoffset;
{
struct frame *f = XFRAME (w->frame);
struct device *d = XDEVICE (f->device);
- struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object window;
XSETWINDOW (window, w);
char *sequence = tgetstr (keys[i].cap, address);
if (sequence)
Fdefine_key (function_key_map,
- build_ext_string (sequence, FORMAT_BINARY),
+ build_ext_string (sequence, Qbinary),
vector1 (intern (keys[i].name)));
}
CONST char *k0 = tgetstr ("k0", address);
if (k_semi)
- Fdefine_key (function_key_map, build_ext_string (k_semi, FORMAT_BINARY),
+ Fdefine_key (function_key_map, build_ext_string (k_semi, Qbinary),
vector1 (intern ("f10")));
if (k0)
- Fdefine_key (function_key_map, build_ext_string (k0, FORMAT_BINARY),
+ Fdefine_key (function_key_map, build_ext_string (k0, Qbinary),
vector1 (intern (k_semi ? "f0" : "f10")));
}
{
sprintf (fkey, "f%d", i);
Fdefine_key (function_key_map,
- build_ext_string (sequence, FORMAT_BINARY),
+ build_ext_string (sequence, Qbinary),
vector1 (intern (fkey)));
}
}
/*
* Various mappings to try and get a better fit.
*/
-#define CONDITIONAL_REASSIGN(cap1, cap2, keyname) \
- if (!tgetstr (cap1, address)) \
- { \
- char *sequence = tgetstr (cap2, address); \
- if (sequence) \
- Fdefine_key (function_key_map, \
- build_ext_string (sequence, FORMAT_BINARY), \
- vector1 (intern (keyname))); \
- }
+#define CONDITIONAL_REASSIGN(cap1, cap2, keyname) do { \
+ if (!tgetstr (cap1, address)) \
+ { \
+ char *sequence = tgetstr (cap2, address); \
+ if (sequence) \
+ Fdefine_key (function_key_map, \
+ build_ext_string (sequence, Qbinary), \
+ vector1 (intern (keyname))); \
+ } \
+ } while (0)
/* if there's no key_next keycap, map key_npage to `next' keysym */
CONDITIONAL_REASSIGN ("%5", "kN", "next");
x_text_width_single_run (struct face_cachel *cachel, struct textual_run *run)
{
Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
if (!fi->proportional_p)
return fi->width * run->len;
else
else if (rb->object.chr.ch == '\n')
{
/* Clear in case a cursor was formerly here. */
- redisplay_clear_region (window, findex, xpos,
+ redisplay_clear_region (window, findex, xpos,
DISPLAY_LINE_YPOS (dl),
- rb->width,
+ rb->width,
DISPLAY_LINE_HEIGHT (dl));
elt++;
}
for (i = 0; i < nruns; i++)
{
Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
int this_width;
int need_clipping;
}
void
-x_output_x_pixmap (struct frame *f, struct Lisp_Image_Instance *p, int x,
+x_output_x_pixmap (struct frame *f, Lisp_Image_Instance *p, int x,
int y, int xoffset, int yoffset,
- int width, int height, unsigned long fg, unsigned long bg,
+ int width, int height, unsigned long fg, unsigned long bg,
GC override_gc)
{
struct device *d = XDEVICE (f->device);
pixel values, instead of symbolic of fg/bg. */
if (IMAGE_INSTANCE_PIXMAP_DEPTH (p) > 0)
{
- XCopyArea (dpy,
- IMAGE_INSTANCE_X_PIXMAP_SLICE
+ XCopyArea (dpy,
+ IMAGE_INSTANCE_X_PIXMAP_SLICE
(p, IMAGE_INSTANCE_PIXMAP_SLICE (p)), x_win, gc, xoffset,
yoffset, width,
height, x, y);
}
else
{
- XCopyPlane (dpy, IMAGE_INSTANCE_X_PIXMAP_SLICE
+ XCopyPlane (dpy, IMAGE_INSTANCE_X_PIXMAP_SLICE
(p, IMAGE_INSTANCE_PIXMAP_SLICE (p)), x_win, gc,
xoffset, yoffset, width, height, x, y, 1L);
}
{
struct frame *f = XFRAME (w->frame);
struct device *d = XDEVICE (f->device);
- struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Display *dpy = DEVICE_X_DISPLAY (d);
Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
-
+
/* Output the pixmap. */
{
Lisp_Object tmp_pixel;
{
int cursor_height, cursor_y;
int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
- struct Lisp_Font_Instance *fi;
+ Lisp_Font_Instance *fi;
fi = XFONT_INSTANCE (FACE_CACHEL_FONT
(WINDOW_FACE_CACHEL (w, rb->findex),
return;
}
- redisplay_clear_to_window_end (w, WINDOW_TEXT_TOP (w),
+ redisplay_clear_to_window_end (w, WINDOW_TEXT_TOP (w),
WINDOW_TEXT_BOTTOM (w));
}
Lisp_Object font_instance =
ensure_face_cachel_contains_charset (cachel, data->window,
charset);
- struct Lisp_Font_Instance *fi;
+ Lisp_Font_Instance *fi;
if (EQ (font_instance, Vthe_null_font_instance))
{
prop_block_dynarr *prop = NULL;
if (VECTORP (entry))
{
- struct Lisp_Vector *de = XVECTOR (entry);
+ Lisp_Vector *de = XVECTOR (entry);
EMACS_INT len = vector_length (de);
int elt;
{
struct window *w = XWINDOW (data->window);
+ /* If window faces changed, and glyph instance is text, then
+ glyph sizes might have changed too */
+ invalidate_glyph_geometry_maybe (gb->glyph, w);
+
/* A nil extent indicates a special glyph (ex. truncator). */
if (NILP (gb->extent)
|| (pos_type == BEGIN_GLYPHS &&
{
CONST Bufbyte *tmp_str = charptr_n_addr (str, *offset);
- /* ### NOTE: I don't understand why a tmp_max is not
+ /* #### NOTE: I don't understand why a tmp_max is not
computed and used here as in the plain string case
above. -- dv */
pos = add_string_to_fstring_db_runes (data, tmp_str,
{
CONST Bufbyte *tmp_str = charptr_n_addr (str, *offset);
- /* ### NOTE: I don't understand why a tmp_max is not
+ /* #### NOTE: I don't understand why a tmp_max is not
computed and used here as in the plain string case
above. -- dv */
pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
CONST Bufbyte *tmp_str =
charptr_n_addr ((CONST Bufbyte *) str, *offset);
- /* ### NOTE: I don't understand why a tmp_max is not computed and
+ /* #### NOTE: I don't understand why a tmp_max is not computed and
used here as in the plain string case above. -- dv */
pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
min_pos, max_pos);
against this case. */
struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
struct device *d = XDEVICE (f->device);
- struct Lisp_String* s = XSTRING (disp_string);
+ Lisp_String* s = XSTRING (disp_string);
/* we're working with these a lot so precalculate them */
Bytecount slen = XSTRING_LENGTH (disp_string);
the cache purely because glyphs have changed - this is now
handled by the dirty flag.*/
if ((!echo_active && b != window_display_buffer (w))
- || !Dynarr_length (w->glyph_cachels))
+ || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
reset_glyph_cachels (w);
else
mark_glyph_cachels_as_not_updated (w);
return 0;
}
-/* Ensure that all frames on the given device are correctly displayed. */
+/* Ensure that all frames on the given device are correctly displayed.
+ If AUTOMATIC is non-zero, and the device implementation indicates
+ no automatic redisplay, as printers do, then the device is not
+ redisplayed. AUTOMATIC is set to zero when called from lisp
+ functions (redraw-device) and (redisplay-device), and to non-zero
+ when called from "lazy" redisplay();
+*/
static int
-redisplay_device (struct device *d)
+redisplay_device (struct device *d, int automatic)
{
Lisp_Object frame, frmcons;
int preempted = 0;
int size_change_failed = 0;
struct frame *f;
+ if (automatic
+ && (MAYBE_INT_DEVMETH (d, device_implementation_flags, ())
+ & XDEVIMPF_NO_AUTO_REDISPLAY))
+ return 0;
+
if (DEVICE_STREAM_P (d)) /* nothing to do */
return 0;
if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
{
- preempted = redisplay_device (d);
+ preempted = redisplay_device (d, 1);
if (preempted)
{
{
XFRAME (XCAR (frmcons))->clear = 1;
}
- redisplay_device (d);
+ redisplay_device (d, 0);
return unbind_to (count, Qnil);
}
disable_preemption++;
}
- redisplay_device (d);
+ redisplay_device (d, 0);
return unbind_to (count, Qnil);
}
if (!initialized)
#endif
{
- cmotion_display_lines = Dynarr_new (display_line);
- mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
- formatted_string_extent_dynarr = Dynarr_new (EXTENT);
- formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
- formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
- internal_cache = Dynarr_new (line_start_cache);
+ if (!cmotion_display_lines)
+ cmotion_display_lines = Dynarr_new (display_line);
+ if (!mode_spec_bufbyte_string)
+ mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
+ if (!formatted_string_extent_dynarr)
+ formatted_string_extent_dynarr = Dynarr_new (EXTENT);
+ if (!formatted_string_extent_start_dynarr)
+ formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
+ if (!formatted_string_extent_end_dynarr)
+ formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
+ if (!internal_cache)
+ internal_cache = Dynarr_new (line_start_cache);
}
/* window system is nil when in -batch mode */
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_REDISPLAY_H_
-#define _XEMACS_REDISPLAY_H_
+#ifndef INCLUDED_redisplay_h_
+#define INCLUDED_redisplay_h_
/* Redisplay DASSERT types */
#define DB_DISP_POS 1
display_line_dynarr *ddla, int line,
int force_start, int force_end);
-#endif /* _XEMACS_REDISPLAY_H_ */
+#endif /* INCLUDED_redisplay_h_ */
/* If we get here, we found another repeat character. */
if (!(syntax & RE_NO_MINIMAL_MATCHING))
{
- /* `*?' and `+?' and `??' are okay (and mean match
- minimally), but other sequences (such as `*??' and
- `+++') are rejected (reserved for future use). */
+ /* "*?" and "+?" and "??" are okay (and mean match
+ minimally), but other sequences (such as "*??" and
+ "+++") are rejected (reserved for future use). */
if (minimal || c != '?')
FREE_STACK_RETURN (REG_BADRPT);
minimal = true;
/* Synched up with: FSF 19.29. */
-#ifndef __REGEXP_LIBRARY_H__
-#define __REGEXP_LIBRARY_H__
+#ifndef INCLUDED_regex_h_
+#define INCLUDED_regex_h_
/* POSIX says that <sys/types.h> must be included (by the caller) before
<regex.h>. */
size_t errbuf_size);
void regfree (regex_t *preg);
-#endif /* not __REGEXP_LIBRARY_H__ */
+#endif /* INCLUDED_regex_h_ */
#ifndef TCS_VERTICAL
#define TCS_VERTICAL 0x0080
#endif
+#ifndef PHYSICALWIDTH
+#define PHYSICALWIDTH 110
+#endif
+#ifndef PHYSICALHEIGHT
+#define PHYSICALHEIGHT 111
+#endif
+#ifndef PHYSICALOFFSETX
+#define PHYSICALOFFSETX 112
+#endif
+#ifndef PHYSICALOFFSETY
+#define PHYSICALOFFSETY 113
+#endif
+
#define PBS_SMOOTH 0x01
#ifdef CYGWIN_VERSION_DLL_MAJOR
#if 0
-/* ### FIXME: although defining BROKEN_SIGIO is correct for proper ^G
+/* #### FIXME: although defining BROKEN_SIGIO is correct for proper ^G
behavior, bugs in cygwin mean that xemacs locks up frequently if
this is defined. */
#define BROKEN_SIGIO
#define tzset init_gettimeofday
#endif
-/* bcopy under djgpp is quite safe */
-#define GAP_USE_BCOPY
-#define BCOPY_UPWARD_SAFE 1
-#define BCOPY_DOWNWARD_SAFE 1
-
/* Mode line description of a buffer's type. */
#define MODE_LINE_BINARY_TEXT(buf) (NILP(buf->buffer_file_type) ? "T" : "B")
#define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
-/* get some redefinitions in place */
-
-#if 0
-/* IO calls that are emulated or shadowed */
-#define access sys_access
-#define chdir sys_chdir
-#define chmod sys_chmod
-#define close sys_close
-#define creat sys_creat
-#define ctime sys_ctime
-#define dup sys_dup
-#define dup2 sys_dup2
-#define fopen sys_fopen
-#define link sys_link
-#define mktemp sys_mktemp
-#define open sys_open
-#define read sys_read
-#define rename sys_rename
-#define unlink sys_unlink
-#define write sys_write
-#define mkdir sys_mkdir
-#define rmdir sys_rmdir
-
-#endif
-
-#if 0
-/* this is hacky, but is necessary to avoid warnings about macro
- redefinitions using the SDK compilers */
-#ifndef __STDC__
-#define __STDC__ 1
-#define MUST_UNDEF__STDC__
-#endif
-#include <direct.h>
-#include <io.h>
-#include <stdio.h>
-#ifdef MUST_UNDEF__STDC__
-#undef __STDC__
-#undef MUST_UNDEF__STDC__
-#endif
-#endif
#include <stdio.h>
+/* subprocess calls that are emulated */
+#ifndef DONT_ENCAPSULATE
+#define spawnve sys_spawnve
+int spawnve (int mode, CONST char *cmdname,
+ CONST char * CONST *argv, CONST char *CONST *envp);
+#endif
/* IO calls that are emulated or shadowed */
#define pipe sys_pipe
void sleep (int seconds);
#endif
-/* subprocess calls that are emulated */
-#define spawnve sys_spawnve
-int spawnve (int mode, CONST char *cmdname,
- CONST char * CONST *argv, CONST char *CONST *envp);
-
#define wait sys_wait
int wait (int *status);
#define popen _popen
#define pclose _pclose
-#if 0
-#define chdir _chdir
-#define execlp _execlp
-#define execvp _execvp
-#define fcloseall _fcloseall
-#define fdopen _fdopen
-#define fgetchar _fgetchar
-#define fileno _fileno
-#define flushall _flushall
-#define fputchar _fputchar
-#define getw _getw
-#define getpid _getpid
-#define isatty _isatty
-#define logb _logb
-#define _longjmp longjmp
-#define lseek _lseek
-#define putw _putw
-#define umask _umask
-/* #define utime _utime */
-/* #define index strchr */
-/* #define rindex strrchr */
-#define read _read
-#define write _write
-#define getcwd _getcwd
-
-#ifdef HAVE_NTGUI
-#define abort win32_abort
-#endif
-
-#endif /* 0 */
-
typedef int uid_t;
typedef int gid_t;
typedef int pid_t;
#define sighold(s) msw_sighold(s)
#define sigrelse(s) msw_sigrelse(s)
#define sigpause(s) msw_sigpause(s)
-#define signal sigset
/* Defines that we need that aren't in the standard signal.h */
#define SIGHUP 1 /* Hang up */
#define getdisk() (_getdrive () - 1)
#define getdefdir(_drv, _buf) _getdcwd (_drv, _buf, MAXPATHLEN)
-#if 0 /* they do. -kkm */
-/* Define this so that winsock.h definitions don't get included when windows.h
- is... I don't know if they do the right thing for emacs. For this to
- have proper effect, config.h must always be included before windows.h. */
-#define _WINSOCKAPI_ 1
-#endif /* 0 */
-
/* Defines size_t and alloca (). */
#include <malloc.h>
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_SCROLLBAR_MSW_H_
-#define _XEMACS_SCROLLBAR_MSW_H_
+#ifndef INCLUDED_scrollbar_msw_h_
+#define INCLUDED_scrollbar_msw_h_
#if defined (HAVE_MS_WINDOWS) && defined (HAVE_SCROLLBARS)
int mswindows_handle_mousewheel_event (Lisp_Object frame, int keys, int delta);
#endif /* HAVE_MS_WINDOWS and HAVE_SCROLLBARS */
-#endif /* _XEMACS_SCROLLBAR_MSW_H_ */
+#endif /* INCLUDED_scrollbar_msw_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_SCROLLBAR_X_H_
-#define _XEMACS_SCROLLBAR_X_H_
+#ifndef INCLUDED_scrollbar_x_h_
+#define INCLUDED_scrollbar_x_h_
#if defined (HAVE_X_WINDOWS) && defined (HAVE_SCROLLBARS)
void x_set_scrollbar_pointer (struct frame *f, Lisp_Object cursor);
#endif /* HAVE_X_WINDOWS and HAVE_SCROLLBARS */
-#endif /* _XEMACS_SCROLLBAR_H_ */
+
+#endif /* INCLUDED_scrollbar_x_h_ */
w = XWINDOW (window);
wcw = window_char_width (w, 0) - 1;
- /* ### We should be able to scroll further right as long as there is
+ /* #### We should be able to scroll further right as long as there is
a visible truncation glyph. This calculation for max is bogus. */
max_len = w->max_line_len + 2;
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_SCROLLBAR_H_
-#define _XEMACS_SCROLLBAR_H_
+#ifndef INCLUDED_scrollbar_h_
+#define INCLUDED_scrollbar_h_
#ifdef HAVE_SCROLLBARS
#endif /* HAVE_SCROLLBARS */
-#endif /* _XEMACS_SCROLLBAR_H_ */
+#endif /* INCLUDED_scrollbar_h_ */
}
Bytind
-bi_find_next_emchar_in_string (struct Lisp_String* str, Emchar target, Bytind st,
+bi_find_next_emchar_in_string (Lisp_String* str, Emchar target, Bytind st,
EMACS_INT count)
{
/* This function has been Mule-ized. */
unsigned char fastmap[0400];
int negate = 0;
REGISTER int i;
- struct Lisp_Char_Table *syntax_table =
- XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
Bufpos limit;
if (NILP (lim))
Charcount i, len;
EMACS_INT punct_count = 0, word_count = 0;
struct buffer *buf = decode_buffer (buffer, 0);
- struct Lisp_Char_Table *syntax_table =
- XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
CHECK_STRING (string);
len = XSTRING_CHAR_LENGTH (string);
Emchar c, prevc;
Charcount inslen;
struct buffer *buf;
- struct Lisp_Char_Table *syntax_table;
+ Lisp_Char_Table *syntax_table;
int mc_count;
Lisp_Object buffer;
int_dynarr *ul_action_dynarr = 0;
{
CONST char *nameext;
- GET_C_STRING_CTEXT_DATA_ALLOCA (Fsymbol_name (sym), nameext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, Fsymbol_name (sym),
+ C_STRING_ALLOCA, nameext,
+ Qctext);
return XInternAtom (display, nameext, only_if_exists ? True : False);
}
}
#endif
{
- Lisp_Object newsym;
- CONST Bufbyte *intstr;
+ char *intstr;
char *str = XGetAtomName (display, atom);
if (! str) return Qnil;
- GET_C_CHARPTR_INT_CTEXT_DATA_ALLOCA (str, intstr);
- newsym = intern ((char *) intstr);
+ TO_INTERNAL_FORMAT (C_STRING, str,
+ C_STRING_ALLOCA, intstr,
+ Qctext);
XFree (str);
- return newsym;
+ return intern (intstr);
}
}
Opaque pointers are the clean way to go here.
*/
- selection_time = make_opaque (sizeof (thyme), (void *) &thyme);
+ selection_time = make_opaque (&thyme, sizeof (thyme));
#ifdef MOTIF_CLIPBOARDS
hack_motif_clipboard_selection (selection_atom, selection_value,
}
if (chartypes == LATIN_1)
- GET_STRING_BINARY_DATA_ALLOCA (selection_value, data, bytes);
+ TO_EXTERNAL_FORMAT (LISP_STRING, selection_value,
+ ALLOCA, (data, bytes),
+ Qbinary);
else if (chartypes == WORLD)
{
- GET_STRING_CTEXT_DATA_ALLOCA (selection_value, data, bytes);
+ TO_EXTERNAL_FORMAT (LISP_STRING, selection_value,
+ ALLOCA, (data, bytes),
+ Qctext);
encoding = "COMPOUND_TEXT";
}
}
return make_ext_string (data, size,
type == DEVICE_XATOM_TEXT (d) ||
type == DEVICE_XATOM_COMPOUND_TEXT (d)
- ? FORMAT_CTEXT : FORMAT_BINARY);
+ ? Qctext : Qbinary);
/* Convert a single atom to a Lisp Symbol.
Convert a set of atoms to a vector of symbols. */
CONST Extbyte *extval;
Extcount extvallen;
- if (NILP (type))
- GET_STRING_CTEXT_DATA_ALLOCA (obj, extval, extvallen);
- else
- GET_STRING_BINARY_DATA_ALLOCA (obj, extval, extvallen);
+ TO_EXTERNAL_FORMAT (LISP_STRING, obj,
+ ALLOCA, (extval, extvallen),
+ (NILP (type) ? Qctext : Qbinary));
*format_ret = 8;
*size_ret = extvallen;
*data_ret = (unsigned char *) xmalloc (*size_ret);
*format_ret = 8;
len = set_charptr_emchar (buf, XCHAR (obj));
- GET_CHARPTR_EXT_CTEXT_DATA_ALLOCA (buf, len, extval, extvallen);
+ TO_EXTERNAL_FORMAT (DATA, (buf, len),
+ ALLOCA, (extval, extvallen),
+ Qctext);
*size_ret = extvallen;
*data_ret = (unsigned char *) xmalloc (*size_ret);
memcpy (*data_ret, extval, *size_ret);
ret = (bytes ?
make_ext_string (data, bytes,
memchr (data, 0x1b, bytes) ?
- FORMAT_CTEXT : FORMAT_BINARY)
+ Qctext : Qbinary)
: Qnil);
xfree (data);
return ret;
}
if (chartypes == LATIN_1)
- GET_STRING_BINARY_DATA_ALLOCA (string, data, bytes);
+ TO_EXTERNAL_FORMAT (LISP_STRING, string,
+ ALLOCA, (data, bytes),
+ Qbinary);
else if (chartypes == WORLD)
- GET_STRING_CTEXT_DATA_ALLOCA (string, data, bytes);
+ TO_EXTERNAL_FORMAT (LISP_STRING, string,
+ ALLOCA, (data, bytes),
+ Qctext);
#endif /* MULE */
bytes_remaining = bytes;
/************************************************************************/
void
-syms_of_xselect (void)
+syms_of_select_x (void)
{
#ifdef CUT_BUFFER_SUPPORT
}
void
-reinit_vars_of_xselect (void)
+reinit_vars_of_select_x (void)
{
reading_selection_reply = 0;
reading_which_selection = 0;
}
void
-vars_of_xselect (void)
+vars_of_select_x (void)
{
- reinit_vars_of_xselect ();
+ reinit_vars_of_select_x ();
#ifdef CUT_BUFFER_SUPPORT
cut_buffers_initialized = 0;
}
void
-Xatoms_of_xselect (struct device *d)
+Xatoms_of_select_x (struct device *d)
{
Display *D = DEVICE_X_DISPLAY (d);
(selection_name, selection_value, device))
{
Lisp_Object selection_time, selection_data, prev_value;
+ struct gcpro gcpro1;
CHECK_SYMBOL (selection_name);
if (NILP (selection_value)) error ("selection-value may not be nil.");
selection_data = list3 (selection_name,
selection_value,
Qnil);
+ GCPRO1 (selection_data);
+
prev_value = assq_no_quit (selection_name, Vselection_alist);
Vselection_alist = Fcons (selection_data, Vselection_alist);
Fsetcar (XCDR (XCDR (selection_data)), selection_time);
+ UNGCPRO;
+
return selection_value;
}
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_SELECT_H_
-#define _XEMACS_SELECT_H_
+#ifndef INCLUDED_select_h_
+#define INCLUDED_select_h_
extern Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL,
Lisp_Object get_local_selection (Lisp_Object selection_symbol, Lisp_Object target_type);
void handle_selection_clear (Lisp_Object selection_symbol);
-#endif
+#endif /* INCLUDED_select_h_ */
{
char *fileext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (file, fileext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, file,
+ C_STRING_ALLOCA, fileext,
+ Qfile_name);
/* #### NAS code should allow specification of a device. */
if (nas_play_sound_file (fileext, vol))
return Qnil;
{
char *fileext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (file, fileext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, file,
+ C_STRING_ALLOCA, fileext,
+ Qfile_name);
if (esd_play_sound_file (fileext, vol))
return Qnil;
}
{
CONST char *fileext;
- GET_C_STRING_FILENAME_DATA_ALLOCA (file, fileext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, file,
+ C_STRING_ALLOCA, fileext,
+ Qfile_name);
/* The sound code doesn't like getting SIGIO interrupts.
Unix sucks! */
stop_interrupts ();
CONST Extbyte *soundext;
Extcount soundextlen;
- GET_STRING_BINARY_DATA_ALLOCA (sound, soundext, soundextlen);
+ TO_EXTERNAL_FORMAT (LISP_STRING, sound,
+ ALLOCA, (soundext, soundextlen),
+ Qbinary);
if (nas_play_sound_data ((unsigned char*)soundext, soundextlen, vol))
return Qnil;
}
Extbyte *soundext;
Extcount soundextlen;
- GET_STRING_BINARY_DATA_ALLOCA (sound, soundext, soundextlen);
+ TO_EXTERNAL_FORMAT (LISP_STRING, sound, ALLOCA, (soundext, soundextlen),
+ Qbinary);
if (esd_play_sound_data (soundext, soundextlen, vol))
return Qnil;
}
CONST Extbyte *soundext;
Extcount soundextlen;
- GET_STRING_BINARY_DATA_ALLOCA (sound, soundext, soundextlen);
+ TO_EXTERNAL_FORMAT (LISP_STRING, sound,
+ ALLOCA, (soundext, soundextlen),
+ Qbinary);
/* The sound code doesn't like getting SIGIO interrupts. Unix sucks! */
stop_interrupts ();
play_sound_data ((unsigned char*)soundext, soundextlen, vol);
static specifier_type_entry_dynarr *the_specifier_type_entry_dynarr;
static const struct lrecord_description ste_description_1[] = {
- { XD_LISP_OBJECT, offsetof(specifier_type_entry, symbol), 1 },
- { XD_STRUCT_PTR, offsetof(specifier_type_entry, meths), 1, &specifier_methods_description },
+ { XD_LISP_OBJECT, offsetof (specifier_type_entry, symbol) },
+ { XD_STRUCT_PTR, offsetof (specifier_type_entry, meths), 1, &specifier_methods_description },
{ XD_END }
};
static const struct struct_description ste_description = {
- sizeof(specifier_type_entry),
+ sizeof (specifier_type_entry),
ste_description_1
};
static const struct lrecord_description sted_description_1[] = {
- XD_DYNARR_DESC(specifier_type_entry_dynarr, &ste_description),
+ XD_DYNARR_DESC (specifier_type_entry_dynarr, &ste_description),
{ XD_END }
};
static const struct struct_description sted_description = {
- sizeof(specifier_type_entry_dynarr),
+ sizeof (specifier_type_entry_dynarr),
sted_description_1
};
!NILP (rest);
rest = XSPECIFIER (rest)->next_specifier)
{
- struct Lisp_Specifier *sp = XSPECIFIER (rest);
+ Lisp_Specifier *sp = XSPECIFIER (rest);
/* This effectively changes the specifier specs.
However, there's no need to call
recompute_cached_specifier_everywhere() or the
!NILP (rest);
rest = XSPECIFIER (rest)->next_specifier)
{
- struct Lisp_Specifier *sp = XSPECIFIER (rest);
+ Lisp_Specifier *sp = XSPECIFIER (rest);
/* Make sure we're actually going to be changing something.
Fremove_specifier() always calls
static Lisp_Object
mark_specifier (Lisp_Object obj)
{
- struct Lisp_Specifier *specifier = XSPECIFIER (obj);
+ Lisp_Specifier *specifier = XSPECIFIER (obj);
mark_object (specifier->global_specs);
mark_object (specifier->device_specs);
{
if (! marked_p (rest))
{
- struct Lisp_Specifier* sp = XSPECIFIER (rest);
+ Lisp_Specifier* sp = XSPECIFIER (rest);
/* A bit of assertion that we're removing both parts of the
magic one altogether */
assert (!MAGIC_SPECIFIER_P(sp)
static void
print_specifier (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Specifier *sp = XSPECIFIER (obj);
+ Lisp_Specifier *sp = XSPECIFIER (obj);
char buf[100];
int count = specpdl_depth ();
Lisp_Object the_specs;
static void
finalize_specifier (void *header, int for_disksave)
{
- struct Lisp_Specifier *sp = (struct Lisp_Specifier *) header;
+ Lisp_Specifier *sp = (Lisp_Specifier *) header;
/* don't be snafued by the disksave finalization. */
if (!for_disksave && !GHOST_SPECIFIER_P(sp) && sp->caching)
{
static int
specifier_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Specifier *s1 = XSPECIFIER (obj1);
- struct Lisp_Specifier *s2 = XSPECIFIER (obj2);
+ Lisp_Specifier *s1 = XSPECIFIER (obj1);
+ Lisp_Specifier *s2 = XSPECIFIER (obj2);
int retval;
Lisp_Object old_inhibit_quit = Vinhibit_quit;
static unsigned long
specifier_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Specifier *s = XSPECIFIER (obj);
+ Lisp_Specifier *s = XSPECIFIER (obj);
/* specifier hashing is a bit problematic because there are so
many places where data can be stored. We pick what are perhaps
static size_t
sizeof_specifier (CONST void *header)
{
- if (GHOST_SPECIFIER_P ((struct Lisp_Specifier *) header))
- return offsetof (struct Lisp_Specifier, data);
+ if (GHOST_SPECIFIER_P ((Lisp_Specifier *) header))
+ return offsetof (Lisp_Specifier, data);
else
{
- CONST struct Lisp_Specifier *p = (CONST struct Lisp_Specifier *) header;
- return offsetof (struct Lisp_Specifier, data) + p->methods->extra_data_size;
+ CONST Lisp_Specifier *p = (CONST Lisp_Specifier *) header;
+ return offsetof (Lisp_Specifier, data) + p->methods->extra_data_size;
}
}
static const struct lrecord_description specifier_methods_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct specifier_methods, predicate_symbol), 1 },
+ { XD_LISP_OBJECT, offsetof (struct specifier_methods, predicate_symbol) },
{ XD_END }
};
const struct struct_description specifier_methods_description = {
- sizeof(struct specifier_methods),
+ sizeof (struct specifier_methods),
specifier_methods_description_1
};
};
static const struct struct_description specifier_caching_description = {
- sizeof(struct specifier_caching),
+ sizeof (struct specifier_caching),
specifier_caching_description_1
};
static const struct lrecord_description specifier_description[] = {
- { XD_STRUCT_PTR, offsetof(struct Lisp_Specifier, methods), 1, &specifier_methods_description },
- { XD_LO_LINK, offsetof(struct Lisp_Specifier, next_specifier) },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Specifier, global_specs), 5 },
- { XD_STRUCT_PTR, offsetof(struct Lisp_Specifier, caching), 1, &specifier_caching_description },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Specifier, magic_parent), 2 },
+ { XD_STRUCT_PTR, offsetof (Lisp_Specifier, methods), 1, &specifier_methods_description },
+ { XD_LO_LINK, offsetof (Lisp_Specifier, next_specifier) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, global_specs) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, device_specs) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, frame_specs) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, window_specs) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, buffer_specs) },
+ { XD_STRUCT_PTR, offsetof (Lisp_Specifier, caching), 1, &specifier_caching_description },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, magic_parent) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Specifier, fallback) },
{ XD_SPECIFIER_END }
};
specifier_equal, specifier_hash,
specifier_description,
sizeof_specifier,
- struct Lisp_Specifier);
+ Lisp_Specifier);
\f
/************************************************************************/
/* Creating specifiers */
size_t data_size, int call_create_meth)
{
Lisp_Object specifier;
- struct Lisp_Specifier *sp = (struct Lisp_Specifier *)
- alloc_lcrecord (offsetof (struct Lisp_Specifier, data) +
- data_size, &lrecord_specifier);
+ Lisp_Specifier *sp = (Lisp_Specifier *)
+ alloc_lcrecord (offsetof (Lisp_Specifier, data) + data_size,
+ &lrecord_specifier);
sp->methods = spec_meths;
sp->global_specs = Qnil;
{
/* The return value of this function must be GCPRO'd. */
Lisp_Object rest, list_to_build_up = Qnil;
- struct Lisp_Specifier *sp = XSPECIFIER (specifier);
+ Lisp_Specifier *sp = XSPECIFIER (specifier);
struct gcpro gcpro1;
GCPRO1 (list_to_build_up);
specifier_add_spec (Lisp_Object specifier, Lisp_Object locale,
Lisp_Object inst_list, enum spec_add_meth add_meth)
{
- struct Lisp_Specifier *sp = XSPECIFIER (specifier);
+ Lisp_Specifier *sp = XSPECIFIER (specifier);
enum spec_locale_type type = locale_type_from_locale (locale);
Lisp_Object *orig_inst_list, tem;
Lisp_Object list_to_build_up = Qnil;
void
set_specifier_fallback (Lisp_Object specifier, Lisp_Object fallback)
{
- struct Lisp_Specifier *sp = XSPECIFIER (specifier);
+ Lisp_Specifier *sp = XSPECIFIER (specifier);
assert (SPECIFIERP (fallback) ||
!NILP (Fvalid_inst_list_p (fallback, Fspecifier_type (specifier))));
if (SPECIFIERP (fallback))
Lisp_Object depth)
{
/* This function can GC */
- struct Lisp_Specifier *sp;
+ Lisp_Specifier *sp;
Lisp_Object device;
Lisp_Object rest;
int count = specpdl_depth ();
Lisp_Object device = Qnil;
Lisp_Object tag = Qnil;
struct device *d;
- struct Lisp_Specifier *sp;
+ Lisp_Specifier *sp;
sp = XSPECIFIER (specifier);
(specifier, domain, inst_list, default_))
{
Lisp_Object val = Qunbound;
- struct Lisp_Specifier *sp = XSPECIFIER (specifier);
+ Lisp_Specifier *sp = XSPECIFIER (specifier);
struct gcpro gcpro1;
Lisp_Object built_up_list = Qnil;
(specifier, matchspec, domain, inst_list, default_))
{
Lisp_Object val = Qunbound;
- struct Lisp_Specifier *sp = XSPECIFIER (specifier);
+ Lisp_Specifier *sp = XSPECIFIER (specifier);
struct gcpro gcpro1;
Lisp_Object built_up_list = Qnil;
(Lisp_Object specifier, struct frame *f,
Lisp_Object oldval))
{
- struct Lisp_Specifier *sp = XSPECIFIER (specifier);
+ Lisp_Specifier *sp = XSPECIFIER (specifier);
assert (!GHOST_SPECIFIER_P (sp));
if (!sp->caching)
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_SPECIFIER_H_
-#define _XEMACS_SPECIFIER_H_
+#ifndef INCLUDED_specifier_h_
+#define INCLUDED_specifier_h_
/*
MAGIC SPECIFIERS
/* type-specific extra data attached to a specifier */
char data[1];
};
+typedef struct Lisp_Specifier Lisp_Specifier;
-DECLARE_LRECORD (specifier, struct Lisp_Specifier);
-#define XSPECIFIER(x) XRECORD (x, specifier, struct Lisp_Specifier)
+DECLARE_LRECORD (specifier, Lisp_Specifier);
+#define XSPECIFIER(x) XRECORD (x, specifier, Lisp_Specifier)
#define XSETSPECIFIER(x, p) XSETRECORD (x, p, specifier)
#define SPECIFIERP(x) RECORDP (x, specifier)
#define CHECK_SPECIFIER(x) CHECK_RECORD (x, specifier)
#define SPECMETH(sp, m, args) (((sp)->methods->m##_method) args)
/* Call a void-returning specifier method, if it exists. */
-#define MAYBE_SPECMETH(sp, m, args) do { \
- struct Lisp_Specifier *maybe_specmeth_sp = (sp); \
- if (HAS_SPECMETH_P (maybe_specmeth_sp, m)) \
- SPECMETH (maybe_specmeth_sp, m, args); \
+#define MAYBE_SPECMETH(sp, m, args) do { \
+ Lisp_Specifier *maybe_specmeth_sp = (sp); \
+ if (HAS_SPECMETH_P (maybe_specmeth_sp, m)) \
+ SPECMETH (maybe_specmeth_sp, m, args); \
} while (0)
/***** Defining new specifier types *****/
-#define specifier_data_offset (offsetof(struct Lisp_Specifier, data))
+#define specifier_data_offset (offsetof (Lisp_Specifier, data))
extern const struct lrecord_description specifier_empty_extra_description[];
#ifdef ERROR_CHECK_TYPECHECK
#define DECLARE_SPECIFIER_TYPE(type) \
extern struct specifier_methods * type##_specifier_methods; \
INLINE struct type##_specifier * \
-error_check_##type##_specifier_data (struct Lisp_Specifier *sp); \
+error_check_##type##_specifier_data (Lisp_Specifier *sp); \
INLINE struct type##_specifier * \
-error_check_##type##_specifier_data (struct Lisp_Specifier *sp) \
+error_check_##type##_specifier_data (Lisp_Specifier *sp) \
{ \
if (SPECIFIERP (sp->magic_parent)) \
{ \
assert (SPECIFIER_TYPE_P (sp, type)); \
return (struct type##_specifier *) sp->data; \
} \
-INLINE struct Lisp_Specifier * \
+INLINE Lisp_Specifier * \
error_check_##type##_specifier_type (Lisp_Object obj); \
-INLINE struct Lisp_Specifier * \
+INLINE Lisp_Specifier * \
error_check_##type##_specifier_type (Lisp_Object obj) \
{ \
- struct Lisp_Specifier *sp = XSPECIFIER (obj); \
+ Lisp_Specifier *sp = XSPECIFIER (obj); \
assert (SPECIFIER_TYPE_P (sp, type)); \
return sp; \
} \
#define CHECK_DISPLAYTABLE_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, display_table)
#define CONCHECK_DISPLAYTABLE_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, display_table)
-#endif /* _XEMACS_SPECIFIER_H_ */
+#endif /* INCLUDED_specifier_h_ */
static Lisp_Object
mark_symbol (Lisp_Object obj)
{
- struct Lisp_Symbol *sym = XSYMBOL (obj);
+ Lisp_Symbol *sym = XSYMBOL (obj);
Lisp_Object pname;
mark_object (sym->value);
}
static const struct lrecord_description symbol_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Symbol, next), 5 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Symbol, next) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Symbol, name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Symbol, value) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Symbol, function) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Symbol, plist) },
{ XD_END }
};
DEFINE_BASIC_LRECORD_IMPLEMENTATION ("symbol", symbol,
mark_symbol, print_symbol, 0, 0, 0,
- symbol_description, struct Lisp_Symbol);
+ symbol_description, Lisp_Symbol);
\f
/**********************************************************************/
(string, obarray))
{
Lisp_Object object, *ptr;
- struct Lisp_Symbol *symbol;
+ Lisp_Symbol *symbol;
Bytecount len;
if (NILP (obarray)) obarray = Vobarray;
/* #### Bug! (intern-soft "nil") returns nil. Perhaps we should
add a DEFAULT-IF-NOT-FOUND arg, like in get. */
Lisp_Object tem;
- struct Lisp_String *string;
+ Lisp_String *string;
if (NILP (obarray)) obarray = Vobarray;
obarray = check_obarray (obarray);
(name, obarray))
{
Lisp_Object tem;
- struct Lisp_String *string;
+ Lisp_String *string;
int hash;
if (NILP (obarray)) obarray = Vobarray;
oblookup (Lisp_Object obarray, CONST Bufbyte *ptr, Bytecount size)
{
int hash, obsize;
- struct Lisp_Symbol *tail;
+ Lisp_Symbol *tail;
Lisp_Object bucket;
if (!VECTORP (obarray) ||
if (SYMBOLP (tail))
while (1)
{
- struct Lisp_Symbol *next;
+ Lisp_Symbol *next;
if ((*fn) (tail, arg))
return;
next = symbol_next (XSYMBOL (tail));
SYMVAL_CONST_SPECIFIER_FORWARD:
(declare with DEFVAR_SPECIFIER)
- Exactly like SYMVAL_CONST_OBJECT_FORWARD except that error message
- you get when attempting to set the value says to use
+ Exactly like SYMVAL_CONST_OBJECT_FORWARD except that the error
+ message you get when attempting to set the value says to use
`set-specifier' instead.
SYMVAL_CURRENT_BUFFER_FORWARD:
};
static const struct lrecord_description symbol_value_buffer_local_description[] = {
- { XD_LISP_OBJECT, offsetof(struct symbol_value_buffer_local, default_value), 1 },
- { XD_LO_RESET_NIL, offsetof(struct symbol_value_buffer_local, current_value), 3 },
+ { XD_LISP_OBJECT, offsetof (struct symbol_value_buffer_local, default_value) },
+ { XD_LO_RESET_NIL, offsetof (struct symbol_value_buffer_local, current_value), 3 },
{ XD_END }
};
static const struct lrecord_description symbol_value_lisp_magic_description[] = {
- { XD_LISP_OBJECT, offsetof(struct symbol_value_lisp_magic, handler), 2*MAGIC_HANDLER_MAX+1 },
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct symbol_value_lisp_magic, handler), 2*MAGIC_HANDLER_MAX+1 },
{ XD_END }
};
static const struct lrecord_description symbol_value_varalias_description[] = {
- { XD_LISP_OBJECT, offsetof(struct symbol_value_varalias, aliasee), 2 },
+ { XD_LISP_OBJECT, offsetof (struct symbol_value_varalias, aliasee) },
+ { XD_LISP_OBJECT, offsetof (struct symbol_value_varalias, shadowed) },
{ XD_END }
};
(symbol, newval))
{
REGISTER Lisp_Object valcontents;
- struct Lisp_Symbol *sym;
+ Lisp_Symbol *sym;
/* remember, we're called by Fmakunbound() as well */
CHECK_SYMBOL (symbol);
reject_constant_symbols (symbol, newval, 0,
UNBOUNDP (newval) ? Qmakunbound : Qset);
- retry_2:
-
switch (XSYMBOL_VALUE_MAGIC_TYPE (valcontents))
{
case SYMVAL_LISP_MAGIC:
{
- Lisp_Object retval;
-
if (UNBOUNDP (newval))
- retval = maybe_call_magic_handler (symbol, Qmakunbound, 0);
+ {
+ maybe_call_magic_handler (symbol, Qmakunbound, 0);
+ return XSYMBOL_VALUE_LISP_MAGIC (valcontents)->shadowed = Qunbound;
+ }
else
- retval = maybe_call_magic_handler (symbol, Qset, 1, newval);
- if (!UNBOUNDP (retval))
- return newval;
- valcontents = XSYMBOL_VALUE_LISP_MAGIC (valcontents)->shadowed;
- /* semi-change-o */
- goto retry_2;
+ {
+ maybe_call_magic_handler (symbol, Qset, 1, newval);
+ return XSYMBOL_VALUE_LISP_MAGIC (valcontents)->shadowed = newval;
+ }
}
case SYMVAL_VARALIAS:
Lisp_Object legerdemain;
struct symbol_value_lisp_magic *bfwd;
- assert (nargs >= 0 && nargs < 20);
+ assert (nargs >= 0 && nargs < countof (args));
legerdemain = XSYMBOL (sym)->value;
assert (SYMBOL_VALUE_LISP_MAGIC_P (legerdemain));
bfwd = XSYMBOL_VALUE_LISP_MAGIC (legerdemain);
void
init_symbols_once_early (void)
{
-#ifndef Qzero
- Qzero = make_int (0); /* Only used if Lisp_Object is a union type */
-#endif
-
-#ifndef Qnull_pointer
- /* C guarantees that Qnull_pointer will be initialized to all 0 bits,
- so the following is actually a no-op. */
- XSETOBJ (Qnull_pointer, (enum Lisp_Type) 0, 0);
-#endif
+ reinit_symbols_once_early ();
/* Bootstrapping problem: Qnil isn't set when make_string_nocopy is
called the first time. */
}
void
+reinit_symbols_once_early (void)
+{
+#ifndef Qzero
+ Qzero = make_int (0); /* Only used if Lisp_Object is a union type */
+#endif
+
+#ifndef Qnull_pointer
+ /* C guarantees that Qnull_pointer will be initialized to all 0 bits,
+ so the following is actually a no-op. */
+ XSETOBJ (Qnull_pointer, (enum Lisp_Type) 0, 0);
+#endif
+}
+
+void
defsymbol_nodump (Lisp_Object *location, CONST char *name)
{
*location = Fintern (make_string_nocopy ((CONST Bufbyte *) name,
* FIXME: Should newsubr be staticpro()'ed? I dont think so but I need
* a guru to check.
*/
-#define check_module_subr() \
-do { \
- if (initialized) { \
- struct Lisp_Subr *newsubr; \
- newsubr = (Lisp_Subr *)xmalloc(sizeof(struct Lisp_Subr)); \
- memcpy (newsubr, subr, sizeof(struct Lisp_Subr)); \
- subr->doc = (CONST char *)newsubr; \
- subr = newsubr; \
- } \
+#define check_module_subr() \
+do { \
+ if (initialized) { \
+ Lisp_Subr *newsubr = (Lisp_Subr *) xmalloc (sizeof (Lisp_Subr)); \
+ memcpy (newsubr, subr, sizeof (Lisp_Subr)); \
+ subr->doc = (CONST char *)newsubr; \
+ subr = newsubr; \
+ } \
} while (0)
#else /* ! HAVE_SHLIB */
#define check_module_subr()
/* Fsymbol_value checks whether XSYMBOL (sym)->value is one of these,
* and does weird magic stuff if so */
-#ifndef _XEMACS_SYMEVAL_H_
-#define _XEMACS_SYMEVAL_H_
+#ifndef INCLUDED_symeval_h_
+#define INCLUDED_symeval_h_
enum symbol_value_type
{
#define DEFVAR_CONST_BOOL(lname, c_location) \
DEFVAR_SYMVAL_FWD (lname, c_location, SYMVAL_CONST_BOOLEAN_FORWARD, 0)
#define DEFVAR_LISP_MAGIC(lname, c_location, magicfun) \
- DEFVAR_SYMVAL_FWD_OBJECT (lname, c_location, SYMVAL_OBJECT_FORWARD, magicfun);
+ DEFVAR_SYMVAL_FWD_OBJECT (lname, c_location, SYMVAL_OBJECT_FORWARD, magicfun)
#define DEFVAR_INT_MAGIC(lname, c_location, magicfun) \
- DEFVAR_SYMVAL_FWD (lname, c_location, SYMVAL_FIXNUM_FORWARD, magicfun);
+ DEFVAR_SYMVAL_FWD (lname, c_location, SYMVAL_FIXNUM_FORWARD, magicfun)
#define DEFVAR_BOOL_MAGIC(lname, c_location, magicfun) \
- DEFVAR_SYMVAL_FWD (lname, c_location, SYMVAL_BOOLEAN_FORWARD, magicfun);
+ DEFVAR_SYMVAL_FWD (lname, c_location, SYMVAL_BOOLEAN_FORWARD, magicfun)
-#endif /* _XEMACS_SYMEVAL_H_ */
+#endif /* INCLUDED_symeval_h_ */
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_SYMSINIT_H_
-#define _XEMACS_SYMSINIT_H_
+#ifndef INCLUDED_symsinit_h_
+#define INCLUDED_symsinit_h_
/* Earliest environment initializations (dump-time and run-time). */
void init_alloc_once_early (void);
void reinit_alloc_once_early (void);
void init_symbols_once_early (void);
+void reinit_symbols_once_early (void);
void init_errors_once_early (void);
void reinit_opaque_once_early (void);
void init_opaque_once_early (void);
void syms_of_glyphs_widget (void);
void syms_of_glyphs_mswindows (void);
void syms_of_glyphs (void);
+void syms_of_gui_mswindows (void);
void syms_of_gui_x (void);
void syms_of_gui (void);
void syms_of_gutter (void);
void syms_of_sunpro (void);
void syms_of_symbols (void);
void syms_of_syntax (void);
+void syms_of_tests (void);
void syms_of_toolbar (void);
void syms_of_tooltalk (void);
void syms_of_undo (void);
void syms_of_widget (void);
void syms_of_window (void);
-void syms_of_xselect (void);
+void syms_of_select_x (void);
void syms_of_eldap (void);
void syms_of_gpmevent (void);
void vars_of_mule_charset (void);
void vars_of_file_coding (void);
void vars_of_mule_wnn (void);
+void vars_of_nt (void);
void vars_of_ntproc (void);
void vars_of_objects (void);
void reinit_vars_of_objects (void);
void vars_of_sunpro (void);
void vars_of_symbols (void);
void vars_of_syntax (void);
+void vars_of_tests (void);
void vars_of_toolbar (void);
void vars_of_tooltalk (void);
void vars_of_undo (void);
void reinit_vars_of_undo (void);
void vars_of_window (void);
void reinit_vars_of_window (void);
-void vars_of_xselect (void);
-void reinit_vars_of_xselect (void);
+void vars_of_select_x (void);
+void reinit_vars_of_select_x (void);
void vars_of_eldap (void);
void vars_of_gpmevent (void);
void init_redisplay (void);
void init_sunpro (void);
-#endif /* _XEMACS_SYMSINIT_H_ */
+#endif /* INCLUDED_symsinit_h_ */
find_defun_start (struct buffer *buf, Bufpos pos)
{
Bufpos tem;
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
/* Use previous finding, if it's valid and applies to this inquiry. */
if (buf == find_start_buffer
*/
(ch, table))
{
- struct Lisp_Char_Table *mirrortab;
+ Lisp_Char_Table *mirrortab;
if (NILP(ch))
{
*/
(ch, table))
{
- struct Lisp_Char_Table *mirrortab;
+ Lisp_Char_Table *mirrortab;
int code;
CHECK_CHAR_COERCE_INT (ch);
scan_words (struct buffer *buf, Bufpos from, int count)
{
Bufpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
Emchar ch0, ch1;
enum syntaxcode code;
{
Emchar c;
enum syntaxcode code;
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
/* Look back, counting the parity of string-quotes,
and recording the comment-starters seen.
find_end_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
{
int c;
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
while (1)
{
enum syntaxcode code;
EMACS_INT count;
struct buffer *buf = decode_buffer (buffer, 0);
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
CHECK_INT (n);
count = XINT (n);
enum syntaxcode code;
int min_depth = depth; /* Err out if depth gets less than this. */
Lisp_Object syntaxtab = buf->syntax_table;
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
if (depth > 0) min_depth = 0;
enum syntaxcode code;
Bufpos beg = BUF_BEGV (buf);
int quoted = 0;
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
while (pos > beg
&& ((code = SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1)))
struct buffer *buf = decode_buffer (buffer, 0);
Bufpos beg = BUF_BEGV (buf);
Bufpos pos = BUF_PT (buf);
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
while (pos > beg && !char_quoted (buf, pos - 1)
&& (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1)) == Squote
Lisp_Object tem;
int mask; /* comment mask */
Lisp_Object syntaxtab = buf->syntax_table;
- struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
if (NILP (oldstate))
{
}
static void
-update_just_this_syntax_table (struct Lisp_Char_Table *ct)
+update_just_this_syntax_table (Lisp_Char_Table *ct)
{
struct chartab_range range;
struct cmst_arg arg;
one. */
void
-update_syntax_table (struct Lisp_Char_Table *ct)
+update_syntax_table (Lisp_Char_Table *ct)
{
/* Don't be stymied at startup. */
if (CHAR_TABLEP (Vstandard_syntax_table)
/* Synched up with: FSF 19.28. */
-#ifndef _XEMACS_SYNTAX_H_
-#define _XEMACS_SYNTAX_H_
+#ifndef INCLUDED_syntax_h_
+#define INCLUDED_syntax_h_
#include "chartab.h"
#define SYNTAX_CODE_UNSAFE(table, c) \
XINT (CHAR_TABLE_VALUE_UNSAFE (table, c))
-INLINE int SYNTAX_CODE (struct Lisp_Char_Table *table, Emchar c);
+INLINE int SYNTAX_CODE (Lisp_Char_Table *table, Emchar c);
INLINE int
-SYNTAX_CODE (struct Lisp_Char_Table *table, Emchar c)
+SYNTAX_CODE (Lisp_Char_Table *table, Emchar c)
{
return SYNTAX_CODE_UNSAFE (table, c);
}
#define SYNTAX_FROM_CODE(code) ((enum syntaxcode) ((code) & 0177))
#define SYNTAX(table, c) SYNTAX_FROM_CODE (SYNTAX_CODE (table, c))
-INLINE int WORD_SYNTAX_P (struct Lisp_Char_Table *table, Emchar c);
+INLINE int WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c);
INLINE int
-WORD_SYNTAX_P (struct Lisp_Char_Table *table, Emchar c)
+WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c)
{
return SYNTAX (table, c) == Sword;
}
extern int no_quit_in_re_search;
extern struct buffer *regex_emacs_buffer;
-void update_syntax_table (struct Lisp_Char_Table *ct);
+void update_syntax_table (Lisp_Char_Table *ct);
-#endif /* _XEMACS_SYNTAX_H_ */
+#endif /* INCLUDED_syntax_h_ */
#ifdef WINDOWSNT
#include <direct.h>
-#ifndef __MINGW32__
+#ifdef __MINGW32__
+#include <mingw32/process.h>
+#else
/* <process.h> should not conflict with "process.h", as per ANSI definition.
- This is not true though with visual c though. The trick below works with
- VC4.2b and with VC5.0. It assumes that VC is installed in a kind of
- standard way, so include files get to what/ever/path/include.
+ This is not true with visual c though. The trick below works with
+ VC4.2b, 5.0 and 6.0. It assumes that VC is installed in a kind of
+ standard way, so include path ends with /include.
Unfortunately, this must go before lisp.h, since process.h defines abort()
which will conflict with the macro defined in lisp.h
*/
#include <../include/process.h>
-#else
-#include <mingw32/process.h>
-#endif
+#endif /* __MINGW32__ */
#endif /* WINDOWSNT */
#include "lisp.h"
#ifdef WINDOWSNT
#include <sys/utime.h>
-#include <windows.h>
#include "ntheap.h"
#endif
"failure to obtain process exit value");
}
}
- if (pHandle != NULL && !CloseHandle(pHandle))
+ if (pHandle != NULL && !CloseHandle(pHandle))
{
warn_when_safe (Qprocess, Qwarning,
"failure to close unknown process");
#endif /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */
s.main.c_cc[VEOL] = _POSIX_VDISABLE;
#if defined (CBAUD)
- /* <mdiers> ### This is not portable. ###
+ /* <mdiers> #### This is not portable. ###
POSIX does not specify CBAUD, and 4.4BSD does not have it.
Instead, POSIX suggests to use cfset{i,o}speed().
[cf. D. Lewine, POSIX Programmer's Guide, Chapter 8: Terminal
#ifdef TCXONC
if (!TTY_FLAGS (con).flow_control) ioctl (input_fd, TCXONC, 1);
#endif
-#ifndef APOLLO
#ifdef TIOCSTART
if (!TTY_FLAGS (con).flow_control) ioctl (input_fd, TIOCSTART, 0);
#endif
-#endif
#if defined (HAVE_TERMIOS) || defined (HPUX9)
#ifdef TCOON
/* limits of text/data segments */
/************************************************************************/
-#ifndef CANNOT_DUMP
+#if !defined(CANNOT_DUMP) && !defined(PDUMP)
#define NEED_STARTS
#endif
*
*/
+#if !defined(HAVE_TEXT_START) && !defined(PDUMP)
+
#ifdef __cplusplus
extern "C" int _start (void);
#else
extern int _start (void);
#endif
-#ifndef HAVE_TEXT_START
char *
start_of_text (void)
{
#endif /* GOULD */
#endif /* TEXT_START */
}
-#endif /* not HAVE_TEXT_START */
+#endif /* !defined(HAVE_TEXT_START) && !defined(PDUMP) */
/*
* Return the address of the start of the data segment prior to
}
#endif /* NEED_STARTS (not CANNOT_DUMP or not SYSTEM_MALLOC) */
-#ifndef CANNOT_DUMP
+#if !defined(CANNOT_DUMP) && !defined(PDUMP)
/* Some systems that cannot dump also cannot implement these. */
/*
#endif
}
-#endif /* not CANNOT_DUMP */
+#endif /* !defined(CANNOT_DUMP) && !defined(PDUMP) */
\f
/************************************************************************/
{
#if defined (WINDOWSNT)
char hostname [MAX_COMPUTERNAME_LENGTH + 1];
- size_t size = sizeof(hostname);
+ size_t size = sizeof (hostname);
GetComputerName (hostname, &size);
Vsystem_name = build_string (hostname);
#elif !defined (HAVE_GETHOSTNAME)
# endif /* not CANNOT_DUMP */
if (!strchr (hostname, '.'))
{
+# if !(defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO))
struct hostent *hp = NULL;
int count;
-# ifdef TRY_AGAIN
+# ifdef TRY_AGAIN
for (count = 0; count < 10; count++)
{
h_errno = 0;
-# endif
+# endif
/* Some systems can't handle SIGALARM/SIGIO in gethostbyname(). */
stop_interrupts ();
hp = gethostbyname (hostname);
start_interrupts ();
-# ifdef TRY_AGAIN
+# ifdef TRY_AGAIN
if (! (hp == 0 && h_errno == TRY_AGAIN))
break;
Fsleep_for (make_int (1));
}
-# endif
+# endif
if (hp)
{
CONST char *fqdn = (CONST char *) hp->h_name;
hostname = (char *) alloca (strlen (fqdn) + 1);
strcpy (hostname, fqdn);
}
+# else /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
+ struct addrinfo hints, *res;
+
+ xzero (hints);
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = 0;
+ if (!getaddrinfo (hostname, NULL, &hints, &res))
+ {
+ hostname = (char *) alloca (strlen (res->ai_canonname) + 1);
+ strcpy (hostname, res->ai_canonname);
+
+ freeaddrinfo (res);
+ }
+# endif /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
}
# endif /* HAVE_SOCKETS */
Vsystem_name = build_string (hostname);
int i;
/* check the table for the OS error code */
- for (i = 0; i < sizeof(errtable)/sizeof(errtable[0]); ++i)
+ for (i = 0; i < countof (errtable); ++i)
{
if (win32_error == errtable[i].oscode)
{
/************************************************************************/
#define PATHNAME_CONVERT_OUT(path) \
- GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA ((CONST Bufbyte *) path, path)
+ TO_EXTERNAL_FORMAT (C_STRING, (path), C_STRING_ALLOCA, (path), Qfile_name);
/***************** low-level calls ****************/
mode = va_arg (ap, int);
va_end (ap);
- PATHNAME_CONVERT_OUT (path);
-#if defined (WINDOWSNT)
+#ifdef WINDOWSNT
/* Make all handles non-inheritable */
- return open (path, oflag | _O_NOINHERIT, mode);
-#elif defined (INTERRUPTIBLE_OPEN)
+ oflag |= _O_NOINHERIT;
+#endif
+
+#ifdef INTERRUPTIBLE_OPEN
{
int rtnval;
while ((rtnval = open (path, oflag, mode)) == -1
PATHNAME_CONVERT_OUT (nonreloc);
+#ifdef WINDOWSNT
+ /* Make all handles non-inheritable */
+ oflag |= _O_NOINHERIT;
+#endif
+
for (;;)
{
int rtnval = open (nonreloc, oflag, mode);
Dynarr_add_many (internal_DIRENTRY, (Bufbyte *) rtnval,
offsetof (DIRENTRY, d_name));
- internal_name =
- convert_from_external_format (external_name, external_len,
- &internal_len, FORMAT_FILENAME);
+ TO_INTERNAL_FORMAT (DATA, (external_name, external_len),
+ ALLOCA, (internal_name, internal_len),
+ Qfile_name);
Dynarr_add_many (internal_DIRENTRY, internal_name, internal_len);
Dynarr_add (internal_DIRENTRY, 0); /* zero-terminate */
/* Synched up with: FSF 19.30. Split out of sysdep.c/emacs.c. */
-#ifndef _XEMACS_SYSDEP_H_
-#define _XEMACS_SYSDEP_H_
+#ifndef INCLUDED_sysdep_h_
+#define INCLUDED_sysdep_h_
#include <setjmp.h>
+#ifndef WINDOWSNT
extern char **environ;
+#endif
int eight_bit_tty (struct device *d);
char *xrealpath(CONST char *path, char resolved_path []);
#endif
-#endif /* _XEMACS_SYSDEP_H_ */
+#endif /* INCLUDED_sysdep_h_ */
/* Synched up with: Not really in FSF. */
+#ifndef INCLUDED_sysdir_h_
+#define INCLUDED_sysdir_h_
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
# define sys_rmdir rmdir
#endif
+#endif /* INCLUDED_sysdir_h_ */
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-#ifndef _SYSDLL_H
-#define _SYSDLL_H
+#ifndef INCLUDED_sysdll_h_
+#define INCLUDED_sysdll_h_
#ifdef __cplusplus
extern "C" {
}
#endif
-#endif /* _SYSDLL_H */
+#endif /* INCLUDED_sysdll_h_ */
/* Synched up with: Not really in FSF. */
+#ifndef INCLUDED_sysfile_h_
+#define INCLUDED_sysfile_h_
+
#include <errno.h>
#ifndef WINDOWSNT
#if !defined (ENCAPSULATE_EXECVP) && defined (DONT_ENCAPSULATE)
# define sys_execvp execvp
#endif
+
+#endif /* INCLUDED_sysfile_h_ */
/* Synched up with: Not really in FSF. */
+#ifndef INCLUDED_sysfloat_h_
+#define INCLUDED_sysfloat_h_
+
/* Work around a problem that happens because math.h on hpux 7
defines two static variables--which, in Emacs, are not really static,
because `static' is defined as nothing. The problem is that they are
# define isnan(x) ((x) != (x))
#endif
+#endif /* INCLUDED_sysfloat_h_ */
/* Synched up with: Not really in FSF. */
+#ifndef INCLUDED_sysproc_h_
+#define INCLUDED_sysproc_h_
+
#ifdef HAVE_VFORK_H
# include <vfork.h>
#endif
/* Damn that local process.h! Instead we can define P_WAIT ourselves. */
#define P_WAIT 1
#endif
+
+#endif /* INCLUDED_sysproc_h_ */
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_SYSSIGNAL_H_
-#define _XEMACS_SYSSIGNAL_H_
+#ifndef INCLUDED_syssignal_h_
+#define INCLUDED_syssignal_h_
/* In the old world, one could not #include <signal.h> here. The party line
was that that header should always be #included before <config.h>, because
SIGTYPE memory_warning_signal (int sig);
#endif
-#ifdef _WIN32
+#ifdef WINDOWSNT
/* Prototypes for signal functions, see nt.c */
typedef void (__cdecl *msw_sighandler) (int);
msw_sighandler msw_sigset (int sig, msw_sighandler handler);
int msw_raise (int nsig);
#endif /* _WIN32 */
-#endif /* _XEMACS_SYSSIGNAL_H_ */
+#endif /* INCLUDED_syssignal_h_ */
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_SYSTIME_H_
-#define _XEMACS_SYSTIME_H_
+#ifndef INCLUDED_systime_h_
+#define INCLUDED_systime_h_
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
# include <utime.h>
#endif
-#ifdef HAVE_TZNAME
+#if defined(HAVE_TZNAME) && !defined(WINDOWSNT) && !defined(__CYGWIN32__)
#ifndef tzname /* For SGI. */
extern char *tzname[]; /* RS6000 and others want it this way. */
#endif
#endif /* WINDOWSNT */
-#endif /* _XEMACS_SYSTIME_H_ */
+#endif /* INCLUDED_systime_h_ */
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_SYSTTY_H_
-#define _XEMACS_SYSTTY_H_
+#ifndef INCLUDED_systty_h_
+#define INCLUDED_systty_h_
#ifdef HAVE_TERMIOS
# define HAVE_TCATTR
/* ----------------------------------------------------- */
-#ifdef APOLLO
-#undef TIOCSTART
-#endif
-
#if defined (XENIX) || defined (BROKEN_TIOCGETC)
#undef TIOCGETC /* Avoid confusing some conditionals that test this. */
#endif
#endif /* not def HAVE_TERMIO */
#endif /* not def HAVE_TERMIOS */
-#endif /* _XEMACS_SYSTTY_H_ */
+#endif /* INCLUDED_systty_h_ */
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* Cleanup by Martin Buchholz for Autoconf 2 (see the Autoconf Manual) */
+#ifndef INCLUDED_syswait_h_
+#define INCLUDED_syswait_h_
#include <sys/types.h>
#define WRETCODE(s) ((s) >> 8)
#endif
+#endif /* INCLUDED_syswait_h_ */
#include "elhash.h"
#include "insdel.h"
#include "lstream.h"
+#include "opaque.h"
#ifdef MULE
#include "mule-ccl.h"
#include "chartab.h"
This describes a permutation of the possible coding categories. */
int coding_category_by_priority[CODING_CATEGORY_LAST + 1];
-#ifndef UTF2000
+#if defined(MULE) && !defined(UTF2000)
Lisp_Object ucs_to_mule_table[65536];
#endif
} *fcd;
static const struct lrecord_description fcd_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct file_coding_dump, coding_category_system), CODING_CATEGORY_LAST + 1 },
-#ifndef UTF2000
- { XD_LISP_OBJECT, offsetof(struct file_coding_dump, ucs_to_mule_table), 65536 },
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct file_coding_dump, coding_category_system), CODING_CATEGORY_LAST + 1 },
+#if defined(MULE) && !defined(UTF2000)
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct file_coding_dump, ucs_to_mule_table), 65536 },
#endif
{ XD_END }
};
static const struct struct_description fcd_description = {
- sizeof(struct file_coding_dump),
+ sizeof (struct file_coding_dump),
fcd_description_1
};
Lisp_Object Qforce_g2_on_output, Qforce_g3_on_output;
Lisp_Object Qno_iso6429;
Lisp_Object Qinput_charset_conversion, Qoutput_charset_conversion;
-Lisp_Object Qctext, Qescape_quoted;
+Lisp_Object Qescape_quoted;
Lisp_Object Qshort, Qno_ascii_eol, Qno_ascii_cntl, Qseven, Qlock_shift;
#endif
#ifdef UTF2000
} codesys_prop_dynarr;
static const struct lrecord_description codesys_prop_description_1[] = {
- { XD_LISP_OBJECT, offsetof(codesys_prop, sym), 1 },
+ { XD_LISP_OBJECT, offsetof (codesys_prop, sym) },
{ XD_END }
};
static const struct struct_description codesys_prop_description = {
- sizeof(codesys_prop),
+ sizeof (codesys_prop),
codesys_prop_description_1
};
static const struct lrecord_description codesys_prop_dynarr_description_1[] = {
- XD_DYNARR_DESC(codesys_prop_dynarr, &codesys_prop_description),
+ XD_DYNARR_DESC (codesys_prop_dynarr, &codesys_prop_description),
{ XD_END }
};
static const struct struct_description codesys_prop_dynarr_description = {
- sizeof(codesys_prop_dynarr),
+ sizeof (codesys_prop_dynarr),
codesys_prop_dynarr_description_1
};
#ifdef MULE
static const struct lrecord_description ccs_description_1[] = {
- { XD_LISP_OBJECT, offsetof(charset_conversion_spec, from_charset), 2 },
+ { XD_LISP_OBJECT, offsetof (charset_conversion_spec, from_charset) },
+ { XD_LISP_OBJECT, offsetof (charset_conversion_spec, to_charset) },
{ XD_END }
};
static const struct struct_description ccs_description = {
- sizeof(charset_conversion_spec),
+ sizeof (charset_conversion_spec),
ccs_description_1
};
static const struct lrecord_description ccsd_description_1[] = {
- XD_DYNARR_DESC(charset_conversion_spec_dynarr, &ccs_description),
+ XD_DYNARR_DESC (charset_conversion_spec_dynarr, &ccs_description),
{ XD_END }
};
static const struct struct_description ccsd_description = {
- sizeof(charset_conversion_spec_dynarr),
+ sizeof (charset_conversion_spec_dynarr),
ccsd_description_1
};
#endif
static const struct lrecord_description coding_system_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, name), 2 },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, mnemonic), 3 },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, eol_lf), 3 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, doc_string) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, mnemonic) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, post_read_conversion) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, pre_write_conversion) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, eol_lf) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, eol_crlf) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, eol_cr) },
#ifdef MULE
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, iso2022.initial_charset), 4 },
- { XD_STRUCT_PTR, offsetof(struct Lisp_Coding_System, iso2022.input_conv), 1, &ccsd_description },
- { XD_STRUCT_PTR, offsetof(struct Lisp_Coding_System, iso2022.output_conv), 1, &ccsd_description },
- { XD_LISP_OBJECT, offsetof(struct Lisp_Coding_System, ccl.decode), 2 },
+ { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Coding_System, iso2022.initial_charset), 4 },
+ { XD_STRUCT_PTR, offsetof (Lisp_Coding_System, iso2022.input_conv), 1, &ccsd_description },
+ { XD_STRUCT_PTR, offsetof (Lisp_Coding_System, iso2022.output_conv), 1, &ccsd_description },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, ccl.decode) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Coding_System, ccl.encode) },
#endif
{ XD_END }
};
mark_coding_system, print_coding_system,
finalize_coding_system,
0, 0, coding_system_description,
- struct Lisp_Coding_System);
+ Lisp_Coding_System);
static Lisp_Object
mark_coding_system (Lisp_Object obj)
}
}
-static enum eol_type
+static eol_type_t
symbol_to_eol_type (Lisp_Object symbol)
{
CHECK_SYMBOL (symbol);
}
static Lisp_Object
-eol_type_to_symbol (enum eol_type type)
+eol_type_to_symbol (eol_type_t type)
{
switch (type)
{
*/
(coding_system_or_name))
{
- if (CODING_SYSTEMP (coding_system_or_name))
- return coding_system_or_name;
-
if (NILP (coding_system_or_name))
coding_system_or_name = Qbinary;
+ else if (CODING_SYSTEMP (coding_system_or_name))
+ return coding_system_or_name;
else
CHECK_SYMBOL (coding_system_or_name);
- return Fgethash (coding_system_or_name, Vcoding_system_hash_table, Qnil);
+ while (1)
+ {
+ coding_system_or_name =
+ Fgethash (coding_system_or_name, Vcoding_system_hash_table, Qnil);
+
+ if (CODING_SYSTEMP (coding_system_or_name) || NILP (coding_system_or_name))
+ return coding_system_or_name;
+ }
}
DEFUN ("get-coding-system", Fget_coding_system, 1, 1, 0, /*
return new_coding_system;
}
+DEFUN ("coding-system-canonical-name-p", Fcoding_system_canonical_name_p, 1, 1, 0, /*
+Return t if OBJECT names a coding system, and is not a coding system alias.
+*/
+ (object))
+{
+ return CODING_SYSTEMP (Fgethash (object, Vcoding_system_hash_table, Qnil))
+ ? Qt : Qnil;
+}
+
+DEFUN ("coding-system-alias-p", Fcoding_system_alias_p, 1, 1, 0, /*
+Return t if OBJECT is a coding system alias.
+All coding system aliases are created by `define-coding-system-alias'.
+*/
+ (object))
+{
+ return SYMBOLP (Fgethash (object, Vcoding_system_hash_table, Qzero))
+ ? Qt : Qnil;
+}
+
+DEFUN ("coding-system-aliasee", Fcoding_system_aliasee, 1, 1, 0, /*
+Return the coding-system symbol for which symbol ALIAS is an alias.
+*/
+ (alias))
+{
+ Lisp_Object aliasee = Fgethash (alias, Vcoding_system_hash_table, Qnil);
+ if (SYMBOLP (aliasee))
+ return aliasee;
+ else
+ signal_simple_error ("Symbol is not a coding system alias", alias);
+}
+
+static Lisp_Object
+append_suffix_to_symbol (Lisp_Object symbol, const char *ascii_string)
+{
+ return Fintern (concat2 (Fsymbol_name (symbol), build_string (ascii_string)),
+ Qnil);
+}
+
+/* A maphash function, for removing dangling coding system aliases. */
+static int
+dangling_coding_system_alias_p (Lisp_Object alias,
+ Lisp_Object aliasee,
+ void *dangling_aliases)
+{
+ if (SYMBOLP (aliasee)
+ && NILP (Fgethash (aliasee, Vcoding_system_hash_table, Qnil)))
+ {
+ (*(int *) dangling_aliases)++;
+ return 1;
+ }
+ else
+ return 0;
+}
+
DEFUN ("define-coding-system-alias", Fdefine_coding_system_alias, 2, 2, 0, /*
-Define symbol ALIAS as an alias for coding system CODING-SYSTEM.
+Define symbol ALIAS as an alias for coding system ALIASEE.
+
+You can use this function to redefine an alias that has already been defined,
+but you cannot redefine a name which is the canonical name for a coding system.
+\(a canonical name of a coding system is what is returned when you call
+`coding-system-name' on a coding system).
+
+ALIASEE itself can be an alias, which allows you to define nested aliases.
+
+You are forbidden, however, from creating alias loops or `dangling' aliases.
+These will be detected, and an error will be signaled if you attempt to do so.
+
+If ALIASEE is nil, then ALIAS will simply be undefined.
+
+See also `coding-system-alias-p', `coding-system-aliasee',
+and `coding-system-canonical-name-p'.
*/
- (alias, coding_system))
+ (alias, aliasee))
{
+ Lisp_Object real_coding_system, probe;
+
CHECK_SYMBOL (alias);
- if (!NILP (Ffind_coding_system (alias)))
- signal_simple_error ("Symbol already names a coding system", alias);
- coding_system = Fget_coding_system (coding_system);
- Fputhash (alias, coding_system, Vcoding_system_hash_table);
- /* Set up aliases for subsidiaries. */
- if (XCODING_SYSTEM_EOL_TYPE (coding_system) == EOL_AUTODETECT)
+ if (!NILP (Fcoding_system_canonical_name_p (alias)))
+ signal_simple_error
+ ("Symbol is the canonical name of a coding system and cannot be redefined",
+ alias);
+
+ if (NILP (aliasee))
+ {
+ Lisp_Object subsidiary_unix = append_suffix_to_symbol (alias, "-unix");
+ Lisp_Object subsidiary_dos = append_suffix_to_symbol (alias, "-dos");
+ Lisp_Object subsidiary_mac = append_suffix_to_symbol (alias, "-mac");
+
+ Fremhash (alias, Vcoding_system_hash_table);
+
+ /* Undefine subsidiary aliases,
+ presumably created by a previous call to this function */
+ if (! NILP (Fcoding_system_alias_p (subsidiary_unix)) &&
+ ! NILP (Fcoding_system_alias_p (subsidiary_dos)) &&
+ ! NILP (Fcoding_system_alias_p (subsidiary_mac)))
+ {
+ Fdefine_coding_system_alias (subsidiary_unix, Qnil);
+ Fdefine_coding_system_alias (subsidiary_dos, Qnil);
+ Fdefine_coding_system_alias (subsidiary_mac, Qnil);
+ }
+
+ /* Undefine dangling coding system aliases. */
+ {
+ int dangling_aliases;
+
+ do {
+ dangling_aliases = 0;
+ elisp_map_remhash (dangling_coding_system_alias_p,
+ Vcoding_system_hash_table,
+ &dangling_aliases);
+ } while (dangling_aliases > 0);
+ }
+
+ return Qnil;
+ }
+
+ if (CODING_SYSTEMP (aliasee))
+ aliasee = XCODING_SYSTEM_NAME (aliasee);
+
+ /* Checks that aliasee names a coding-system */
+ real_coding_system = Fget_coding_system (aliasee);
+
+ /* Check for coding system alias loops */
+ if (EQ (alias, aliasee))
+ alias_loop: signal_simple_error_2
+ ("Attempt to create a coding system alias loop", alias, aliasee);
+
+ for (probe = aliasee;
+ SYMBOLP (probe);
+ probe = Fgethash (probe, Vcoding_system_hash_table, Qzero))
{
- Lisp_Object str;
- XSETSTRING (str, symbol_name (XSYMBOL (alias)));
-#define FROB(type, name) \
- do { \
- Lisp_Object subsidiary = XCODING_SYSTEM_EOL_##type (coding_system); \
- if (!NILP (subsidiary)) \
- Fdefine_coding_system_alias \
- (Fintern (concat2 (str, build_string (name)), Qnil), subsidiary); \
- } while (0)
- FROB (LF, "-unix");
- FROB (CRLF, "-dos");
- FROB (CR, "-mac");
-#undef FROB
+ if (EQ (probe, alias))
+ goto alias_loop;
}
+
+ Fputhash (alias, aliasee, Vcoding_system_hash_table);
+
+ /* Set up aliases for subsidiaries.
+ #### There must be a better way to handle subsidiary coding systems. */
+ {
+ static const char *suffixes[] = { "-unix", "-dos", "-mac" };
+ int i;
+ for (i = 0; i < countof (suffixes); i++)
+ {
+ Lisp_Object alias_subsidiary =
+ append_suffix_to_symbol (alias, suffixes[i]);
+ Lisp_Object aliasee_subsidiary =
+ append_suffix_to_symbol (aliasee, suffixes[i]);
+
+ if (! NILP (Ffind_coding_system (aliasee_subsidiary)))
+ Fdefine_coding_system_alias (alias_subsidiary, aliasee_subsidiary);
+ }
+ }
/* FSF return value is a vector of [ALIAS-unix ALIAS-dos ALIAS-mac],
but it doesn't look intentional, so I'd rather return something
meaningful or nothing at all. */
}
static Lisp_Object
-subsidiary_coding_system (Lisp_Object coding_system, enum eol_type type)
+subsidiary_coding_system (Lisp_Object coding_system, eol_type_t type)
{
Lisp_Coding_System *cs = XCODING_SYSTEM (coding_system);
Lisp_Object new_coding_system;
struct detection_state
{
- enum eol_type eol_type;
+ eol_type_t eol_type;
int seen_non_ascii;
int mask;
#ifdef MULE
return (mask & (mask - 1)) == 0;
}
-static enum eol_type
+static eol_type_t
detect_eol_type (struct detection_state *st, CONST unsigned char *src,
unsigned int n)
{
void
determine_real_coding_system (Lstream *stream, Lisp_Object *codesys_in_out,
- enum eol_type *eol_type_in_out)
+ eol_type_t *eol_type_in_out)
{
struct detection_state decst;
} \
} while (0)
+INLINE void DECODE_ADD_UCS_CHAR(Emchar c, unsigned_char_dynarr* dst);
INLINE void
DECODE_ADD_UCS_CHAR(Emchar c, unsigned_char_dynarr* dst)
{
EOL type stored in CODESYS because the latter might indicate
automatic EOL-type detection while the former will always
indicate a particular EOL type. */
- enum eol_type eol_type;
+ eol_type_t eol_type;
#ifdef MULE
/* Additional ISO2022 information. We define the structure above
because it's also needed by the detection routines. */
#ifdef UTF2000
extern Lisp_Object Vcharacter_composition_table;
+INLINE void COMPOSE_FLUSH_CHARS (struct decoding_stream *str,
+ unsigned_char_dynarr* dst);
INLINE void
COMPOSE_FLUSH_CHARS (struct decoding_stream *str, unsigned_char_dynarr* dst)
{
str->combining_table = Qnil;
}
+void COMPOSE_ADD_CHAR(struct decoding_stream *str, Emchar character,
+ unsigned_char_dynarr* dst);
void
COMPOSE_ADD_CHAR(struct decoding_stream *str,
Emchar character, unsigned_char_dynarr* dst)
}
\f
-/************************************************************************/
-/* Simple internal/external functions */
-/************************************************************************/
-
-static Extbyte_dynarr *conversion_out_dynarr;
-static Bufbyte_dynarr *conversion_in_dynarr;
-
-/* Determine coding system from coding format */
-
-/* #### not correct for all values of `fmt'! */
-static Lisp_Object
-external_data_format_to_coding_system (enum external_data_format fmt)
-{
- switch (fmt)
- {
- case FORMAT_FILENAME:
- case FORMAT_TERMINAL:
- if (EQ (Vfile_name_coding_system, Qnil) ||
- EQ (Vfile_name_coding_system, Qbinary))
- return Qnil;
- else
- return Fget_coding_system (Vfile_name_coding_system);
-#ifdef MULE
- case FORMAT_CTEXT:
- return Fget_coding_system (Qctext);
-#endif
- default:
- return Qnil;
- }
-}
-
-Extbyte *
-convert_to_external_format (CONST Bufbyte *ptr,
- Bytecount len,
- Extcount *len_out,
- enum external_data_format fmt)
-{
- Lisp_Object coding_system = external_data_format_to_coding_system (fmt);
-
- if (!conversion_out_dynarr)
- conversion_out_dynarr = Dynarr_new (Extbyte);
- else
- Dynarr_reset (conversion_out_dynarr);
-
- if (NILP (coding_system))
- {
- CONST Bufbyte *end = ptr + len;
-
- for (; ptr < end;)
- {
-#ifdef UTF2000
- Bufbyte c =
- (*ptr < 0xc0) ? *ptr :
- ((*ptr & 0x1f) << 6) | (*(ptr+1) & 0x3f);
-#else
- Bufbyte c =
- (BYTE_ASCII_P (*ptr)) ? *ptr :
- (*ptr == LEADING_BYTE_CONTROL_1) ? (*(ptr+1) - 0x20) :
- (*ptr == LEADING_BYTE_LATIN_ISO8859_1) ? (*(ptr+1)) :
- '~';
-#endif
- Dynarr_add (conversion_out_dynarr, (Extbyte) c);
- INC_CHARPTR (ptr);
- }
-#ifdef ERROR_CHECK_BUFPOS
- assert (ptr == end);
-#endif
- }
- else
- {
- Lisp_Object instream, outstream, da_outstream;
- Lstream *istr, *ostr;
- struct gcpro gcpro1, gcpro2, gcpro3;
- char tempbuf[1024]; /* some random amount */
-
- instream = make_fixed_buffer_input_stream ((unsigned char *) ptr, len);
- da_outstream = make_dynarr_output_stream
- ((unsigned_char_dynarr *) conversion_out_dynarr);
- outstream =
- make_encoding_output_stream (XLSTREAM (da_outstream), coding_system);
- istr = XLSTREAM (instream);
- ostr = XLSTREAM (outstream);
- GCPRO3 (instream, outstream, da_outstream);
- while (1)
- {
- int size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
- if (!size_in_bytes)
- break;
- Lstream_write (ostr, tempbuf, size_in_bytes);
- }
- Lstream_close (istr);
- Lstream_close (ostr);
- UNGCPRO;
- Lstream_delete (istr);
- Lstream_delete (ostr);
- Lstream_delete (XLSTREAM (da_outstream));
- }
-
- *len_out = Dynarr_length (conversion_out_dynarr);
- Dynarr_add (conversion_out_dynarr, 0); /* remember to zero-terminate! */
- return Dynarr_atp (conversion_out_dynarr, 0);
-}
-
-Bufbyte *
-convert_from_external_format (CONST Extbyte *ptr,
- Extcount len,
- Bytecount *len_out,
- enum external_data_format fmt)
-{
- Lisp_Object coding_system = external_data_format_to_coding_system (fmt);
-
- if (!conversion_in_dynarr)
- conversion_in_dynarr = Dynarr_new (Bufbyte);
- else
- Dynarr_reset (conversion_in_dynarr);
-
- if (NILP (coding_system))
- {
- CONST Extbyte *end = ptr + len;
- for (; ptr < end; ptr++)
- {
- Extbyte c = *ptr;
- DECODE_ADD_BINARY_CHAR (c, conversion_in_dynarr);
- }
- }
- else
- {
- Lisp_Object instream, outstream, da_outstream;
- Lstream *istr, *ostr;
- struct gcpro gcpro1, gcpro2, gcpro3;
- char tempbuf[1024]; /* some random amount */
-
- instream = make_fixed_buffer_input_stream ((unsigned char *) ptr, len);
- da_outstream = make_dynarr_output_stream
- ((unsigned_char_dynarr *) conversion_in_dynarr);
- outstream =
- make_decoding_output_stream (XLSTREAM (da_outstream), coding_system);
- istr = XLSTREAM (instream);
- ostr = XLSTREAM (outstream);
- GCPRO3 (instream, outstream, da_outstream);
- while (1)
- {
- ssize_t size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
- if (!size_in_bytes)
- break;
- Lstream_write (ostr, tempbuf, size_in_bytes);
- }
- Lstream_close (istr);
- Lstream_close (ostr);
- UNGCPRO;
- Lstream_delete (istr);
- Lstream_delete (ostr);
- Lstream_delete (XLSTREAM (da_outstream));
- }
-
- *len_out = Dynarr_length (conversion_in_dynarr);
- Dynarr_add (conversion_in_dynarr, 0); /* remember to zero-terminate! */
- return Dynarr_atp (conversion_in_dynarr, 0);
-}
-
-\f
/************************************************************************/
/* Initialization */
/************************************************************************/
DEFSUBR (Fcoding_system_name);
DEFSUBR (Fmake_coding_system);
DEFSUBR (Fcopy_coding_system);
+ DEFSUBR (Fcoding_system_canonical_name_p);
+ DEFSUBR (Fcoding_system_alias_p);
+ DEFSUBR (Fcoding_system_aliasee);
DEFSUBR (Fdefine_coding_system_alias);
DEFSUBR (Fsubsidiary_coding_system);
defsymbol (&Qdecode, "decode");
#ifdef MULE
- defsymbol (&Qctext, "ctext");
defsymbol (&coding_category_symbol[CODING_CATEGORY_SHIFT_JIS],
"shift-jis");
defsymbol (&coding_category_symbol[CODING_CATEGORY_BIG5],
Vterminal_coding_system = Qnil;
DEFVAR_LISP ("coding-system-for-read", &Vcoding_system_for_read /*
-Overriding coding system used when writing a file or process.
-You should *bind* this, not set it. If this is non-nil, it specifies
-the coding system that will be used when a file or process is read
-in, and overrides `buffer-file-coding-system-for-read',
+Overriding coding system used when reading from a file or process.
+You should bind this variable with `let', but do not set it globally.
+If this is non-nil, it specifies the coding system that will be used
+to decode input on read operations, such as from a file or process.
+It overrides `buffer-file-coding-system-for-read',
`insert-file-contents-pre-hook', etc. Use those variables instead of
-this one for permanent changes to the environment.
-*/ );
+this one for permanent changes to the environment. */ );
Vcoding_system_for_read = Qnil;
DEFVAR_LISP ("coding-system-for-write",
&Vcoding_system_for_write /*
-Overriding coding system used when writing a file or process.
-You should *bind* this, not set it. If this is non-nil, it specifies
-the coding system that will be used when a file or process is wrote
-in, and overrides `buffer-file-coding-system',
-`write-region-pre-hook', etc. Use those variables instead of this one
-for permanent changes to the environment.
-*/ );
+Overriding coding system used when writing to a file or process.
+You should bind this variable with `let', but do not set it globally.
+If this is non-nil, it specifies the coding system that will be used
+to encode output for write operations, such as to a file or process.
+It overrides `buffer-file-coding-system', `write-region-pre-hook', etc.
+Use those variables instead of this one for permanent changes to the
+environment. */ );
Vcoding_system_for_write = Qnil;
DEFVAR_LISP ("file-name-coding-system", &Vfile_name_coding_system /*
Fdefine_coding_system_alias (Qno_conversion, Qraw_text);
+ Fdefine_coding_system_alias (Qfile_name, Qbinary);
+
+ Fdefine_coding_system_alias (Qterminal, Qbinary);
+ Fdefine_coding_system_alias (Qkeyboard, Qbinary);
+
/* Need this for bootstrapping */
fcd->coding_category_system[CODING_CATEGORY_NO_CONVERSION] =
Fget_coding_system (Qraw_text);
fcd->coding_category_system[CODING_CATEGORY_UTF8]
= Fget_coding_system (Qutf8);
#endif
+
+#if defined(MULE) && !defined(UTF2000)
+ {
+ unsigned int i;
+
+ for (i = 0; i < 65536; i++)
+ fcd->ucs_to_mule_table[i] = Qnil;
+ }
+ staticpro (&mule_to_ucs_table);
+ mule_to_ucs_table = Fmake_char_table(Qgeneric);
+#endif /* defined(MULE) && !defined(UTF2000) */
}
if (IMAGE_INSTANCEP (instance))
{
- struct Lisp_Image_Instance* p = XIMAGE_INSTANCE (instance);
+ Lisp_Image_Instance* p = XIMAGE_INSTANCE (instance);
if (IMAGE_INSTANCE_PIXMAP_TYPE_P (p))
{
}
/* map toolbar hwnd to pos*/
-int mswindows_find_toolbar_pos(struct frame* f, HWND ctrl)
+static int mswindows_find_toolbar_pos(struct frame* f, HWND ctrl)
{
int id = GetDlgCtrlID(ctrl);
return id ? id - TOOLBAR_ID_BIAS : -1;
GC top_shadow_gc, bottom_shadow_gc, background_gc;
Lisp_Object instance, frame, window, glyph;
struct toolbar_button *tb = XTOOLBAR_BUTTON (button);
- struct Lisp_Image_Instance *p;
+ Lisp_Image_Instance *p;
struct window *w;
int vertical = tb->vertical;
int border_width = tb->border_width;
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_TOOLBAR_H_
-#define _XEMACS_TOOLBAR_H_
+#ifndef INCLUDED_toolbar_h_
+#define INCLUDED_toolbar_h_
#ifdef HAVE_TOOLBARS
#endif /* HAVE_TOOLBARS */
-#endif /* _XEMACS_TOOLBAR_H_ */
+#endif /* INCLUDED_toolbar_h_ */
print_tooltalk_message (Lisp_Object obj, Lisp_Object printcharfun,
int escapeflag)
{
- struct Lisp_Tooltalk_Message *p = XTOOLTALK_MESSAGE (obj);
+ Lisp_Tooltalk_Message *p = XTOOLTALK_MESSAGE (obj);
char buf[200];
DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message,
mark_tooltalk_message, print_tooltalk_message,
0, 0, 0, 0,
- struct Lisp_Tooltalk_Message);
+ Lisp_Tooltalk_Message);
\f
static Lisp_Object
make_tooltalk_message (Tt_message m)
{
Lisp_Object val;
- struct Lisp_Tooltalk_Message *msg =
- alloc_lcrecord_type (struct Lisp_Tooltalk_Message,
- &lrecord_tooltalk_message);
+ Lisp_Tooltalk_Message *msg =
+ alloc_lcrecord_type (Lisp_Tooltalk_Message, &lrecord_tooltalk_message);
msg->m = m;
msg->callback = Qnil;
print_tooltalk_pattern (Lisp_Object obj, Lisp_Object printcharfun,
int escapeflag)
{
- struct Lisp_Tooltalk_Pattern *p = XTOOLTALK_PATTERN (obj);
+ Lisp_Tooltalk_Pattern *p = XTOOLTALK_PATTERN (obj);
char buf[200];
DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
mark_tooltalk_pattern, print_tooltalk_pattern,
0, 0, 0, 0,
- struct Lisp_Tooltalk_Pattern);
+ Lisp_Tooltalk_Pattern);
\f
static Lisp_Object
make_tooltalk_pattern (Tt_pattern p)
{
- struct Lisp_Tooltalk_Pattern *pat =
- alloc_lcrecord_type (struct Lisp_Tooltalk_Pattern,
- &lrecord_tooltalk_pattern);
+ Lisp_Tooltalk_Pattern *pat =
+ alloc_lcrecord_type (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern);
Lisp_Object val;
pat->p = p;
{
Tt_message m = unbox_tooltalk_message (message_);
int n = 0;
+ Tt_status (*fun_str) (Tt_message, const char *) = 0;
CHECK_SYMBOL (attribute);
+
if (EQ (attribute, (Qtt_arg_bval)) ||
EQ (attribute, (Qtt_arg_ival)) ||
EQ (attribute, (Qtt_arg_val)))
if (!VALID_TOOLTALK_MESSAGEP (m))
return Qnil;
- else if (EQ (attribute, Qtt_address))
+ if (EQ (attribute, Qtt_address))
{
CHECK_TOOLTALK_CONSTANT (value);
tt_message_address_set (m, (Tt_address) tooltalk_constant_value (value));
tt_message_disposition_set (m, ((Tt_disposition)
tooltalk_constant_value (value)));
}
- else if (EQ (attribute, Qtt_file))
+ else if (EQ (attribute, Qtt_scope))
{
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_file_set (m, value_ext);
+ CHECK_TOOLTALK_CONSTANT (value);
+ tt_message_scope_set (m, (Tt_scope) tooltalk_constant_value (value));
}
+ else if (EQ (attribute, Qtt_file))
+ fun_str = tt_message_file_set;
else if (EQ (attribute, Qtt_handler_ptype))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_handler_ptype_set (m, value_ext);
- }
+ fun_str = tt_message_handler_ptype_set;
else if (EQ (attribute, Qtt_handler))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_handler_set (m, value_ext);
- }
+ fun_str = tt_message_handler_set;
else if (EQ (attribute, Qtt_object))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_object_set (m, value_ext);
- }
+ fun_str = tt_message_object_set;
else if (EQ (attribute, Qtt_op))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_op_set (m, value_ext);
- }
+ fun_str = tt_message_op_set;
else if (EQ (attribute, Qtt_otype))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_otype_set (m, value_ext);
- }
- else if (EQ (attribute, Qtt_scope))
- {
- CHECK_TOOLTALK_CONSTANT (value);
- tt_message_scope_set (m, (Tt_scope) tooltalk_constant_value (value));
- }
+ fun_str = tt_message_otype_set;
else if (EQ (attribute, Qtt_sender_ptype))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_sender_ptype_set (m, value_ext);
- }
+ fun_str = tt_message_sender_ptype_set;
else if (EQ (attribute, Qtt_session))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_session_set (m, value_ext);
- }
+ fun_str = tt_message_session_set;
+ else if (EQ (attribute, Qtt_status_string))
+ fun_str = tt_message_status_string_set;
else if (EQ (attribute, Qtt_arg_bval))
{
Extbyte *value_ext;
Extcount value_ext_len;
CHECK_STRING (value);
- GET_STRING_OS_DATA_ALLOCA (value, value_ext, value_ext_len);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value,
+ ALLOCA, (value_ext, value_ext_len),
+ Qnative);
tt_message_arg_bval_set (m, n, value_ext, value_ext_len);
}
else if (EQ (attribute, Qtt_arg_ival))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_message_arg_val_set (m, n, value_ext);
}
else if (EQ (attribute, Qtt_status))
CHECK_INT (value);
tt_message_status_set (m, XINT (value));
}
- else if (EQ (attribute, Qtt_status_string))
- {
- CONST char *value_ext;
- CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
- tt_message_status_string_set (m, value_ext);
- }
else if (EQ (attribute, Qtt_callback))
{
CHECK_SYMBOL (value);
else
signal_simple_error ("Invalid value for `set-tooltalk-message-attribute'",
attribute);
+
+ if (fun_str)
+ {
+ CONST char *value_ext;
+ CHECK_STRING (value);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
+ (*fun_str) (m, value_ext);
+ }
+
return Qnil;
}
{
CONST char *vtype_ext;
- GET_C_STRING_OS_DATA_ALLOCA (vtype, vtype_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, vtype, C_STRING_ALLOCA, vtype_ext, Qnative);
if (NILP (value))
tt_message_arg_add (m, n, vtype_ext, NULL);
else if (STRINGP (value))
{
CONST char *value_ext;
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_message_arg_add (m, n, vtype_ext, value_ext);
}
else if (INTP (value))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_file_add (p, value_ext);
}
else if (EQ (attribute, Qtt_object))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_object_add (p, value_ext);
}
else if (EQ (attribute, Qtt_op))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_op_add (p, value_ext);
}
else if (EQ (attribute, Qtt_otype))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_otype_add (p, value_ext);
}
else if (EQ (attribute, Qtt_scope))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_sender_add (p, value_ext);
}
else if (EQ (attribute, Qtt_sender_ptype))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_sender_ptype_add (p, value_ext);
}
else if (EQ (attribute, Qtt_session))
{
CONST char *value_ext;
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_session_add (p, value_ext);
}
else if (EQ (attribute, Qtt_state))
{
CONST char *vtype_ext;
- GET_C_STRING_OS_DATA_ALLOCA (vtype, vtype_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, vtype, C_STRING_ALLOCA, vtype_ext, Qnative);
if (NILP (value))
tt_pattern_arg_add (p, n, vtype_ext, NULL);
else if (STRINGP (value))
{
CONST char *value_ext;
- GET_C_STRING_OS_DATA_ALLOCA (value, value_ext);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value, C_STRING_ALLOCA, value_ext, Qnative);
tt_pattern_arg_add (p, n, vtype_ext, value_ext);
}
else if (INTP (value))
Lisp_Object fil;
- /* tt_open() messes with our signal handler flags (at least when no
- ttsessions is running on the machine), therefore we save the
+ /* tt_open() messes with our signal handler flags (at least when no
+ ttsessions is running on the machine), therefore we save the
actions and restore them after the call */
#ifdef HAVE_SIGPROCMASK
{
/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_TOOLTALK_H_
-#define _XEMACS_TOOLTALK_H_
+#ifndef INCLUDED_tooltalk_h_
+#define INCLUDED_tooltalk_h_
#include TT_C_H_PATH
-struct Lisp_Tooltalk_Message;
-DECLARE_LRECORD (tooltalk_message, struct Lisp_Tooltalk_Message);
-#define XTOOLTALK_MESSAGE(x) XRECORD (x, tooltalk_message, struct Lisp_Tooltalk_Message)
+typedef struct Lisp_Tooltalk_Message Lisp_Tooltalk_Message;
+DECLARE_LRECORD (tooltalk_message, Lisp_Tooltalk_Message);
+#define XTOOLTALK_MESSAGE(x) XRECORD (x, tooltalk_message, Lisp_Tooltalk_Message)
#define XSETTOOLTALK_MESSAGE(x, p) XSETRECORD (x, p, tooltalk_message)
#define TOOLTALK_MESSAGEP(x) RECORDP (x, tooltalk_message)
#define CHECK_TOOLTALK_MESSAGE(x) CHECK_RECORD (x, tooltalk_message)
-struct Lisp_Tooltalk_Pattern;
-DECLARE_LRECORD (tooltalk_pattern, struct Lisp_Tooltalk_Pattern);
-#define XTOOLTALK_PATTERN(x) XRECORD (x, tooltalk_pattern, struct Lisp_Tooltalk_Pattern)
+typedef struct Lisp_Tooltalk_Pattern Lisp_Tooltalk_Pattern;
+DECLARE_LRECORD (tooltalk_pattern, Lisp_Tooltalk_Pattern);
+#define XTOOLTALK_PATTERN(x) XRECORD (x, tooltalk_pattern, Lisp_Tooltalk_Pattern)
#define XSETTOOLTALK_PATTERN(x, p) XSETRECORD (x, p, tooltalk_pattern)
#define TOOLTALK_PATTERNP(x) RECORDP (x, tooltalk_pattern)
#define CHECK_TOOLTALK_PATTERN(x) CHECK_RECORD (x, tooltalk_pattern)
extern Lisp_Object Qtooltalk_error;
-#endif /* _XEMACS_TOOLTALK_H_ */
+#endif /* INCLUDED_tooltalk_h_ */
&& NILP (XCAR (next)))
{
/* Add in the space occupied by this element and its chain link. */
- size_so_far += sizeof (struct Lisp_Cons);
+ size_so_far += sizeof (Lisp_Cons);
/* Advance to next element. */
prev = next;
elt = XCAR (next);
/* Add in the space occupied by this element and its chain link. */
- size_so_far += sizeof (struct Lisp_Cons);
+ size_so_far += sizeof (Lisp_Cons);
if (CONSP (elt))
{
- size_so_far += sizeof (struct Lisp_Cons);
+ size_so_far += sizeof (Lisp_Cons);
if (STRINGP (XCAR (elt)))
- size_so_far += (sizeof (struct Lisp_String) - 1
+ size_so_far += (sizeof (Lisp_String) - 1
+ XSTRING_LENGTH (XCAR (elt)));
}
}
/* Add in the space occupied by this element and its chain link. */
- size_so_far += sizeof (struct Lisp_Cons);
+ size_so_far += sizeof (Lisp_Cons);
if (CONSP (elt))
{
- size_so_far += sizeof (struct Lisp_Cons);
+ size_so_far += sizeof (Lisp_Cons);
if (STRINGP (XCAR (elt)))
- size_so_far += (sizeof (struct Lisp_String) - 1
+ size_so_far += (sizeof (Lisp_String) - 1
+ XSTRING_LENGTH (XCAR (elt)));
}
#include "lisp.h"
static void
-report_error (file, fd)
- CONST char *file;
- int fd;
+report_error (const char *file, int fd)
{
if (fd)
close (fd);
report_file_error ("Cannot unexec",
- Fcons (build_ext_string (file, FORMAT_FILENAME), Qnil));
+ Fcons (build_ext_string (file, Qfile_name), Qnil));
}
#endif /* emacs */
l_Elf_Ehdr *old_file_h, *new_file_h;
l_Elf_Phdr *old_program_h, *new_program_h;
l_Elf_Shdr *old_section_h, *new_section_h;
+ l_Elf_Shdr *oldbss;
/* Point to the section name table in the old file. */
char *old_section_names;
(new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr);
new_base_offset = OLD_SECTION_H (old_data_index).sh_offset +
(old_base_addr - OLD_SECTION_H (old_data_index).sh_addr);
- new_offsets_shift = new_bss_addr -
- ((old_base_addr & ~0xfff) + ((old_base_addr & 0xfff) ? 0x1000 : 0));
+ new_offsets_shift = new_bss_addr - (old_base_addr & ~0xfff) +
+ ((old_base_addr & 0xfff) ? 0x1000 : 0);
#ifdef DEBUG
fprintf (stderr, "old_bss_index %d\n", old_bss_index);
/* Fix up a new program header. Extend the writable data segment so
that the bss area is covered too. Find that segment by looking
- for a segment that ends just before the .bss area. Make sure
- that no segments are above the new .data2. Put a loop at the end
- to adjust the offset and address of any segment that is above
- data2, just in case we decide to allow this later. */
+ for one that starts before and ends after the .bss and it PT_LOADable.
+ Put a loop at the end to adjust the offset and address of any segment
+ that is above data2, just in case we decide to allow this later. */
+ oldbss = &OLD_SECTION_H(old_bss_index);
for (n = new_file_h->e_phnum - 1; n >= 0; n--)
{
/* Compute maximum of all requirements for alignment of section. */
- int alignment = (NEW_PROGRAM_H (n)).p_align;
- if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
- alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
-
- /* Supposedly this condition is okay for the SGI. */
-#if 0
- if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz > old_base_addr)
- fatal ("Program segment above .bss in %s\n", old_name);
+ l_Elf_Phdr * ph = (l_Elf_Phdr *)((byte *) new_program_h +
+ new_file_h->e_phentsize*(n));
+#ifdef DEBUG
+ printf ("%d @ %0x + %0x against %0x + %0x",
+ n, ph->p_vaddr, ph->p_memsz,
+ oldbss->sh_addr, oldbss->sh_size);
+#endif
+ if ((ph->p_type == PT_LOAD) &&
+ (ph->p_vaddr <= oldbss->sh_addr) &&
+ ((ph->p_vaddr + ph->p_memsz)>=(oldbss->sh_addr + oldbss->sh_size))) {
+ ph->p_filesz += new_offsets_shift;
+ ph->p_memsz = ph->p_filesz;
+#ifdef DEBUG
+ puts (" That's the one!");
+ fflush (stdout);
+#endif
+ break;
+ }
+#ifdef DEBUG
+ putchar ('\n');
+ fflush (stdout);
#endif
-
- if (NEW_PROGRAM_H (n).p_type == PT_LOAD
- && (round_up ((NEW_PROGRAM_H (n)).p_vaddr
- + (NEW_PROGRAM_H (n)).p_filesz,
- alignment)
- == round_up (old_base_addr, alignment)))
- break;
}
if (n < 0)
fatal ("Couldn't find segment next to %s in %s\n",
old_sbss_index == -1 ? ".sbss" : ".bss", old_name);
- NEW_PROGRAM_H (n).p_filesz += new_offsets_shift;
- NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
#if 1 /* Maybe allow section after data2 - does this ever happen? */
for (n = new_file_h->e_phnum - 1; n >= 0; n--)
version, we need to bootstrap our heap and .bss section into our
address space before we can actually hand off control to the startup
code supplied by NT (primarily because that code relies upon malloc ()). */
+
+/* **********************
+ Hackers please remember, this _start() thingy is *not* called neither
+ when dumping portably, nor when running from temacs! Do not put
+ significant XEmacs initialization here!
+ ********************** */
+
void
_start (void)
{
- char * p;
extern void mainCRTStartup (void);
/* Cache system info, e.g., the NT page size. */
exit (1);
}
- /* To allow profiling, make sure executable_path names the .exe
- file, not the file created by the profiler */
- p = strrchr (executable_path, '\\');
- strcpy (p+1, PATH_PROGNAME ".exe");
+ /* #### This is super-bogus. When I rename xemacs.exe,
+ the renamed file still loads its heap from xemacs.exe --kkm */
+#if 0
+ {
+ /* To allow profiling, make sure executable_path names the .exe
+ file, not the file created by the profiler */
+ char *p = strrchr (executable_path, '\\');
+ strcpy (p+1, PATH_PROGNAME ".exe");
+ }
+#endif
recreate_heap (executable_path);
heap_state = HEAP_LOADED;
}
+ /* #### This is bogus, too. _fmode is set to different values
+ when we run `xemacs' and `temacs run-emacs'. The sooner we
+ hit and fix all the weirdities this causes us, the better --kkm */
+#if 0
/* The default behavior is to treat files as binary and patch up
text files appropriately, in accordance with the MSDOS code. */
_fmode = O_BINARY;
+#endif
#if 0
/* This prevents ctrl-c's in shells running while we're suspended from
window_truncation_on (struct window *w)
{
/* Minibuffer windows are never truncated.
- ### is this the right way ? */
+ #### is this the right way ? */
if (MINI_WINDOW_P (w))
return 0;
new_buffer = Fother_buffer (obj, Qnil, Qnil);
if (NILP (new_buffer))
new_buffer = Fget_buffer_create (QSscratch);
- Fset_window_buffer (w, new_buffer);
+ Fset_window_buffer (w, new_buffer, Qnil);
if (EQ (w, Fselected_window (Qnil)))
Fset_buffer (p->buffer);
}
/* Otherwise show a different buffer in the
window. */
p->dedicated = Qnil;
- Fset_window_buffer (w, another_buffer);
+ Fset_window_buffer (w, another_buffer, Qnil);
if (EQ (w, Fselected_window (Qnil)))
Fset_buffer (p->buffer);
}
window_min_height = MIN_SAFE_WINDOW_HEIGHT;
}
+static int
+frame_min_height (struct frame *frame)
+{
+ /* For height, we have to see whether the frame has a minibuffer, and
+ whether it wants a modeline. */
+ return (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1
+ : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT
+ : 2 * MIN_SAFE_WINDOW_HEIGHT - 1);
+}
+
+/* Return non-zero if both frame sizes are less than or equal to
+ minimal allowed values. ROWS and COLS are in characters */
+int
+frame_size_valid_p (struct frame *frame, int rows, int cols)
+{
+ return (rows >= frame_min_height (frame)
+ && cols >= MIN_SAFE_WINDOW_WIDTH);
+}
+
+/* Return non-zero if both frame sizes are less than or equal to
+ minimal allowed values. WIDTH and HEIGHT are in pixels */
+int
+frame_pixsize_valid_p (struct frame *frame, int width, int height)
+{
+ int rows, cols;
+ pixel_to_real_char_size (frame, width, height, &cols, &rows);
+ return frame_size_valid_p (frame, rows, cols);
+}
+
/* If *ROWS or *COLS are too small a size for FRAME, set them to the
minimum allowable size. */
void
check_frame_size (struct frame *frame, int *rows, int *cols)
{
- /* For height, we have to see whether the frame has a minibuffer, and
- whether it wants a modeline. */
- int min_height =
- (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1
- : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT
- : 2 * MIN_SAFE_WINDOW_HEIGHT - 1);
+ int min_height = frame_min_height (frame);
if (*rows < min_height)
*rows = min_height;
\f
static int window_select_count;
-DEFUN ("set-window-buffer", Fset_window_buffer, 2, 2, 0, /*
+DEFUN ("set-window-buffer", Fset_window_buffer, 2, 3, 0, /*
Make WINDOW display BUFFER as its contents.
BUFFER can be a buffer or buffer name.
+
+With non-nil optional argument `norecord', do not modify the
+global or per-frame buffer ordering.
*/
- (window, buffer))
+ (window, buffer, norecord))
{
Lisp_Object tem;
struct window *w = decode_window (window);
recompute_all_cached_specifiers_in_window (w);
if (EQ (window, Fselected_window (Qnil)))
{
+ if (NILP (norecord))
+ Frecord_buffer (buffer);
+
Fset_buffer (buffer);
}
return Qnil;
/* do this last (after the window is completely initialized and
the mirror-dirty flag is set) so that specifier recomputation
caused as a result of this will work properly and not abort. */
- Fset_window_buffer (new, o->buffer);
+ Fset_window_buffer (new, o->buffer, Qt);
return new;
}
\f
if (INTP (Vwindow_pixel_scroll_increment))
fheight = XINT (Vwindow_pixel_scroll_increment);
- else if (!NILP (Vwindow_pixel_scroll_increment));
+ else if (!NILP (Vwindow_pixel_scroll_increment))
default_face_height_and_width (window, &fheight, &fwidth);
if (Dynarr_length (dla) >= 1)
w->start_at_line_beg = beginning_of_line_p (b, startp);
MARK_WINDOWS_CHANGED (w);
+ /* #### Scroll back by less than a line. This code was
+ originally for scrolling over large pixmaps and it
+ loses when a line being *exposed* at the top of the
+ window is bigger than the current one. However, for
+ pixel based scrolling in general we can guess that
+ the line we are going to display is probably the same
+ size as the one we are on. In that instance we can
+ have a reasonable stab at a suitable top clip. Fixing
+ this properly is hard (and probably slow) as we would
+ have to call redisplay to figure out the exposed line
+ size. */
+ if (!NILP (Vwindow_pixel_scroll_increment)
+ && Dynarr_length (dla) >= (1 + modeline)
+ && dl->ascent + fheight * value > 0)
+ {
+ WINDOW_TEXT_TOP_CLIP (w) = (dl->ascent + fheight * value);
+ }
+
if (!point_would_be_visible (w, startp, XINT (point)))
{
Bufpos new_point;
/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_WINDOW_H_
-#define _XEMACS_WINDOW_H_
+#ifndef INCLUDED_window_h_
+#define INCLUDED_window_h_
#include "redisplay.h"
#ifdef HAVE_SCROLLBARS
EXFUN (Freplace_buffer_in_windows, 1);
EXFUN (Fselect_window, 2);
EXFUN (Fselected_window, 1);
-EXFUN (Fset_window_buffer, 2);
+EXFUN (Fset_window_buffer, 3);
EXFUN (Fset_window_hscroll, 2);
EXFUN (Fset_window_point, 2);
EXFUN (Fset_window_start, 3);
int buffer_window_count (struct buffer *b, struct frame *f);
int buffer_window_mru (struct window *w);
void check_frame_size (struct frame *frame, int *rows, int *cols);
+int frame_pixsize_valid_p (struct frame *frame, int width, int height);
+int frame_size_valid_p (struct frame *frame, int rows, int cols);
struct window *decode_window (Lisp_Object window);
struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win);
#endif /* emacs */
-#endif /* _XEMACS_WINDOW_H_ */
+#endif /* INCLUDED_window_h_ */
/* Written by jwz, 14 jun 93 */
-#ifndef _XGCCACHE_H_
-#define _XGCCACHE_H_
+#ifndef INCLUDED_xgccache_h_
+#define INCLUDED_xgccache_h_
struct gc_cache;
struct gc_cache *make_gc_cache (Display *, Window);
void free_gc_cache (struct gc_cache *cache);
GC gc_cache_lookup (struct gc_cache *, XGCValues *, unsigned long mask);
-#endif /* _XGCCACHE_H_ */
+#endif /* INCLUDED_xgccache_h_ */
/* Synched up with: Not in FSF. */
+#ifndef INCLUDED_xintrinsic_h_
+#define INCLUDED_xintrinsic_h_
+
#undef CONST /* X11R4 header thinks it can define CONST */
#include <X11/Intrinsic.h>
#else
# define CONST const
#endif
+
+#endif /* INCLUDED_xintrinsic_h_ */
/* Synched up with: Not in FSF. */
+#ifndef INCLUDED_xintrinsicp_h_
+#define INCLUDED_xintrinsicp_h_
+
#undef CONST /* X11R4 header thinks it can define CONST */
#include <X11/Intrinsic.h>
#else
# define CONST const
#endif
+
+#endif /* INCLUDED_xintrinsicp_h_ */
/* ManagerP.h doesn't exist in old versions of Motif; the stuff is
in XmP.h instead */
+#ifndef INCLUDED_xmmanagerp_h_
+#define INCLUDED_xmmanagerp_h_
+
#include <Xm/Xm.h> /* to get XmVersion */
#if (XmVersion >= 1002)
# include <Xm/ManagerP.h>
#else
# include <Xm/XmP.h>
#endif
+
+#endif /* INCLUDED_xmmanagerp_h_ */
/* PrimitiveP.h doesn't exist in old versions of Motif; the stuff is
in XmP.h instead */
+#ifndef INCLUDED_xmprimitivep_h_
+#define INCLUDED_xmprimitivep_h_
+
#include <Xm/Xm.h> /* to get XmVersion */
#if (XmVersion >= 1002)
# include <Xm/PrimitiveP.h>
#else
# include <Xm/XmP.h>
#endif
+
+#endif /* INCLUDED_xmprimitivep_h_ */
/* Synched up with: Not in FSF. */
+#ifndef INCLUDED_xmu_h_
+#define INCLUDED_xmu_h_
+
#ifdef HAVE_XMU
# include <X11/Xmu/CharSet.h>
#define AssignMin(x, y) {if ((y) < (x)) x = (y);}
typedef enum {XtorientHorizontal, XtorientVertical} XtOrientation;
-#endif
+#endif /* HAVE_XMU */
+#endif /* INCLUDED_xmu_h_ */
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * XEmacs 21.2.28 is released.
+
+2000-02-07 Martin Buchholz <martin@xemacs.org>
+
+ * automated/lisp-tests.el: Add plist manipulation tests.
+
+2000-02-02 Martin Buchholz <martin@xemacs.org>
+
+ * automated/symbol-tests.el: Crashes fixed, so resurrect
+ makunbound test for dontusethis-set-symbol-value-handler.
+ Add more dontusethis-set-symbol-value-handler tests.
+ Should fix any lingering problems with gnus playing with
+ pathname-coding-system.
+
+2000-01-25 Martin Buchholz <martin@xemacs.org>
+
+ * mule-tests.el: Add coding-system tests.
+
2000-01-18 Martin Buchholz <martin@xemacs.org>
* XEmacs 21.2.27 is released.
(Assert (eq (preceding-char) 0))
(Assert (eq (following-char) ?f))
)
+
+;;-----------------------------------------------------
+;; Test plist manipulation functions.
+;;-----------------------------------------------------
+(let ((sym (make-symbol "test-symbol")))
+ (Assert (eq t (get* sym t t)))
+ (Assert (eq t (get sym t t)))
+ (Assert (eq t (getf nil t t)))
+ (Assert (eq t (plist-get nil t t)))
+ (put sym 'bar 'baz)
+ (Assert (eq 'baz (get sym 'bar)))
+ (Assert (eq 'baz (getf '(bar baz) 'bar)))
+ (Assert (eq 'baz (getf (symbol-plist sym) 'bar)))
+ (Assert (eq 2 (getf '(1 2) 1)))
+ )
;; Copyright (C) 1999 Free Software Foundation, Inc.
;; Author: Hrvoje Niksic <hniksic@xemacs.org>
-;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org>
+;; Maintainers: Hrvoje Niksic <hniksic@xemacs.org>,
+;; Martin Buchholz <martin@xemacs.org>
;; Created: 1999
;; Keywords: tests
(aset string 0 (make-char 'latin-iso8859-2 42))
(Assert (eq (aref string 1) (make-char 'latin-iso8859-2 69))))
+ ;; Test coding system functions
+
+ ;; Create alias for coding system without subsidiaries
+ (Assert (coding-system-p (find-coding-system 'binary)))
+ (Assert (coding-system-canonical-name-p 'binary))
+ (Assert (not (coding-system-alias-p 'binary)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias)))
+ (Assert (not (coding-system-canonical-name-p 'mule-tests-alias)))
+ (Check-Error-Message
+ error "Symbol is the canonical name of a coding system and cannot be redefined"
+ (define-coding-system-alias 'binary 'iso8859-2))
+ (Check-Error-Message
+ error "Symbol is not a coding system alias"
+ (coding-system-aliasee 'binary))
+
+ (define-coding-system-alias 'mule-tests-alias 'binary)
+ (Assert (coding-system-alias-p 'mule-tests-alias))
+ (Assert (not (coding-system-canonical-name-p 'mule-tests-alias)))
+ (Assert (eq (get-coding-system 'binary) (get-coding-system 'mule-tests-alias)))
+ (Assert (eq 'binary (coding-system-aliasee 'mule-tests-alias)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-unix)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-dos)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-mac)))
+
+ (define-coding-system-alias 'mule-tests-alias (get-coding-system 'binary))
+ (Assert (coding-system-alias-p 'mule-tests-alias))
+ (Assert (not (coding-system-canonical-name-p 'mule-tests-alias)))
+ (Assert (eq (get-coding-system 'binary) (get-coding-system 'mule-tests-alias)))
+ (Assert (eq 'binary (coding-system-aliasee 'mule-tests-alias)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-unix)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-dos)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-mac)))
+
+ (define-coding-system-alias 'nested-mule-tests-alias 'mule-tests-alias)
+ (Assert (coding-system-alias-p 'nested-mule-tests-alias))
+ (Assert (not (coding-system-canonical-name-p 'nested-mule-tests-alias)))
+ (Assert (eq (get-coding-system 'binary) (get-coding-system 'nested-mule-tests-alias)))
+ (Assert (eq (coding-system-aliasee 'nested-mule-tests-alias) 'mule-tests-alias))
+ (Assert (eq 'mule-tests-alias (coding-system-aliasee 'nested-mule-tests-alias)))
+ (Assert (not (coding-system-alias-p 'nested-mule-tests-alias-unix)))
+ (Assert (not (coding-system-alias-p 'nested-mule-tests-alias-dos)))
+ (Assert (not (coding-system-alias-p 'nested-mule-tests-alias-mac)))
+
+ (Check-Error-Message
+ error "Attempt to create a coding system alias loop"
+ (define-coding-system-alias 'mule-tests-alias 'nested-mule-tests-alias))
+ (Check-Error-Message
+ error "No such coding system"
+ (define-coding-system-alias 'no-such-coding-system 'no-such-coding-system))
+ (Check-Error-Message
+ error "Attempt to create a coding system alias loop"
+ (define-coding-system-alias 'mule-tests-alias 'mule-tests-alias))
+
+ (define-coding-system-alias 'nested-mule-tests-alias nil)
+ (define-coding-system-alias 'mule-tests-alias nil)
+ (Assert (coding-system-p (find-coding-system 'binary)))
+ (Assert (coding-system-canonical-name-p 'binary))
+ (Assert (not (coding-system-alias-p 'binary)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias)))
+ (Assert (not (coding-system-canonical-name-p 'mule-tests-alias)))
+ (Check-Error-Message
+ error "Symbol is the canonical name of a coding system and cannot be redefined"
+ (define-coding-system-alias 'binary 'iso8859-2))
+ (Check-Error-Message
+ error "Symbol is not a coding system alias"
+ (coding-system-aliasee 'binary))
+
+ (define-coding-system-alias 'nested-mule-tests-alias nil)
+ (define-coding-system-alias 'mule-tests-alias nil)
+
+ ;; Create alias for coding system with subsidiaries
+ (define-coding-system-alias 'mule-tests-alias 'iso-8859-7)
+ (Assert (coding-system-alias-p 'mule-tests-alias))
+ (Assert (not (coding-system-canonical-name-p 'mule-tests-alias)))
+ (Assert (eq (get-coding-system 'iso-8859-7) (get-coding-system 'mule-tests-alias)))
+ (Assert (eq 'iso-8859-7 (coding-system-aliasee 'mule-tests-alias)))
+ (Assert (coding-system-alias-p 'mule-tests-alias-unix))
+ (Assert (coding-system-alias-p 'mule-tests-alias-dos))
+ (Assert (coding-system-alias-p 'mule-tests-alias-mac))
+
+ (define-coding-system-alias 'mule-tests-alias (get-coding-system 'iso-8859-7))
+ (Assert (coding-system-alias-p 'mule-tests-alias))
+ (Assert (not (coding-system-canonical-name-p 'mule-tests-alias)))
+ (Assert (eq (get-coding-system 'iso-8859-7) (get-coding-system 'mule-tests-alias)))
+ (Assert (eq 'iso-8859-7 (coding-system-aliasee 'mule-tests-alias)))
+ (Assert (coding-system-alias-p 'mule-tests-alias-unix))
+ (Assert (coding-system-alias-p 'mule-tests-alias-dos))
+ (Assert (coding-system-alias-p 'mule-tests-alias-mac))
+ (Assert (eq (find-coding-system 'mule-tests-alias-mac)
+ (find-coding-system 'iso-8859-7-mac)))
+
+ (define-coding-system-alias 'nested-mule-tests-alias 'mule-tests-alias)
+ (Assert (coding-system-alias-p 'nested-mule-tests-alias))
+ (Assert (not (coding-system-canonical-name-p 'nested-mule-tests-alias)))
+ (Assert (eq (get-coding-system 'iso-8859-7)
+ (get-coding-system 'nested-mule-tests-alias)))
+ (Assert (eq (coding-system-aliasee 'nested-mule-tests-alias) 'mule-tests-alias))
+ (Assert (eq 'mule-tests-alias (coding-system-aliasee 'nested-mule-tests-alias)))
+ (Assert (coding-system-alias-p 'nested-mule-tests-alias-unix))
+ (Assert (coding-system-alias-p 'nested-mule-tests-alias-dos))
+ (Assert (coding-system-alias-p 'nested-mule-tests-alias-mac))
+ (Assert (eq (find-coding-system 'nested-mule-tests-alias-unix)
+ (find-coding-system 'iso-8859-7-unix)))
+
+ (Check-Error-Message
+ error "Attempt to create a coding system alias loop"
+ (define-coding-system-alias 'mule-tests-alias 'nested-mule-tests-alias))
+ (Check-Error-Message
+ error "No such coding system"
+ (define-coding-system-alias 'no-such-coding-system 'no-such-coding-system))
+ (Check-Error-Message
+ error "Attempt to create a coding system alias loop"
+ (define-coding-system-alias 'mule-tests-alias 'mule-tests-alias))
+
+ ;; Test dangling alias deletion
+ (define-coding-system-alias 'mule-tests-alias nil)
+ (Assert (not (coding-system-alias-p 'mule-tests-alias)))
+ (Assert (not (coding-system-alias-p 'mule-tests-alias-unix)))
+ (Assert (not (coding-system-alias-p 'nested-mule-tests-alias)))
+ (Assert (not (coding-system-alias-p 'nested-mule-tests-alias-dos)))
+
;; Test strings waxing and waning across the 8k BIG_STRING limit (see alloc.c)
(defun charset-char-string (charset)
(let (lo hi string n)
;; Magic symbols
;;-----------------------------------------------------
-;; Magic symbols are almost totally unimplemented. However, a
-;; rudimentary subset of the functionality is being used to implement
-;; backward compatibility or clearer error messages for new features
-;; such as specifiers and glyphs. These tests try to test that
-;; working subset.
+;; Magic symbols are only half implemented. However, a subset of the
+;; functionality is being used to implement backward compatibility or
+;; clearer error messages for new features such as specifiers and
+;; glyphs. These tests try to test that working subset.
-(let ((mysym (make-symbol "test-symbol")))
+(let ((mysym (make-symbol "test-symbol"))
+ save)
(dontusethis-set-symbol-value-handler
mysym
'set-value
(lambda (&rest args)
(throw 'test-tag args)))
+ (Assert (not (boundp mysym)))
(Assert (equal (catch 'test-tag
(set mysym 'foo))
- `(,mysym (foo) set nil nil))))
-
-;; #### These two make XEmacs crash!
+ `(,mysym (foo) set nil nil)))
+ (Assert (not (boundp mysym)))
+ (dontusethis-set-symbol-value-handler
+ mysym
+ 'set-value
+ (lambda (&rest args) (setq save (nth 1 args))))
+ (set mysym 'foo)
+ (Assert (equal save '(foo)))
+ (Assert (eq (symbol-value mysym) 'foo))
+ )
+
+(let ((mysym (make-symbol "test-symbol"))
+ save)
+ (dontusethis-set-symbol-value-handler
+ mysym
+ 'make-unbound
+ (lambda (&rest args)
+ (throw 'test-tag args)))
+ (Assert (equal (catch 'test-tag
+ (makunbound mysym))
+ `(,mysym nil makunbound nil nil)))
+ (dontusethis-set-symbol-value-handler
+ mysym
+ 'make-unbound
+ (lambda (&rest args) (setq save (nth 2 args))))
+ (Assert (not (boundp mysym)))
+ (set mysym 'bar)
+ (Assert (null save))
+ (Assert (eq (symbol-value mysym) 'bar))
+ (makunbound mysym)
+ (Assert (not (boundp mysym)))
+ (Assert (eq save 'makunbound))
+ )
+
+(when (featurep 'file-coding)
+ (Assert (eq pathname-coding-system file-name-coding-system))
+ (let ((val1 file-name-coding-system)
+ (val2 pathname-coding-system))
+ (Assert (eq val1 val2))
+ (let ((file-name-coding-system 'no-conversion-dos))
+ (Assert (eq file-name-coding-system 'no-conversion-dos))
+ (Assert (eq pathname-coding-system file-name-coding-system)))
+ (let ((pathname-coding-system 'no-conversion-mac))
+ (Assert (eq file-name-coding-system 'no-conversion-mac))
+ (Assert (eq pathname-coding-system file-name-coding-system)))
+ (Assert (eq file-name-coding-system pathname-coding-system))
+ (Assert (eq val1 file-name-coding-system)))
+ (Assert (eq pathname-coding-system file-name-coding-system)))
-;(let ((mysym (make-symbol "test-symbol")))
-; (dontusethis-set-symbol-value-handler
-; mysym
-; 'make-unbound
-; (lambda (&rest args)
-; (throw 'test-tag args)))
-; (Assert (equal (catch 'test-tag
-; (set mysym 'foo))
-; `(,mysym (foo) set nil nil))))
;(let ((mysym (make-symbol "test-symbol")))
; (dontusethis-set-symbol-value-handler
; (throw 'test-tag args)))
; (Assert (equal (catch 'test-tag
; (set mysym 'foo))
-; `(,mysym (foo) set nil nil))))
+; `(,mysym (foo) make-local nil nil))))
emacs_is_beta=t
emacs_major_version=21
emacs_minor_version=2
-emacs_beta_version=27
-xemacs_codename="Hera"
+emacs_beta_version=28
+xemacs_codename="Hermes"
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
projects / chise / xemacs-chise.git / commitdiff