annotate src/termcap-1-fixes.patch @ 4609:cd94e0f04e87

termcap: embed cygwin terminal definition in library
author John W. Eaton <jwe@octave.org>
date Wed, 28 Feb 2018 11:27:28 -0500
parents 1122ae1e98b6
children 504cb71a29a9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2904
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 --- a/Makefile.in 1995-08-16 20:54:29.000000000 -0400
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 +++ b/Makefile.in 2012-12-05 11:45:11.124478718 -0500
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 @@ -75,8 +75,6 @@
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 $(INSTALL_DATA) libtermcap.a $(libdir)/libtermcap.a
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 -$(RANLIB) $(libdir)/libtermcap.a
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 cd $(srcdir); $(INSTALL_DATA) termcap.h $(includedir)/termcap.h
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 - -cd $(srcdir); test -z "$(oldincludedir)" || \
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - $(INSTALL_DATA) termcap.h $(oldincludedir)/termcap.h
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 cd $(srcdir); for f in termcap.info*; \
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 do $(INSTALL_DATA) $$f $(infodir)/$$f; done
1122ae1e98b6 New rules for termcap package.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
4609
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
12
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
13 Note that CE is missing from this entry because it causes
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
14 trouble for Octave. Instead of performing the action, it
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
15 is echoed to the terminal window when Readline tputs it to
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
16 the terminal.
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
17
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
18 diff -uNr a/termcap.c b/termcap.c
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
19 --- a/termcap.c 2002-02-25 12:59:21.000000000 -0500
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
20 +++ b/termcap.c 2018-02-28 11:11:16.340155579 -0500
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
21 @@ -120,6 +120,32 @@
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
22 }
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
23 #endif /* not emacs */
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
24
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
25 +
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
26 +#define INTERNAL_TERMINAL \
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
27 +"cygwin:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
28 + :am:bs:eo:mi:ms:ut:xn@:op=\E[39;49m:xo:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
29 + :Co#8:co#80:it#8:li#25:pa#64:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
30 + :&7=^Z:@7=\\E[4~:kh=\\E[1~:kH=\\E[4~:AB=\\E[4%dm:AF=\\E[3%dm:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
31 + :AL=\\E[%dL:DC=\\E[%dP:DL=\\E[%dM:F1=\\E[23~:F2=\\E[24~:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
32 + :F3=\\E[25~:F4=\\E[26~:F5=\\E[28~:F6=\\E[29~:F7=\\E[31~:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
33 + :F8=\\E[32~:F9=\\E[33~:FA=\\E[34~:IC=\\E[%d@:K2=\\E[G:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
34 + :Km=\\E[M:S2=\\E[11m:S3=\\E[10m:Sb=\\E[%+(m:Sf=\\E[%+^^m:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
35 + :ac=`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~q\304r\362s_t\303u\264v\301w\302x\263y\371z\372{\373|\374}\375~\376.\031-\030\054\021+^P0\333:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
36 + :ae=\\E[10m:al=\\E[L:as=\\E[11m:bl=^G:cd=\\E[J:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
37 + :cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:cr=^M:cs=\\E[%i%d;%dr:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
38 + :ct=\\E[3g:dc=\\E[P:dl=\\E[M:do=^J:ei=\\E[4l:ho=\\E[H:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
39 + :ic=\\E[@:im=\\E[4h:k1=\\E[[A:k2=\\E[[B:k3=\\E[[C:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
40 + :k4=\\E[[D:k5=\\E[[E:k6=\\E[17~:k7=\\E[18~:k8=\\E[19~:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
41 + :k9=\\E[20~:k;=\\E[21~:kD=\\E[3~:kI=\\E[2~:kN=\\E[6~:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
42 + :kP=\\E[5~:kb=^H:kd=\\E[B:kh=\\E[1~:kl=\\E[D:kr=\\E[C:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
43 + :ku=\\E[A:le=^H:mb=\\E[5m:md=\\E[1m:me=\\E[0;10m:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
44 + :mr=\\E[7m:nd=\\E[C:nw=^M^J:op=\\E[37;40m:r1=\\Ec:rc=\\E8:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
45 + :sc=\\E7:se=\\E[m:sf=^J:so=\\E[7m:sr=\\EM:st=\\EH:ta=^I:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
46 + :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
47 + :u6=\\E[%d;%dR:u7=\\E[6n:u8=\\E[?6c:u9=\\E[c:ue=\\E[24m:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
48 + :up=\\E[A:us=\\E[4m:vb=\\E[?5h\\E[?5l:ve=\\E[?25h:\
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
49 + :vi=\\E[?25l:";
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
50 +
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
51 /* Looking up capabilities in the entry already found. */
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
52
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
53 /* The pointer to the data made by tgetent is left here
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
54 @@ -464,7 +490,7 @@
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
55 #ifdef INTERNAL_TERMINAL
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
56 /* For the internal terminal we don't want to read any termcap file,
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
57 so fake it. */
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
58 - if (!strcmp (name, "internal"))
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
59 + if (!strcmp (name, "cygwin"))
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
60 {
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
61 term = INTERNAL_TERMINAL;
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
62 if (!bp)