From 6a728cb3f9c683e4482b05ca839ee2927351d522 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 23 Sep 2003 06:11:19 +0000 Subject: [PATCH] * lib/*.ti: Remove, these files are obsolete. * lib/tdiff: Likewise. * lib/xterm.tcap: Likewise. * lib/Makefile.am: Remove obsolete files. Don't install README.xterm and xterm.ad, there are partly obsolete and can break things if used as is. --- ChangeLog | 9 ++++ lib/Makefile.am | 10 +--- lib/ansi.ti | 20 -------- lib/linux.ti | 49 ------------------- lib/tdiff | 22 --------- lib/vt100.ti | 23 --------- lib/xterm.tcap | 38 --------------- lib/xterm.ti | 126 ------------------------------------------------ 8 files changed, 10 insertions(+), 287 deletions(-) delete mode 100644 lib/ansi.ti delete mode 100644 lib/linux.ti delete mode 100755 lib/tdiff delete mode 100644 lib/vt100.ti delete mode 100644 lib/xterm.tcap delete mode 100644 lib/xterm.ti diff --git a/ChangeLog b/ChangeLog index bf3030777..9703f37d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-09-23 Pavel Roskin + + * lib/*.ti: Remove, these files are obsolete. + * lib/tdiff: Likewise. + * lib/xterm.tcap: Likewise. + * lib/Makefile.am: Remove obsolete files. Don't install + README.xterm and xterm.ad, there are partly obsolete and can + break things if used as is. + 2003-09-22 Strahinya Radich * lib/mc.hint.sr: Updated. diff --git a/lib/Makefile.am b/lib/Makefile.am index e3d799aee..5f61432b8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,4 @@ suppbindir = $(pkgdatadir)/bin -tidir = $(pkgdatadir)/term if CHARSET LIBFILES_ADD = mc.charsets @@ -13,17 +12,12 @@ LIBFILES_CONST = mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it \ mc.hint.zh mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc \ edit.spell.rc -noinst_DATA = \ - mcserv.init \ - mcserv.pamd - -noinst_SCRIPTS = tdiff +noinst_DATA = README.xterm mcserv.init mcserv.pamd xterm.ad SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh suppbin_SCRIPTS = $(SCRIPTS_OUT) -ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap pkgdata_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT) @@ -33,9 +27,7 @@ CLEANFILES = $(SCRIPTS_OUT) EXTRA_DIST = \ $(LIBFILES_CONST) \ $(SCRIPTS_IN) \ - $(ti_DATA) \ $(noinst_DATA) \ - $(noinst_SCRIPTS) \ mc.charsets mc.csh: $(srcdir)/mc.csh.in diff --git a/lib/ansi.ti b/lib/ansi.ti deleted file mode 100644 index 1e7b0c8bc..000000000 --- a/lib/ansi.ti +++ /dev/null @@ -1,20 +0,0 @@ -# -# Procomm and some other ANSI emulations don't recognize all of the ANSI- -# standard capabilities. This entry deletes cuu, cuf, cud, cub, and vpa/hpa -# capabilities, forcing curses to use repetitions of cuu1, cuf1, cud1 and cub1. -# -ansi|ansiterm|Generic ansi terminal, - am, xon, - cols#80, lines#24, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - clear=\E[H\E[J, cr=\r, cub1=\b, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, - home=\E[H, ht=\t, hts=\EH, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, - ind=\n, invis=\E[8m, kbs=\b, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, - rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmso=\E[m, - rmul=\E[m, - sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, - sgr0=\E[0m, smso=\E[7m, smul=\E[4m, tbc=\E[2g, diff --git a/lib/linux.ti b/lib/linux.ti deleted file mode 100644 index fbde0fb6e..000000000 --- a/lib/linux.ti +++ /dev/null @@ -1,49 +0,0 @@ - -# Linux terminfo entry, hacked together by converting the -# termcap entry and by reading the source for console.c -# It is provided to give a working version and not necessarily a full -# implmentation. -# vt100 mode in the console is incomplete, so keep using -# null-translation mode -# Most users have TERM in the form con132x43. Modify the entry below -# and change lines and cols accordingly. -# Remove the period before km if you console is configured to set msb -# high instead of sending escape -# -# Note that the statdard Linux console is now called 'linux' instead -# of 'console'. terminals with sizes other than 80x25 need to append -# their size to linux and add an entry like the one for 132x43 below -# -# changes from ncurses-1.8.6 terminfo: key definition for shifted -# scan codes (kf13 through kf20). - -linux|console|Standard Linux Console, - cr=^M, cud1=^J, ind=^J, bel=^G, il1=\E[L, am, cub1=^H, ed=\E[J, - el=\E[K, clear=\E[H\E[J, bce, xenl, .km, eo, mir, msgr, xon, - colors#8, pairs#64, lines#25, cols#80, - hpa=\E[%i%p1%dG, vpa=\E[%i%p1%dd, ri=\EM, hts=\EH, tbc=\E[3g, - smir=\E[4h, rmir=\E[4l, civis=\E[?25l, cnorm=\E[?25h, - sc=\E7, rc=\E8, -#acsc=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\053o\176s\137`\004a\260f\370g\361~\011+\020\,\021.\031-\030h\261i\0250\333, - acsc=llmmkkjjuuttvvwwqqxxnnooss``aaffgg~~++\,\,..--hhii, - cup=\E[%i%p1%d;%p2%dH, op=\E[37m\E[40m, - dch=\E[%p1%dP, dl=\E[%p1%dM, home=\E[H, it#8, ich=\E[%p1%d@, - bold=\E[1m, rev=\E[7m, blink=\E[5m, - setf=\E[%p1%{30}%+%dm, setb=\E[%p1%{40}%+%dm, - kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, kbs=\177, - cuf1=\E[C, ht=^I, cuu1=\E[A, - smacs=^N,rmacs=^O, - rmul=\E[24m, smul=\E[4m, rmso=\E[0m, smso=\E[1m, - kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf20=\E[34~, - kich1=\E[2~, - kdch1=\E[3~, kend=\E[4~, khome=\E[1~, knp=\E[6~, kpp=\E[5~, - - -# This is the terminfo for a console in 132x43 mode -# Modify according to your TERM variable -linux-132x43, - lines#43, cols#132, use=linux, diff --git a/lib/tdiff b/lib/tdiff deleted file mode 100755 index 6359760f6..000000000 --- a/lib/tdiff +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# This scripts compares two terminfo files and prints out the differences. -# -sort_it () -{ - sed 's/^#.*//' $1 | - tr '\t' ' ' | - sed 's/ *//g' | - tr , '\012' | - tr -s '\012' | - sort > $1.$2 -} - -sort_it $1 f1 -sort_it $2 f2 - -diff $1.f1 $2.f2 -rm $1.f1 $2.f2 - - - diff --git a/lib/vt100.ti b/lib/vt100.ti deleted file mode 100644 index 015532550..000000000 --- a/lib/vt100.ti +++ /dev/null @@ -1,23 +0,0 @@ - -vt100|vt100-am|dec vt100 (w/advanced video), - am, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=\b, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, - cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, - el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=\t, - hts=\EH, ind=\n, ka1=\EOq, ka3=\EOs, kb2=\EOr, kbs=\b, - kc1=\EOp, kc3=\EOn, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, kf0=\EOy, kf1=\EOP, - kf10=\EOx, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOt, - kf6=\EOu, kf7=\EOv, kf8=\EOl, kf9=\EOw, rc=\E8, - rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmkx=\E[?1l\E>, - rmso=\E[m$<2>, rmul=\E[m$<2>, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, - sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t^N%e^O%;, - sgr0=\E[m^O$<2>, smacs=^N, smkx=\E[?1h\E=, - smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, diff --git a/lib/xterm.tcap b/lib/xterm.tcap deleted file mode 100644 index 80eac4b5d..000000000 --- a/lib/xterm.tcap +++ /dev/null @@ -1,38 +0,0 @@ -# Termcap entry for the xterm terminal emulator -# From: Jakub Jelinek 1 Sep 1995 -# This is a checked termcap entry for the xterm terminal emulator. -# It is compatible with the enclosed xterm.ti terminfo entry -# and should work well, if you load xterm.ad to X11 resources. -# Install this by cutting off the old xterm entry from /etc/termcap -# and replacing that place it with this file. -# Havily based on xterm from: -# Eric S. Raymond 30 Mar 1995 -# Note: If you use the line-drawing character set, the disable afterwards -# will leave you in US-ASCII. If you live somewhere that wants a pound sign -# at 2/3, change rmacs to "\E(A". Further note: cuf and cub don't seem -# to be reliable under my xterm, so they're commented out. -xterm|vs100|xterm terminal emulator (X11R6 Window System):\ - :am:bs:km:mi:ms:pt:xn:xo:\ - :co#80:it#8:li#24:\ - :@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:F1=\E[23~:\ - :F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\ - :F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\ - :IC=\E[%d@:LE=\E[%dD:UP=\E[%dA:\ - :ac=++\054\054..00II--``aaffgghhjjkkllmmnnooqqssttuuvvwwxx~~:\ - :ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\ - :cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\ - :ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\ - :ic=\E[@:im=\E[4h:\ - :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ - :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\ - :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\ - :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\ - :ke=\E[?1l\E>:kh=\E[7~:kH=\E[4~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\ - :ku=\EOA:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\ - :r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<:\ - :rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\ - :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u6=\E[%d;%dR:\ - :u7=\E[6n:u8=\E[?1;2c:u9=\E[c:ue=\E[m:up=\E[A:\ - :us=\E[4m: -xterm-color|color-xterm|xterm with color support:\ - :tc=xterm:tc=ansi-pc-color: diff --git a/lib/xterm.ti b/lib/xterm.ti deleted file mode 100644 index a4a5a36d7..000000000 --- a/lib/xterm.ti +++ /dev/null @@ -1,126 +0,0 @@ -# -# Enhanced xterm terminfo entry -# To get correct behaviour under xterm (not rxvt), use enclosed -# xterm.ad and add it into X resource database. -# Install xterm.ti by typing tic xterm.ti -# -xterm-basic|xterm terminal base (X Window System), - am, km, mir, msgr, xenl, - lines#65, cols#80, it#8, - -# Not sure about this flag: Erase overstrike with a blank. - eo, - - bel=^G, cr=\r, - ind=^J, il1=\E[L, - -# Clear screen, EOL, EOS, BOL - clear=\E[H\E[2J, el=\E[K, ed=\E[J, el1=\E[1K$<3>, - -# Change scroll region - csr=\E[%i%p1%d;%p2%dr, - -# Cursor motion - -# Enter insert mode, leave insert mode - smir=\E[4h, rmir=\E[4l, - -# Positions Horizontal and vertical. Taken from linux console source - hpa=\E[%i%p1%dG, vpa=\E[%i%p1%dd, - -# Scroll text down - ri=\EM, - -# Set tab stops, clear tab stops, tab character -# FIXME: does xterm use \E[3k instead of \E[3g (like vt102)? - hts=\EH, tbc=\E[3g, ht=\t, - -# Make cursor invisible, normal - civis=\E[?25l, cnorm=\E[?25h, - -# Save cursor position, restore cursor position - - sc=\E7, rc=\E8, - -# Code for line drawing, enter alternate char set and leave char set - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - smacs=\E(B\E)U^N,rmacs=\E(B\E)0^O, - enacs=\E(B\E)0, - -# Enter/leave keypad transmit. - rmkx=\E[?1l\E>, - smkx=\E[?1h\E=, - -# Delete: chars, lines, 1char, 1line - dch=\E[%p1%dP, dl=\E[%p1%dM, - dch1=\E[P, dl1=\E[M, - -# Insert: chars, line, 1 char, - ich=\E[%p1%d@, il=\E[%p1%dL, - ich1=\E[@, il1=\E[L, - -# Fonts: bold, reverse, blink, underline (enter/leave), -# standout (enter/leave), Define attribs 1-9 - bold=\E[1m, rev=\E[7m, - rmul=\E[24m, smul=\E[4m, rmso=\E[m, smso=\E[7m, - -# Cursor keys, sent by terminal - kcuf1=\EOC, kcuu1=\EOA, kcud1=\EOB, kcub1=\EOD, - -# Move cursor: 1 char, any - cuf1=\E[C, cuu1=\E[A, cud1=\n, cub1=\b, - cuf=\E[%p1%dC, cuu=\E[%p1%dA, cud=\E[%p1%dB, cub=\E[%p1%dD, - -# Move cursor to arbitrary position - cup=\E[%i%p1%d;%p2%dH, - -# Misc cursor motion - home=\E[H, - -# Other nice keys. - ka1=\EOq, ka3=\EOs, kb2=\EOr, - kc1=\EOp, kc3=\EOn, - -# The Function keys. - - kf0=\E[21~, kf1=\E[11~, kf2=\E[12~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf20=\E[34~, - -# Insert, home, end, delete, next page, previous page, backspace, enter - kich1=\E[2~, khome=\E[7~, kend=\E[8~, - kdch1=\E[3~, knp=\E[6~, kpp=\E[5~, - kbs=\b, kent=\EOM, - -# Reset terminal, turn off all attributes - rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, - rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<, - -# Init terminal - is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, - -# Leave/Enter CA-Mode. - rmcup=\E[?47l\E8, - smcup=\E7\E[?47h, - -# -# Xterm with color support. -# -xterm|vs100|xterm terminal emulator (X Window System), - use=xterm-basic, - sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t^N%e^O%;, - sgr0=\E[m^O, - -xterm-color|color-xterm|color xterm terminal emulator (X Window System), - use=xterm, - colors#8, pairs#64, - -# Set all color pairs to the original ones -# op=\E[37m\E[40m, - op=\E[m, - -# Set foreground color, background color - setf=\E[%p1%{30}%+%dm, setb=\E[%p1%{40}%+%dm,