From a1c55a38fb1629ac6886b900f6de5083582d1b6b Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Tue, 5 Aug 2008 13:43:53 +0000 Subject: [PATCH] Trust provided TERM and override missing terminfo entries. git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@122 6be0d1a5-5cfe-0310-89b6-964be062b18b --- .Xdefaults | 12 +++++++----- .profile.d/TERM.bashrc | 29 +---------------------------- .screenrc | 4 +++- .terminfo/d/dtterm | Bin 0 -> 1647 bytes .terminfo/l/linux | Bin 0 -> 1672 bytes .terminfo/p/putty-256color | Bin 0 -> 2021 bytes .terminfo/r/rxvt-unicode | Bin 944 -> 2168 bytes .terminfo/s/screen | Bin 0 -> 1442 bytes .terminfo/s/screen-bce | Bin 0 -> 1468 bytes 9 files changed, 11 insertions(+), 34 deletions(-) create mode 100644 .terminfo/d/dtterm create mode 100644 .terminfo/l/linux create mode 100644 .terminfo/p/putty-256color create mode 100644 .terminfo/s/screen create mode 100644 .terminfo/s/screen-bce diff --git a/.Xdefaults b/.Xdefaults index b24656d..1e40f40 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -29,13 +29,14 @@ Dtterm*dtTermView.marginWidth: 0 urxvt.foreground: white urxvt.background: black urxvt.scrollBar_right: True +urxvt.secondaryScroll: True urxvt.font: xft:DejaVu Sans Mono:pixelsize=12:aspect=0.9 urxvt.multichar_encoding: noenc urxvt.title: Penguin terminal -urxvt.termName: xterm-color +!urxvt.termName: xterm-color urxvt.saveLines: 512 urxvt.scrollstyle: next -urxvt.answerbackString: PuTTY +urxvt.answerbackString: urxvt ! transparency !rxvt*inheritPixmap: True @@ -44,7 +45,7 @@ rxvt*scrollBar_right: True rxvt*font: fixed rxvt*multichar_encoding: noenc rxvt*title: Penguin terminal -rxvt*termName: xterm-color +!rxvt*termName: xterm-color rxvt*saveLines: 512 !rxvt-big5*inheritPixmap: True @@ -56,7 +57,7 @@ rxvt-big5*mfont: -tlc-ming-medium-r-normal-*-16-120-100-100-c-160-big5-0 rxvt-big5*multichar_encoding: big5 rxvt-big5*inputMethod: xcin-big5 rxvt-big5*title: Penguin terminal (Big 5) -rxvt-big5*termName: xterm-color +!rxvt-big5*termName: xterm-color !rxvt-gb2312*inheritPixmap: True rxvt-gb2312*reverseVideo: True @@ -67,7 +68,7 @@ rxvt-gb2312*mfont: -tlc-song-medium-r-normal-*-14-140-75-75-c-140-gb2312.1980-0 rxvt-gb2312*multichar_encoding: gb2312 rxvt-gb2312*inputMethod: xcin-gb2312 rxvt-gb2312*title: Penguin terminal (GB2312) -rxvt-gb2312*termName: xterm-color +!rxvt-gb2312*termName: xterm-color ! aewm Palette.geometry: 1280x30+0+0 @@ -82,3 +83,4 @@ Palette*showGrip: False XTerm.*faceName: DejaVu Sans Mono XTerm.*faceSize: 9 +XTerm.*termName: xterm-256color diff --git a/.profile.d/TERM.bashrc b/.profile.d/TERM.bashrc index 054e284..a315c9f 100644 --- a/.profile.d/TERM.bashrc +++ b/.profile.d/TERM.bashrc @@ -1,29 +1,2 @@ # $Id$ -# -# Try to find a valid TERM entry. -# - -# Note that running answerback will prevent keyboard input, which is annoying -# if you try to start typing while the shell is starting up. -term= -eval $(answerback 2>/dev/null) -case "$ANSWERBACK" in - PuTTY) term=xterm-256color;; - urxvt) term=rxvt-unicode;; -esac - -if [ ! -z "$term" ]; then - if ! has_term $term; then - export TERMINFO=~/.terminfo - fi - export TERM=$term -elif ! has_term $TERM; then - for term in rxvt-unicode xterm-256color xterm-88color linux dtterm xterm-color xterm vt100; do - if has_term $term; then - export TERM=$term - break - fi - done -fi - -unset ANSWERBACK term +export TERMINFO=~/.terminfo diff --git a/.screenrc b/.screenrc index da1faa5..9b6a296 100644 --- a/.screenrc +++ b/.screenrc @@ -8,4 +8,6 @@ bind k focus up bind t title #bind h focus top #bind l focus bottom -#termcapinfo xterm ti@:te@ +termcapinfo putty*|rxvt-unicode|xterm* 'AB=\E[48;5;%dm:AF=\E[38;5;%dm' +termcapinfo * 'ti@:te@' +defbce on diff --git a/.terminfo/d/dtterm b/.terminfo/d/dtterm new file mode 100644 index 0000000000000000000000000000000000000000..4c997dfe1b2339b5690410b26f67ff7d23547a8e GIT binary patch literal 1647 zcmcJOJ7^S96o${ajfrSNz!%vR2|A!+F>_}&yUVB>^U$D1BZvgnB9Yy^_L0qI^L{j` z6wyjVth7*@U?C#fsGv5%B8^reXk(!uB8VW2=bV`=32Pz&z3ln#ch5bqxv;fZ2L?32 zC0ta=Vlh?7&a||))hAOU>Eckno*e_Zo(urW4`d-7X!$A_NGDXlE@H22RY21pyk%kJ zI1PCyz$I|F{T7rklM$g-#o~Y;QBWzRm z6nCgo4Qjsvy5SWK_5-w^3b>p0vjKZv3e$KOAK+triZ5{ym+&p!eIn~5`-0!FD~LTG z?0)5P{YCdL;0;`XTB6-J4>xGiM>1`BbR|t|DidqeF}0K8x35vXu9SaY?T|10S@Nu| z`VK#=QDb%7%F~YxWenpu&f+{?#H)A>Z{jUn*iin;&g=8{HNJ8EEYAaZp}$4_pZi0~ z{s-OH`(Ji<_w@Ak_Vo=8rqh{BHk->04dwI0!-c}gNU=CNIyN>wJ~1&lIW;vsJu@>q zJ2wZLAe0DaNi3GQ4rgd<4<(NKr+(N}%SgILUK_~*JNVd2|L*{sVe>M!5U{Pv zXmDaI2W>#OQ;f#1Yy%pqeNi;iqs| zw01RLB(y^sVYfU8yX+E~Mx43mYByrIe9&}oe6$GzuR|F2yaZfw!QoMfJ3`&j{%)%cfZ-2AJ}Htau}UU$FjjhUpd2>f7yySX*aU^J6BO8k ziUE~S4YhC_c@wlDMxYBuAdW1Vya1PAT(SwcCi8W;1$ST)rr@EhXW#|Agx8X%SN;f} zu>PFVzF?kT9AAK+z*#oSWd&?A+s1aW-K>P^ESdCRl(7m{g_)k3RJN<-cm&5ASuf{n3pc9~7EIn=)W(Z8@*{Xka6X|-}*CG+x?>sHY-I~)J8FY~>0eT+Bp zR^G-tc`qO0aek4H{pXD7nKSd1HO_mL-{iOXB)`ia@JDNWH*@W^*0~P*jeJL8iv4|t zB1f?!8}h&zR3b``ri6V;k5IyWDCq470cWrVQ!NJNR8#d5wfh6G9;E<=Uzir67J?kR z>cC13AwPssv7~uOYrv?-(6lZ@lRz>-%;-RH6O&*NlY2aYL{q6$eRei1EQD+mvd?eQ zx~5fBCRDZb0FIVp)WLZ~J%Ml#LvBZCRN6IdF?g7u5i-<{J zA25%cklUogNm8FCvDYo-raJtDx>ZWrkerg@?xfLH#fz+_6zN8vR zO^tE9^UE9BB1A)OM^P9g2orS-a?9$oh9vR|X?hOXdc45LRuR}{hTq6}QdWKT?(uDDXH#57e^<4UQb3e@#gbYn#wXD9o0`H^smps~p8D@xbxH$8kr AyZ`_I literal 0 HcmV?d00001 diff --git a/.terminfo/p/putty-256color b/.terminfo/p/putty-256color new file mode 100644 index 0000000000000000000000000000000000000000..377be35e6d0b2d922714950ac843d0a366eea3ab GIT binary patch literal 2021 zcmcIjO=w(I82#>@&{VOlxRBb1C5RWS5P9#u_vXhJ9g_-)HHDxNZHAV#nQ78yCNr75 z$>e9IOLKm(C#XisdW?p7mQ&7ZV?m6e) z^L_W{yZ7x9Ha$r9Qd7+LRBB;|Kce$NY3({a85Dw-gqtr9RmG z>@ScIMEJMBblTF8peWjkw%LzFbn<=#_0SgDN)OO(QnZKq5uK)IXq3k2Md$-G3CyES z(=3(2HL6pCPC-S{tBmV(hR)IjdXL_xk1_HYU7;`OYpAPe-*HS7{RaM{t^Wi|5$|e? zxJTS4c8cBNVezQ2MN$liAu$Yp6m3krAST+ehc^B-rt(@Nj|%XzQK>+&agL;fm%mpAV;>Hjo-v%OcD z7)-R5IF)!MvEJ6VFZyPp&@(9W%+P!3@tXvf-=%>t}6L>+gXmYHy^`v$1Ii!x#NuYZI zFofnfMrlSz8||>?c&vTK6l0n(V^G_ySsE}kNE*TMIC*Z6w%rZlgP0Pq*dGhCGLJkT zi_ut^sn{~Juo#cUAXx)e?x6~nv4bRd3TJeSIF~uAZQCeK+61?5G>>`^Hept^Ro2W^ zNvehl14jj>uOYpbgypi8YV|!>z6wevETh8hs<1-^WR1{We3h7Sm?kF=A3l0?diwbB z+1X;TRGOPBmn)U|`D%4xAq;D^#l?DkX=!(P%bLm;z0p;c^(U-A9J3JvJrK zMZI@{G*@49^)**hb73`CUvu?czAcw;%jI~tbzA1O;_!IOd2`jtIY2f!1vJgg1YQQO zi=P2s1=nOX-BbfAbh*~5U})7z@>qsD@cUI>72I^-2d$_8)8twuZKr#iq&xO4`QB~$ zj%{Xf_*-yvi8}K=p+ZZk;p=D5fu4%@WH;4@alYHo9pn63x8ZgfA9fpFm+?`z;dhL4 fSGo+H>KLcr=rSC?lk&sM7dy_Bc`xzlaMHg33owdP literal 0 HcmV?d00001 diff --git a/.terminfo/r/rxvt-unicode b/.terminfo/r/rxvt-unicode index e4ea203d7323851421e7eee358c0173fbf1e28b2..3970893be1575bc984095fb1beb5d1fc6517338a 100644 GIT binary patch literal 2168 zcmb_cO=w(I6h8O8Db<2>qoR4##?o8b)Fku%W+r_m)1);Cn$XfHM$^>9&NP{1{xX^T zbuv}Duu>}2MHUrA6kUl6LEO2}McpV0Zd?h1bWubK7OhwqzjNNpUw?>#6V7+P@7#0l zz3+bSrAhg;i*{34-Hufj=c}!A#oXyqCcC^*G*`2gLasQTZ{9!L{9>+{DJ?V)EzMT5 zg#)A%t%VSR#vg+^P7lyyNHp&H4RgUg^6Q1$FiT`mj2@vT+C%%O1sR`ushb;) z2^^ygO;d?x!I!8`=jj4iqj6bqh2Ej}=tKI1KBdo*`HH@#Z|MiHU+5a$l$u9XlWH`c zK=7{_qedJM-KIQsNF7$aYCxS(!|IgEs3}##TotjX>gv4IH5zZIi|Vb2hb!HUm(>;Z zf%;f|roK>D)pzPg^>fs5UHzth2fwBMmdtKrkI`zx4ae|}3r3@H(YOTU-`mEDam9Go zcwh8Kz-z*;8#iS9Loloj@lWG6a%67IZOyl#euuept?Oa)adVfbCxQE-{K2*PMx)*I z&A{w7`^-Ue$b89s#msJ)-FnA=Uorh3*Daeh^L6u0^Ah@2r1vj#G`4xaFYnMid-Wc< z&0SloZ=yB6kNp&}Ut>37H)FSA+vy>)Ms!Y>ZJh~p+0mH_67B?`-x_hA#rPb8$Ed1r zorVqlv;(PrMB4H5_}qj{VmN~6UYEx~2gw?Bg6(AOk3;zdfX$G$<6Z~%cnnES33$xp zbi?TBfhg<*RHBYNxX0i~wIk(ee{%2BPQ1MfMK};P8%cY~yw%A~T#W7lKb$;cIyuSt zzzw`0k&l);jH&^84d|W&@V=>20NZBi2-*&FTMBGXxG$I#ObK={I&nrxOV3fL1gE4v zx}`3%I+2oR<(m>RxJvj0lHrpH8CoR+tAv-8DPB>?^Q(ki$RRuiA8;Du7S~|mL@AU- zzGuivveSH|xK8VGLRSM@2TUDMFQm3EyLuTq8EOyI4`~uKrGo-@bm%Hx0iA`XIv}f` z9+Ve@tYZs^CBz(J1~E$qk34m>wY#k+{><3e`1qMK6BCoYxxT5X>FIpFP$(8lrE+;@ zrc#-mtybse=I0j{78jS6&YrE+mY3`Gb9~V+BVe>(o-nXG$M{jiN_Q`qSeRm#1UO7G zhy)X#f$z)_yB(=@#6Cxybi{5)>~_O7#cEgT-SG9`FA2Aa4=r;7G*JZL&2xBR4!0xl zI`G1edV$y%R3=_M#J5{Z_`d7cb&Iaq@p!zh+qKu`4Y%`M-+#`#-<)-l*aKVFl6Bn$ zCq~><;D>t_;K_&^P1|+dsjHsOO0g>{5h+iU9jSyUH&humIk;MF{{UcUdaVEe delta 424 zcmXYqO(?^09LAr=-k7Ofw$}bm4#-=HZ6aexLz)$bMQfAxQcEqFl!#oUlzxts3sbgZJl}+4H&bscD5E_0cg|h>f9V`hzv>euZs9YB7;Imn!fg&7BoDg^`geEsx33EUC;usLmP({ cMwMJH3CqHwkQWw^NF!KoGI^eJUr8W1q4A~Xe}3oO|GW3S)3#Bxq8<&% zi$Y*=s+`RhH^#3Abxk|pdv$Cuc*E@MvVu$bvRld6K{s1=^2Lk|2>IbeATWYjoPqa; zs}?;tLZ+iQMxL{1f{GUD>_Cjx`Y}XR0u!V+k;V)Pali_gSg5BU7uzfr$Au=k|) zeHE{m2ReKG|Bkx@vHx^Z{~^yAJmh_UGo#V!nd5X(hvpbeWn4NUCLN(jppG=;kmxLNU9%$W zv{=I2GFdE#{>nuVOVw7TxI(mpY zDLpK;TWW;W&?HMFN%m8(i!1gg=>?L#RK#^#iOHN(E=01Ps7S{&PJY`7M`S)Q)qE>{zKYn;qzAIN& Gm3{-!zWO`> literal 0 HcmV?d00001 diff --git a/.terminfo/s/screen-bce b/.terminfo/s/screen-bce new file mode 100644 index 0000000000000000000000000000000000000000..5e50b45deaf323c2b1031763f2d52adf34576d9a GIT binary patch literal 1468 zcmchWJxo(k6vxl4M$jm*m?$rj#^fa+6yH}VO=Am)5rkRK(G$-%)Gjfs?8fNzpss1>yRVM)2XC0|9aeD3F1wWpC+KF&1-l4Xw%uG1ULqks zoB&dp$o6famld@V>v9(Qx(5(Lg4kq{pd- zPLPsTZMCGU(=oMVsMBRM%vngElD>j8fZ)8x)JMnIfk+r(2Y(CPW94L(179R1DO(P7 z2$7^ZXt)5;SrWQtMcHYwM7U+LSOuy_DzHcoZ(y+)a@~MI!Nav^XbsXWsJTT-st3X6 z7&=$i5W|QObo4MfX+0vfQ)-me&?HNQqYDnwn5c9jY7C)fl4=G<`IH zmX9Vd;-du&tFZ!`qpDk{X6w}$DSdR5T3g%NLZS9{P0M5^CT3=4XLC8*&gbXm9H&qy z7U$i%?)z!7N_4SR7&CM+y$v7#^J^sust__}f+K{aC@57A7 RtSEnf{P3oHSFWro{RXN&{?z~g literal 0 HcmV?d00001 -- 2.7.4