diff -cNr jfbterm-0.3.7.org/Makefile.in jfbterm-0.3.7-991209/Makefile.in *** jfbterm-0.3.7.org/Makefile.in Tue Nov 30 01:33:35 1999 --- jfbterm-0.3.7-991209/Makefile.in Thu Dec 9 21:03:00 1999 *************** *** 98,105 **** DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar GZIP_ENV = --best SOURCES = $(jfbterm_SOURCES) OBJECTS = $(jfbterm_OBJECTS) --- 98,108 ---- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar GZIP_ENV = --best + DEP_FILES = .deps/csv.P .deps/fbcommon.P .deps/fbdpsp.P .deps/font.P \ + .deps/getcap.P .deps/main.P .deps/message.P .deps/pcf.P .deps/pen.P \ + .deps/term.P .deps/util.P .deps/vterm.P .deps/vtermlow.P SOURCES = $(jfbterm_SOURCES) OBJECTS = $(jfbterm_OBJECTS) *************** *** 107,115 **** .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 110,118 ---- .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 174,182 **** rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done - .c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< --- 177,182 ---- *************** *** 264,269 **** --- 264,274 ---- -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ *************** *** 274,279 **** --- 279,316 ---- || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done + + DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + + -include $(DEP_FILES) + + mostlyclean-depend: + + clean-depend: + + distclean-depend: + -rm -rf .deps + + maintainer-clean-depend: + + %.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + + %.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: *************** *** 314,338 **** maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ ! mostlyclean-compile mostlyclean-tags \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ ! clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ ! distclean-tags distclean-generic clean-am distclean: distclean-am -rm -f config.status maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 351,377 ---- maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ ! mostlyclean-compile mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ ! clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ ! distclean-tags distclean-depend distclean-generic \ ! clean-am distclean: distclean-am -rm -f config.status maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-depend maintainer-clean-generic \ ! distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 344,355 **** maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ ! check-am installcheck-am installcheck all-recursive-am install-exec-am \ ! install-exec install-data-local install-data-am install-data install-am \ ! install uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean install-data-local: --- 383,396 ---- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ ! install-exec-am install-exec install-data-local install-data-am \ ! install-data install-am install uninstall-am uninstall all-redirect \ ! all-am all installdirs mostlyclean-generic distclean-generic \ ! clean-generic maintainer-clean-generic clean mostlyclean distclean \ ! maintainer-clean install-data-local: diff -cNr jfbterm-0.3.7.org/acconfig.h jfbterm-0.3.7-991209/acconfig.h *** jfbterm-0.3.7.org/acconfig.h Tue Nov 30 01:12:48 1999 --- jfbterm-0.3.7-991209/acconfig.h Thu Dec 9 21:03:00 1999 *************** *** 5,10 **** --- 5,22 ---- /* where is jbterm.conf in */ #undef SYSCONFDIR + /* Support reverse cmap */ + #undef JFB_REVERSEVIDEO + + /* Support 1bpp */ + #undef JFB_1BPP + + /* Support 2bpp */ + #undef JFB_2BPP + + /* Support 4bpp */ + #undef JFB_4BPP + /* Support 8bpp */ #undef JFB_8BPP *************** *** 46,49 **** --- 58,67 ---- /* Color gamma effect */ #undef JFB_COLOR_GAMMA + + /* Name of package */ + #undef PACKAGE + + /* Version number of package */ + #undef VERSION diff -cNr jfbterm-0.3.7.org/config.h.in jfbterm-0.3.7-991209/config.h.in *** jfbterm-0.3.7.org/config.h.in Tue Nov 30 01:12:58 1999 --- jfbterm-0.3.7-991209/config.h.in Thu Dec 9 21:03:00 1999 *************** *** 48,53 **** --- 48,65 ---- /* where is jbterm.conf in */ #undef SYSCONFDIR + /* Support reverse cmap */ + #undef JFB_REVERSEVIDEO + + /* Support 1bpp */ + #undef JFB_1BPP + + /* Support 2bpp */ + #undef JFB_2BPP + + /* Support 4bpp */ + #undef JFB_4BPP + /* Support 8bpp */ #undef JFB_8BPP diff -cNr jfbterm-0.3.7.org/configure jfbterm-0.3.7-991209/configure *** jfbterm-0.3.7.org/configure Tue Nov 30 01:33:35 1999 --- jfbterm-0.3.7-991209/configure Thu Dec 9 21:03:00 1999 *************** *** 14,21 **** --- 14,29 ---- ac_help="$ac_help --enable-color-gamma turn on color gamma [default no]" ac_help="$ac_help + --enable-reverse-video support reverse cmap [default no]" + ac_help="$ac_help --enable-debug turn on debugging [default no]" ac_help="$ac_help + --enable-1bpp support 1bpp [default no]" + ac_help="$ac_help + --enable-2bpp support 2bpp [default yes]" + ac_help="$ac_help + --enable-4bpp support 4bpp [default no]" + ac_help="$ac_help --enable-8bpp support 8bpp [default yes]" ac_help="$ac_help --enable-15bpp support 15bpp [default yes]" *************** *** 583,589 **** # 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:587: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 591,597 ---- # 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:595: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 636,642 **** test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 ! echo "configure:640: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile --- 644,650 ---- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 ! echo "configure:648: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile *************** *** 693,699 **** test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:697: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 701,707 ---- test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:705: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 739,745 **** missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 ! echo "configure:743: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 747,753 ---- missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 ! echo "configure:751: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 752,758 **** fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 ! echo "configure:756: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 760,766 ---- fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 ! echo "configure:764: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 765,771 **** fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 ! echo "configure:769: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 773,779 ---- fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 ! echo "configure:777: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 778,784 **** fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 ! echo "configure:782: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 786,792 ---- fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 ! echo "configure:790: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 791,797 **** fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 ! echo "configure:795: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. --- 799,805 ---- fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 ! echo "configure:803: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. *************** *** 808,814 **** # 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:812: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 816,822 ---- # 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:820: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 838,844 **** # 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:842: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 846,852 ---- # 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:850: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 889,895 **** # 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:893: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 897,903 ---- # 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:901: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 921,927 **** fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:925: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --- 929,935 ---- fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:933: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. *************** *** 932,943 **** cat > conftest.$ac_ext << EOF ! #line 936 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:941: \"$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 --- 940,951 ---- cat > conftest.$ac_ext << EOF ! #line 944 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:949: \"$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 *************** *** 963,974 **** { 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:967: 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:972: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 971,982 ---- { 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:975: 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:980: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 977,983 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:981: \"$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 --- 985,991 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:989: \"$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 *************** *** 996,1002 **** ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1000: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1004,1010 ---- ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1008: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1042,1048 **** # 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:1046: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1050,1056 ---- # 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:1054: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1096,1102 **** echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 ! echo "configure:1100: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1104,1110 ---- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 ! echo "configure:1108: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1104,1117 **** ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1112,1125 ---- ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 1140,1146 **** echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1144: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 1148,1154 ---- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1152: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 1155,1167 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1165: \"$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 : --- 1163,1175 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1173: \"$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 : *************** *** 1172,1184 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1182: \"$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 : --- 1180,1192 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1190: \"$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 : *************** *** 1189,1201 **** rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1199: \"$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 : --- 1197,1209 ---- rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1207: \"$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 : *************** *** 1220,1231 **** echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1224: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1228,1239 ---- echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1232: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1233,1239 **** #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1237: \"$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* --- 1241,1247 ---- #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1245: \"$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* *************** *** 1250,1256 **** 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 --- 1258,1264 ---- 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 *************** *** 1268,1274 **** 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 --- 1276,1282 ---- 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 *************** *** 1289,1295 **** : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --- 1297,1303 ---- : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') *************** *** 1300,1306 **** exit (0); } EOF ! if { (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else --- 1308,1314 ---- exit (0); } EOF ! if { (eval echo configure:1312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else *************** *** 1324,1335 **** fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:1328: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1332,1343 ---- fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:1336: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1345,1351 **** s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF ! if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else --- 1353,1359 ---- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF ! if { (eval echo configure:1357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else *************** *** 1369,1385 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1373: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1383: \"$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* --- 1377,1393 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1381: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1391: \"$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* *************** *** 1407,1418 **** echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:1411: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1419: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else --- 1469,1475 ---- ; return 0; } EOF ! if { (eval echo configure:1473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else *************** *** 1482,1502 **** fi echo $ac_n "checking for inline""... $ac_c" 1>&6 ! echo "configure:1486: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else --- 1490,1510 ---- fi echo $ac_n "checking for inline""... $ac_c" 1>&6 ! echo "configure:1494: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else *************** *** 1522,1533 **** esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 ! echo "configure:1526: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 1530,1541 ---- esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 ! echo "configure:1534: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1555,1566 **** fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1559: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 1563,1574 ---- fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1567: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1588,1599 **** fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 ! echo "configure:1592: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1596,1607 ---- fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 ! echo "configure:1600: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1601,1607 **** struct stat s; s.st_rdev; ; return 0; } EOF ! if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else --- 1609,1615 ---- struct stat s; s.st_rdev; ; return 0; } EOF ! if { (eval echo configure:1613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else *************** *** 1622,1633 **** fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:1626: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1630,1641 ---- fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:1634: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1636,1642 **** struct tm *tp; ; return 0; } EOF ! if { (eval echo configure:1640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else --- 1644,1650 ---- struct tm *tp; ; return 0; } EOF ! if { (eval echo configure:1648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else *************** *** 1659,1671 **** if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:1663: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP --- 1667,1679 ---- if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:1671: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP *************** *** 1683,1689 **** if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA --- 1691,1697 ---- if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA *************** *** 1705,1723 **** fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 ! echo "configure:1709: checking whether sys/types.h defines makedev" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return makedev(0, 0); ; return 0; } EOF ! if { (eval echo configure:1721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else --- 1713,1731 ---- fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 ! echo "configure:1717: checking whether sys/types.h defines makedev" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return makedev(0, 0); ; return 0; } EOF ! if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else *************** *** 1735,1751 **** if test $ac_cv_header_sys_types_h_makedev = no; then ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6 ! echo "configure:1739: checking for sys/mkdev.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1749: \"$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* --- 1743,1759 ---- if test $ac_cv_header_sys_types_h_makedev = no; then ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6 ! echo "configure:1747: checking for sys/mkdev.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1757: \"$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* *************** *** 1773,1789 **** if test $ac_cv_header_sys_mkdev_h = no; then ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6 ! echo "configure:1777: checking for sys/sysmacros.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1787: \"$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* --- 1781,1797 ---- if test $ac_cv_header_sys_mkdev_h = no; then ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6 ! echo "configure:1785: checking for sys/sysmacros.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1795: \"$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* *************** *** 1814,1830 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1818: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1828: \"$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* --- 1822,1838 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1826: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1836: \"$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* *************** *** 1853,1864 **** for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1857: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1865: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 1889,1895 ---- ; return 0; } EOF ! if { (eval echo configure:1893: \"$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 *************** *** 1906,1912 **** done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 ! echo "configure:1910: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1914,1920 ---- done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 ! echo "configure:1918: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1914,1920 **** ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else --- 2062,2068 ---- } EOF ! if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else *************** *** 2077,2088 **** fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:2081: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 2085,2096 ---- fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:2089: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 2099,2105 **** int i; ; return 0; } EOF ! if { (eval echo configure:2103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else --- 2107,2113 ---- int i; ; return 0; } EOF ! if { (eval echo configure:2111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else *************** *** 2118,2129 **** echo $ac_n "checking for vprintf""... $ac_c" 1>&6 ! echo "configure:2122: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2130: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else --- 2154,2160 ---- ; return 0; } EOF ! if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else *************** *** 2170,2181 **** if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 ! echo "configure:2174: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2182: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else --- 2206,2212 ---- ; return 0; } EOF ! if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else *************** *** 2225,2236 **** for ac_func in select strdup strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2229: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2237: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 2261,2267 ---- ; return 0; } EOF ! if { (eval echo configure:2265: \"$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 *************** *** 2283,2289 **** # 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:2287: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_jfb_gzip_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2291,2297 ---- # 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:2295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_jfb_gzip_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2337,2343 **** fi echo $ac_n "checking whether to enable color gamma""... $ac_c" 1>&6 ! echo "configure:2341: checking whether to enable color gamma" >&5 if test x$enable_colorgamma = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2345,2351 ---- fi echo $ac_n "checking whether to enable color gamma""... $ac_c" 1>&6 ! echo "configure:2349: checking whether to enable color gamma" >&5 if test x$enable_colorgamma = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2348,2353 **** --- 2356,2380 ---- echo "$ac_t""no" 1>&6 fi + # Check whether --enable-reverse-video or --disable-reverse-video was given. + if test "${enable_reverse_video+set}" = set; then + enableval="$enable_reverse_video" + : + else + enable-reverse-video=no + fi + + echo $ac_n "checking whether to enable reverse-video""... $ac_c" 1>&6 + echo "configure:2369: checking whether to enable reverse-video" >&5 + if test x$enable_reverse_video = xyes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF + #define JFB_REVERSEVIDEO 1 + EOF + + else + echo "$ac_t""no" 1>&6 + fi # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then *************** *** 2358,2364 **** fi echo $ac_n "checking whether to enable debugging""... $ac_c" 1>&6 ! echo "configure:2362: checking whether to enable debugging" >&5 if test x$enable_debug = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2385,2391 ---- fi echo $ac_n "checking whether to enable debugging""... $ac_c" 1>&6 ! echo "configure:2389: checking whether to enable debugging" >&5 if test x$enable_debug = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2369,2374 **** --- 2396,2461 ---- echo "$ac_t""no" 1>&6 fi + # Check whether --enable-1bpp or --disable-1bpp was given. + if test "${enable_1bpp+set}" = set; then + enableval="$enable_1bpp" + : + else + enable_1bpp=no + fi + + echo $ac_n "checking whether to enable 1bpp""... $ac_c" 1>&6 + echo "configure:2409: checking whether to enable 1bpp" >&5 + if test x$enable_1bpp = xyes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF + #define JFB_1BPP 1 + EOF + + else + echo "$ac_t""no" 1>&6 + fi + + # Check whether --enable-2bpp or --disable-2bpp was given. + if test "${enable_2bpp+set}" = set; then + enableval="$enable_2bpp" + : + else + enable_2bpp=yes + fi + + echo $ac_n "checking whether to enable 2bpp""... $ac_c" 1>&6 + echo "configure:2429: checking whether to enable 2bpp" >&5 + if test x$enable_2bpp = xyes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF + #define JFB_2BPP 1 + EOF + + else + echo "$ac_t""no" 1>&6 + fi + + # Check whether --enable-4bpp or --disable-4bpp was given. + if test "${enable_4bpp+set}" = set; then + enableval="$enable_4bpp" + : + else + enable_4bpp=no + fi + + echo $ac_n "checking whether to enable 4bpp""... $ac_c" 1>&6 + echo "configure:2449: checking whether to enable 4bpp" >&5 + if test x$enable_4bpp = xyes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF + #define JFB_4BPP 1 + EOF + + else + echo "$ac_t""no" 1>&6 + fi + # Check whether --enable-8bpp or --disable-8bpp was given. if test "${enable_8bpp+set}" = set; then enableval="$enable_8bpp" *************** *** 2378,2384 **** fi echo $ac_n "checking whether to enable 8bpp""... $ac_c" 1>&6 ! echo "configure:2382: checking whether to enable 8bpp" >&5 if test x$enable_8bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2465,2471 ---- fi echo $ac_n "checking whether to enable 8bpp""... $ac_c" 1>&6 ! echo "configure:2469: checking whether to enable 8bpp" >&5 if test x$enable_8bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2398,2404 **** fi echo $ac_n "checking whether to enable 15bpp""... $ac_c" 1>&6 ! echo "configure:2402: checking whether to enable 15bpp" >&5 if test x$enable_15bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2485,2491 ---- fi echo $ac_n "checking whether to enable 15bpp""... $ac_c" 1>&6 ! echo "configure:2489: checking whether to enable 15bpp" >&5 if test x$enable_15bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2418,2424 **** fi echo $ac_n "checking whether to enable 16bpp""... $ac_c" 1>&6 ! echo "configure:2422: checking whether to enable 16bpp" >&5 if test x$enable_16bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2505,2511 ---- fi echo $ac_n "checking whether to enable 16bpp""... $ac_c" 1>&6 ! echo "configure:2509: checking whether to enable 16bpp" >&5 if test x$enable_16bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2438,2444 **** fi echo $ac_n "checking whether to enable 24bpp""... $ac_c" 1>&6 ! echo "configure:2442: checking whether to enable 24bpp" >&5 if test x$enable_24bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2525,2531 ---- fi echo $ac_n "checking whether to enable 24bpp""... $ac_c" 1>&6 ! echo "configure:2529: checking whether to enable 24bpp" >&5 if test x$enable_24bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2458,2464 **** fi echo $ac_n "checking whether to enable 32bpp""... $ac_c" 1>&6 ! echo "configure:2462: checking whether to enable 32bpp" >&5 if test x$enable_32bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2545,2551 ---- fi echo $ac_n "checking whether to enable 32bpp""... $ac_c" 1>&6 ! echo "configure:2549: checking whether to enable 32bpp" >&5 if test x$enable_32bpp = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2478,2484 **** fi echo $ac_n "checking whether to enable pseudo-color""... $ac_c" 1>&6 ! echo "configure:2482: checking whether to enable pseudo-color" >&5 if test x$enable_pseudo_color = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2565,2571 ---- fi echo $ac_n "checking whether to enable pseudo-color""... $ac_c" 1>&6 ! echo "configure:2569: checking whether to enable pseudo-color" >&5 if test x$enable_pseudo_color = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2498,2504 **** fi echo $ac_n "checking whether to enable direct-color""... $ac_c" 1>&6 ! echo "configure:2502: checking whether to enable direct-color" >&5 if test x$enable_direct_color = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2585,2591 ---- fi echo $ac_n "checking whether to enable direct-color""... $ac_c" 1>&6 ! echo "configure:2589: checking whether to enable direct-color" >&5 if test x$enable_direct_color = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2518,2524 **** fi echo $ac_n "checking whether to enable true-color""... $ac_c" 1>&6 ! echo "configure:2522: checking whether to enable true-color" >&5 if test x$enable_true_color = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2605,2611 ---- fi echo $ac_n "checking whether to enable true-color""... $ac_c" 1>&6 ! echo "configure:2609: checking whether to enable true-color" >&5 if test x$enable_true_color = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2538,2544 **** fi echo $ac_n "checking whether to enable vga16fb""... $ac_c" 1>&6 ! echo "configure:2542: checking whether to enable vga16fb" >&5 if test x$enable_vga16fb = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2625,2631 ---- fi echo $ac_n "checking whether to enable vga16fb""... $ac_c" 1>&6 ! echo "configure:2629: checking whether to enable vga16fb" >&5 if test x$enable_vga16fb = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2558,2564 **** fi echo $ac_n "checking whether to enable packed-pixels""... $ac_c" 1>&6 ! echo "configure:2562: checking whether to enable packed-pixels" >&5 if test x$enable_packed_pixels = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2645,2651 ---- fi echo $ac_n "checking whether to enable packed-pixels""... $ac_c" 1>&6 ! echo "configure:2649: checking whether to enable packed-pixels" >&5 if test x$enable_packed_pixels = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2578,2584 **** fi echo $ac_n "checking whether to enable check-mmio-error""... $ac_c" 1>&6 ! echo "configure:2582: checking whether to enable check-mmio-error" >&5 if test x$enable_check_mmio_error = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2665,2671 ---- fi echo $ac_n "checking whether to enable check-mmio-error""... $ac_c" 1>&6 ! echo "configure:2669: checking whether to enable check-mmio-error" >&5 if test x$enable_check_mmio_error = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 2598,2604 **** fi echo $ac_n "checking whether to enable force-8bit""... $ac_c" 1>&6 ! echo "configure:2602: checking whether to enable force-8bit" >&5 if test x$enable_force_8bit = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 2685,2691 ---- fi echo $ac_n "checking whether to enable force-8bit""... $ac_c" 1>&6 ! echo "configure:2689: checking whether to enable force-8bit" >&5 if test x$enable_force_8bit = xyes; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF diff -cNr jfbterm-0.3.7.org/configure.in jfbterm-0.3.7-991209/configure.in *** jfbterm-0.3.7.org/configure.in Tue Nov 30 01:33:31 1999 --- jfbterm-0.3.7-991209/configure.in Thu Dec 9 21:03:00 1999 *************** *** 52,63 **** --- 52,98 ---- AC_MSG_RESULT(no) fi + AC_ARG_ENABLE(reverse-video, [ --enable-reverse-video support reverse cmap [default no]],,enable-reverse-video=no) + AC_MSG_CHECKING(whether to enable reverse-video) + if test x$enable_reverse_video = xyes; then + AC_MSG_RESULT(yes) + AC_DEFINE(JFB_REVERSEVIDEO) + else + AC_MSG_RESULT(no) + fi AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default no]],,enable_debug=no) AC_MSG_CHECKING(whether to enable debugging) if test x$enable_debug = xyes; then AC_MSG_RESULT(yes) AC_DEFINE(DEBUG) + else + AC_MSG_RESULT(no) + fi + + AC_ARG_ENABLE(1bpp, [ --enable-1bpp support 1bpp [default no]],,enable_1bpp=no) + AC_MSG_CHECKING(whether to enable 1bpp) + if test x$enable_1bpp = xyes; then + AC_MSG_RESULT(yes) + AC_DEFINE(JFB_1BPP) + else + AC_MSG_RESULT(no) + fi + + AC_ARG_ENABLE(2bpp, [ --enable-2bpp support 2bpp [default yes]],,enable_2bpp=yes) + AC_MSG_CHECKING(whether to enable 2bpp) + if test x$enable_2bpp = xyes; then + AC_MSG_RESULT(yes) + AC_DEFINE(JFB_2BPP) + else + AC_MSG_RESULT(no) + fi + + AC_ARG_ENABLE(4bpp, [ --enable-4bpp support 4bpp [default no]],,enable_4bpp=no) + AC_MSG_CHECKING(whether to enable 4bpp) + if test x$enable_4bpp = xyes; then + AC_MSG_RESULT(yes) + AC_DEFINE(JFB_4BPP) else AC_MSG_RESULT(no) fi diff -cNr jfbterm-0.3.7.org/fbcommon.c jfbterm-0.3.7-991209/fbcommon.c *** jfbterm-0.3.7.org/fbcommon.c Tue Nov 30 01:32:36 1999 --- jfbterm-0.3.7-991209/fbcommon.c Thu Dec 9 21:03:00 1999 *************** *** 43,48 **** --- 43,53 ---- #include #include #include + + #ifndef FB_TYPE_VGA_PLANES + # define FB_TYPE_VGA_PLANES 4 /* EGA/VGA planes */ + #endif + #include #include *************** *** 56,61 **** --- 61,76 ---- struct fb_fix_screeninfo* fbfs); static TFrameBufferCapability sFBCapabilityList[] = { + #if (defined(JFB_2BPP) && defined(JFB_PACKED) && defined(JFB_PSEUDOCOLOR)) + { + 2, FB_TYPE_PACKED_PIXELS, FB_VISUAL_PSEUDOCOLOR, + tfbm_fill_rect_2bpp_packed, + tfbm_overlay_2bpp_packed, + tfbm_clear_all_2bpp_packed, + tfbm_reverse_2bpp_packed + }, + #endif + #if (defined(JFB_8BPP) && defined(JFB_PACKED) && defined(JFB_PSEUDOCOLOR)) { 8, FB_TYPE_PACKED_PIXELS, FB_VISUAL_PSEUDOCOLOR, *************** *** 261,266 **** --- 276,298 ---- } } + #if defined(JFB_2BPP) + static void simple_2bpp_palette(void) + { + /** + red[0] = green[0] = blue[0] = 0xffff; + red[1] = green[1] = blue[1] = 0xaaaa; + red[2] = green[2] = blue[2] = 0x5555; + red[3] = green[3] = blue[3] = 0x0000; + **/ + red[0] = green[0] = blue[0] = 0x0000; + red[1] = green[1] = blue[1] = 0x5555; + red[2] = green[2] = blue[2] = 0xaaaa; + red[3] = green[3] = blue[3] = 0xffff; + } + #endif + + #if !defined(NO_FLOAT) static void linear_palette(int bit) { int i; *************** *** 291,296 **** --- 323,331 ---- blue[i+16] = (bs * ((bidx) % b)) * 255; } } + #endif + + extern void set_most_left(__u32 bpp, struct fb_bitfield a_pixel_field); static void tfbm_initcolors(TFrameBufferMemory* p, struct fb_var_screeninfo* fbvs, *************** *** 305,312 **** --- 340,358 ---- switch (fbvs->bits_per_pixel) { case 1: break; + #if defined(JFB_2BPP) + case 2: + simple_2bpp_palette(); + set_most_left(2, fbvs->red); + break; + #endif + #if defined(JFB_4BPP) case 4: + /* simple_2bpp_palette(); */ + /* set_most_left(4, fbvs->red); */ break; + #endif + #if !defined(NO_FLOAT) case 8: if (fbfs->visual != FB_VISUAL_PSEUDOCOLOR) { linear_palette(8); *************** *** 326,331 **** --- 372,378 ---- linear_palette(8); } break; + #endif default: die("Oops: %i bit/pixel ???\n", fbvs->bits_per_pixel); } *************** *** 573,584 **** struct fb_fix_screeninfo* fbfs) { int ret; for(ret = 0 ; sFBCapabilityList[ret].bitsPerPixel != 0 ; ret++) { if (sFBCapabilityList[ret].fbType == fbfs->type && sFBCapabilityList[ret].fbVisual == fbfs->visual && sFBCapabilityList[ret].bitsPerPixel==fbvs->bits_per_pixel){ ! return ret; } } return -1; } --- 620,643 ---- struct fb_fix_screeninfo* fbfs) { int ret; + int static_color = 0; + + if(fbfs->visual == FB_VISUAL_STATIC_PSEUDOCOLOR){ + fbfs->visual = FB_VISUAL_PSEUDOCOLOR; + static_color = 1; + } for(ret = 0 ; sFBCapabilityList[ret].bitsPerPixel != 0 ; ret++) { if (sFBCapabilityList[ret].fbType == fbfs->type && sFBCapabilityList[ret].fbVisual == fbfs->visual && sFBCapabilityList[ret].bitsPerPixel==fbvs->bits_per_pixel){ ! if(static_color){ ! fbfs->visual = FB_VISUAL_STATIC_PSEUDOCOLOR; ! } ! return ret; } + } + if(static_color){ + fbfs->visual = FB_VISUAL_STATIC_PSEUDOCOLOR; } return -1; } diff -cNr jfbterm-0.3.7.org/fbdpsp.c jfbterm-0.3.7-991209/fbdpsp.c *** jfbterm-0.3.7.org/fbdpsp.c Tue Nov 30 01:28:26 1999 --- jfbterm-0.3.7-991209/fbdpsp.c Thu Dec 9 21:03:00 1999 *************** *** 28,37 **** --- 28,234 ---- #include #include #include + #include #include #include + #ifndef __i386__ + #define __i386__ + #endif + + #ifdef JFB_2BPP + /* 2bpp */ + + static u_char mask_2bpp_msb_left[] = { + 0xc0, 0x30, 0x0c, 0x03 + }; + static u_char mask_2bpp_msb_right[] = { + 0x03, 0x0c, 0x30, 0xc0 + }; + static u_char* mask_2bpp = mask_2bpp_msb_left; + + void set_most_left(__u32 bpp, struct fb_bitfield red){ + if(red.offset != 0) return; + if(red.length != bpp) return; + if(red.msb_right){ + mask_2bpp = mask_2bpp_msb_right; + } + } + + static u_char color_map_2bpp[] = { + 0x00, // 0 + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0xff, // 7 + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xff // 15 + }; + + static inline u_char tfbm_select_2_color(u_int color) + { + #ifdef JFB_REVERSEVIDEO + return (~ color_map_2bpp[color & 0xf]); + #else + return (color_map_2bpp[color & 0xf]); + #endif + } + + static inline void set_pixel_2bpp_packed( + u_char *p, u_int x, u_int icol) + { + // p points byte to be written + u_int b = x / 4; // Byte offset + p[b] = ((p[b] & ~mask_2bpp[x & 3]) | (mask_2bpp[x & 3] & icol)); + } + + static inline void set_byte_2bpp_packed( + u_char *bp, u_int icol) + { + *bp = icol; + } + + static inline void reverse_pixel_2bpp_packed( + u_char *p, u_int x, u_int icol) + { + *p = (*p & ~mask_2bpp[x & 3]) | ((*p ^ icol) & mask_2bpp[x & 3]); + } + + void tfbm_fill_rect_2bpp_packed( + TFrameBufferMemory* p, + u_int sx, u_int sy, u_int lx, u_int ly, u_int color) + { + u_int y; + u_int icol = tfbm_select_2_color(color); + for (y = sy ; y < sy+ly ; y++) { + #if 0 + memset(p->smem + y * p->bytePerLine + sx, icol, lx); + #else + u_char *line = p->smem + y * p->bytePerLine; + u_char *bp = line + (sx / 4); // byte position + u_int xx = sx % 4; + u_int pixels = lx; + if (xx != 0) { + // Fill until byte boundary + while (xx % 4 != 0 && pixels != 0) { + set_pixel_2bpp_packed(bp, xx++, icol); + pixels--; + } + bp++; + } + while (pixels >= 4) { + // Fill with byte + set_byte_2bpp_packed(bp, icol); + pixels -= 4; + bp++; + } + xx = 0; + while (pixels != 0) { + // Fill rest pixels + set_pixel_2bpp_packed(bp, xx++, icol); + pixels--; + } + #endif + } + } + + void tfbm_clear_all_2bpp_packed( + TFrameBufferMemory* p, u_int color) + { + u_int icol = tfbm_select_2_color(color); + // memset(p->smem, color, p->slen / 4); + memset(p->smem, icol, p->slen); + } + + void tfbm_overlay_2bpp_packed( + TFrameBufferMemory* p, + u_int xd, u_int yd, + const u_char* ps, u_int lx, u_int ly, u_int gap, u_int color) + { + u_int y; + u_char* wp; + const u_char* tps; + u_int i; + u_int sb; + u_int icol = tfbm_select_2_color(color); + + for (y = yd ; y < yd+ly ; y++) { + u_int xx = xd % 4; + tps = ps; + wp = p->smem + y * p->bytePerLine + (xd / 4); + for (i = lx ; i >= 8 ; i -= 8) { + sb = *tps++; + if (sb & 0x80) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x40) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x20) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x10) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x08) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x04) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x02) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + if (sb & 0x01) + set_pixel_2bpp_packed(wp, xx, icol); + xx++; + } + if (i) { + sb = *tps++; + switch (i) { + case 7: + if (sb & 0x02) + set_pixel_2bpp_packed(wp, xx + 6, icol); + case 6: + if (sb & 0x04) + set_pixel_2bpp_packed(wp, xx + 5, icol); + case 5: + if (sb & 0x08) + set_pixel_2bpp_packed(wp, xx + 4, icol); + case 4: + if (sb & 0x10) + set_pixel_2bpp_packed(wp, xx + 3, icol); + case 3: + if (sb & 0x20) + set_pixel_2bpp_packed(wp, xx + 2, icol); + case 2: + if (sb & 0x40) + set_pixel_2bpp_packed(wp, xx + 1, icol); + case 1: + if (sb & 0x80) + set_pixel_2bpp_packed(wp, xx + 0, icol); + } + } + ps += gap; + } + } + + void tfbm_reverse_2bpp_packed( + TFrameBufferMemory* p, + u_int sx, u_int sy, u_int lx, u_int ly, u_int color) + { + u_int y; + u_int x; + u_int icol = tfbm_select_2_color(color); + for (y = sy ; y < sy+ly ; y++) { + unsigned char *line = p->smem + y * p->bytePerLine; + for (x = sx ; x < sx + lx ; x++) { + unsigned char *bp = line + (x / 4); // byte position + reverse_pixel_2bpp_packed(bp, x, icol); + } + } + } + + #endif /* JFB_2BPP */ #ifdef JFB_8BPP /* 8 bpp */ diff -cNr jfbterm-0.3.7.org/fbdpsp.h jfbterm-0.3.7-991209/fbdpsp.h *** jfbterm-0.3.7.org/fbdpsp.h Mon Oct 18 07:16:47 1999 --- jfbterm-0.3.7-991209/fbdpsp.h Thu Dec 9 21:03:00 1999 *************** *** 41,46 **** --- 41,61 ---- # include #endif + #ifdef JFB_2BPP + void tfbm_fill_rect_2bpp_packed( + TFrameBufferMemory* p, + u_int sx, u_int sy, u_int lx, u_int ly, u_int color); + void tfbm_overlay_2bpp_packed( + TFrameBufferMemory* p, + u_int xd, u_int yd, + const u_char* ps, u_int lx, u_int ly, u_int gap, u_int color); + void tfbm_clear_all_2bpp_packed( + struct Raw_TFrameBufferMemory* p, u_int color); + void tfbm_reverse_2bpp_packed( + TFrameBufferMemory* p, + u_int sx, u_int sy, u_int lx, u_int ly, u_int color); + #endif /* JFB_2BPP */ + #ifdef JFB_8BPP void tfbm_fill_rect_8bpp_packed( TFrameBufferMemory* p, diff -cNr jfbterm-0.3.7.org/main.c jfbterm-0.3.7-991209/main.c *** jfbterm-0.3.7.org/main.c Sun Oct 31 02:57:22 1999 --- jfbterm-0.3.7-991209/main.c Thu Dec 9 21:03:00 1999 *************** *** 228,236 **** --- 228,238 ---- exit(EXIT_FAILURE); } + #if !defined(NO_FLOAT) if ((cp = tcaps_find_first(&(gApp.gCaps), "gamma")) != NULL) { fbgamma = (float)atof(cp); } + #endif tapp_change_to_new_console(&gApp); diff -cNr jfbterm-0.3.7.org/vtermlow.c jfbterm-0.3.7-991209/vtermlow.c *** jfbterm-0.3.7.org/vtermlow.c Tue Nov 30 01:41:17 1999 --- jfbterm-0.3.7-991209/vtermlow.c Thu Dec 9 21:03:00 1999 *************** *** 45,50 **** --- 45,51 ---- #include #include #include + #include #if 0 *************** *** 334,344 **** --- 335,353 ---- return; } if (p->cursor.shown != b) { + #ifdef JFB_REVERSEVIDEO + gFramebuffer.cap.reverse(&gFramebuffer, + gFontsWidth * p->cursor.x, + gFontsHeight * p->cursor.y, + p->cursor.width + (p->cursor.wide ? p->cursor.width : 0), + p->cursor.height, 0x0); + #else gFramebuffer.cap.reverse(&gFramebuffer, gFontsWidth * p->cursor.x, gFontsHeight * p->cursor.y, p->cursor.width + (p->cursor.wide ? p->cursor.width : 0), p->cursor.height, 0xf); + #endif p->cursor.shown = b; } }