From db1c2aa58214595505d95020247eee0159cbaf49 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Fri, 6 Sep 2002 01:49:25 +0000 Subject: [PATCH] Thu Sep 5 21:47:57 2002 Michael Jennings (mej) Updates to the termcap/terminfo stuff to make everything work on *BSD. Thanks to Thomas Dickey and Will Yardley for their assistance with this. SVN revision: 6391 --- ChangeLog | 6 ++++++ configure.in | 1 + doc/Eterm.tcap | 7 ++++--- doc/Eterm.ti | 2 +- doc/Makefile.am | 9 +++++---- src/feature.h | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a40dd3..559e21e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4783,3 +4783,9 @@ Tue Aug 13 22:55:58 2002 Michael Jennings (mej) Documentation fix from Jim Lewis . ---------------------------------------------------------------------- +Thu Sep 5 21:47:57 2002 Michael Jennings (mej) + +Updates to the termcap/terminfo stuff to make everything work on *BSD. +Thanks to Thomas Dickey and Will Yardley + for their assistance with this. +---------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 5aa5ba1..9b23a79 100644 --- a/configure.in +++ b/configure.in @@ -494,6 +494,7 @@ if test "$FOUND_LIBAST" -ne "1"; then if test "x$ANS" = "xy" -o "x$ANS" = "xyes" -o "x$ANS" = "xY" -o "x$ANS" = "xYES"; then # Download from CVS server CVSROOT=":pserver:anonymous@cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment" + test -f $HOME/.cvspass || touch $HOME/.cvspass grep $CVSROOT $HOME/.cvspass >/dev/null 2>&1 || cvs -d $CVSROOT login cvs -z3 -d $CVSROOT co -d libast eterm/libast (cd libast && ./autogen.sh $ac_configure_args && make install && cd .. && rm -rf libast) diff --git a/doc/Eterm.tcap b/doc/Eterm.tcap index f94c845..821d708 100644 --- a/doc/Eterm.tcap +++ b/doc/Eterm.tcap @@ -1,6 +1,6 @@ -Eterm|Eterm-color|Eterm with xterm-style color support (X Window System):\ +Eterm|Eterm Terminal Emulator (X11 Window System):\ :am:bw:eo:km:mi:ms:xn:xo:\ - :co#80:it#8:li#24:lm#0:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:\ + :co#80:it#8:li#24:lm#0:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39m\E[49m:\ :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ :K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:LE=\E[%dD:\ :RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\ @@ -15,4 +15,5 @@ Eterm|Eterm-color|Eterm with xterm-style color support (X Window System):\ :me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\ :sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\ - :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l: + :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\ + :ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~: diff --git a/doc/Eterm.ti b/doc/Eterm.ti index 5e17684..b711cb9 100644 --- a/doc/Eterm.ti +++ b/doc/Eterm.ti @@ -1,6 +1,6 @@ # Eterm terminfo file -Eterm|Eterm-color|Eterm with xterm-style color support (X Window System), +Eterm|Eterm Terminal Emulator (X11 Window System), # FIXME: xterm does not specify bce, bw, eo, or xon. Should we? am, bw, bce, km, mir, msgr, xenl, xon, eo, mc5i, cols#80, lines#24, it#8, lm#0, btns#5, diff --git a/doc/Makefile.am b/doc/Makefile.am index 41ba756..ced0ec9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,11 +12,12 @@ Eterm.1.html: Eterm.1 install-data-hook: $(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || : - -infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' \ - -e 's!^\([[:space:]]:co#.*\):\\$$!\1:pa#64:Co#8:AF=\\E[3%dm:AB=\\E[4%dm:\\!' \ - > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new + -(infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' \ + -e 's!^\([[:space:]]:co#.*\):\\$$!\1:pa#64:Co#8:AF=\\E[3%dm:AB=\\E[4%dm:op=\\E[39m\\E[49m:\\!' \ + -e 's!:$$!:\\!' ; echo ' :ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:' \ + ) > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new -if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \ - grep 'Eterm-color' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \ + grep -i 'Eterm Terminal Emulator' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \ cap_mkdb termcap ; \ fi || : diff --git a/src/feature.h b/src/feature.h index 583c369..6c93b7b 100644 --- a/src/feature.h +++ b/src/feature.h @@ -301,7 +301,7 @@ inline void *memmove(void *, const void *, size_t); # define PATH_ENV "ETERMPATH" #endif -#if !(HAVE_SAVED_UIDS) && defined(_POSIX_VERSION) && (_POSIX_SAVED_IDS) +#if defined(_POSIX_VERSION) && defined(_POSIX_SAVED_IDS) && (_POSIX_SAVED_IDS == 1) # define HAVE_SAVED_UIDS 1 #endif