Mercurial > mxe-octave

annotate src/termcap-1-fixes.patch @ 4611:504cb71a29a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
termcap: use cygwin term def from termcap pkg, not msys
author John W. Eaton <jwe@octave.org>
date Thu, 01 Mar 2018 13:25:38 -0500
parents cd94e0f04e87
children
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
4611
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
20 +++ b/termcap.c 2018-03-01 13:16:17.960763846 -0500
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
21 @@ -120,6 +120,26 @@
4609
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 \
4611
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
27 + "cygwin:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
28 + :am:bs:mi:ms:xo:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
29 + :Co#8:NC#3:co#80:li#25:pa#64:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
30 + :@7=\\E[4~:AB=\\E[4%dm:AF=\\E[3%dm:F1=\\E[23~:F2=\\E[24~:\
4609
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
31 + :F3=\\E[25~:F4=\\E[26~:F5=\\E[28~:F6=\\E[29~:F7=\\E[31~:\
4611
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
32 + :F8=\\E[32~:F9=\\E[33~:FA=\\E[34~:S2=\\E[11m:S3=\\E[10m:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
33 + :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,\021+^P0\333p\304r\304y\363z\362{\343|\330}\234:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
34 + :ae=\\E[10m:as=\\E[11m:cl=\\E[2J:cm=\\E[%i%d;%dH:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
35 + :do=\\E[B:ho=\\E[H:is=\\E[m\\E[?7h:k1=\\E[[A:k2=\\E[[B:k3=\\E[[C:\
4609
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
36 + :k4=\\E[[D:k5=\\E[[E:k6=\\E[17~:k7=\\E[18~:k8=\\E[19~:\
4611
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
37 + :k9=\\E[20~:k;=\\E[21~:kD=\\E[3~:kI=\\E[2~:kN=\\E[6~:kP=\\E[5~:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
38 + :kd=\\E[B:kh=\\E[1~:kl=\\E[D:kr=\\E[C:ku=\\E[A:le=^H:mb=\\E[5m:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
39 + :md=\\E[1m:me=\\E[0;10m:mk=\\E[8m:mr=\\E[7m:nd=\\E[C:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
40 + :op=\\E[37;40m:pk=\\E[0;%+\:;\"%s\":rc=\\E[u:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
41 + :..sa=\\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
42 + :sc=\\E[s:se=\\E[m:so=\\E[7m:u6=\\E[%i%d;%dR:u7=\\E[6n:ue=\\E[m:\
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
43 + :up=\\E[A:us=\\E[4m:"
4609
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
44 +
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
45 /* 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
46
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
47 /* The pointer to the data made by tgetent is left here
4611
504cb71a29a9 termcap: use cygwin term def from termcap pkg, not msys
John W. Eaton <jwe@octave.org>
parents: 4609
diff changeset
48 @@ -464,7 +484,7 @@
4609
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
49 #ifdef INTERNAL_TERMINAL
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
50 /* 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
51 so fake it. */
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
52 - if (!strcmp (name, "internal"))
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
53 + if (!strcmp (name, "cygwin"))
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
54 {
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
55 term = INTERNAL_TERMINAL;
cd94e0f04e87 termcap: embed cygwin terminal definition in library
John W. Eaton <jwe@octave.org>
parents: 2904
diff changeset
56 if (!bp)