Skip to content

Commit ab1c007

Browse files
committed
We partially 'restored' terminfo functions with commit 22c4d82, but it was a very partial restoration : terminfo.c was not actually compiled/linked into the library on most platforms. Reported by Pavel Stehule, issue Bill-Gray#253.
1 parent 723e6e4 commit ab1c007

File tree

14 files changed

+37
-7
lines changed

14 files changed

+37
-7
lines changed

common/libobjs.mif

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PDCURSES_CURSES_H = $(PDCURSES_SRCDIR)/curses.h
55
PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)/curspriv.h
66
PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
77
PANEL_HEADER = $(PDCURSES_SRCDIR)/panel.h
8+
TERM_HEADER = $(PDCURSES_SRCDIR)/term.h
89

910
srcdir = $(PDCURSES_SRCDIR)/pdcurses
1011
demodir = $(PDCURSES_SRCDIR)/demos
@@ -15,7 +16,7 @@ getch.$(O) getstr.$(O) getyx.$(O) inch.$(O) inchstr.$(O) \
1516
initscr.$(O) inopts.$(O) insch.$(O) insstr.$(O) instr.$(O) kernel.$(O) \
1617
keyname.$(O) mouse.$(O) move.$(O) outopts.$(O) overlay.$(O) pad.$(O) \
1718
panel.$(O) printw.$(O) refresh.$(O) scanw.$(O) scr_dump.$(O) scroll.$(O) \
18-
slk.$(O) termattr.$(O) touch.$(O) util.$(O) window.$(O) debug.$(O)
19+
slk.$(O) termattr.$(O) terminfo.$(O) touch.$(O) util.$(O) window.$(O) debug.$(O)
1920

2021
PDCOBJS = pdcclip.$(O) pdcdisp.$(O) pdcgetsc.$(O) pdckbd.$(O) pdcscrn.$(O) \
2122
pdcsetsc.$(O) pdcutil.$(O)

common/watcom.mif

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj &
9595
getch.obj getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj &
9696
insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj &
9797
outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj &
98-
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj &
98+
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj &
9999
touch.obj util.obj window.obj debug.obj
100100

101101
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj &

dos/Makefile.dmc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h
1212
PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
1313

1414
PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h
15+
TERM_HEADER = $(PDCURSES_SRCDIR)\term.h
1516

1617
srcdir = $(PDCURSES_SRCDIR)\pdcurses
1718
osdir = $(PDCURSES_SRCDIR)\dos
@@ -52,7 +53,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
5253
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
5354
insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
5455
outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
55-
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
56+
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
5657
touch.obj util.obj window.obj debug.obj
5758

5859
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -66,6 +67,7 @@ testcurs.obj test_pan.obj tuidemo.obj widetest.obj worm.obj xmas.obj tui.obj
6667
$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
6768
$(PDCOBJS) : $(PDCURSES_DOS_H)
6869
panel.obj ptest.obj: $(PANEL_HEADER)
70+
terminfo.obj: $(TERM_HEADER)
6971

7072
$(DEMOOBJS) : $(PDCURSES_CURSES_H)
7173
$(DEMOS) : $(LIBCURSES)
@@ -185,6 +187,9 @@ slk.obj: $(srcdir)\slk.c
185187
termattr.obj: $(srcdir)\termattr.c
186188
$(SRCBUILD)
187189

190+
terminfo.obj: $(srcdir)\terminfo.c
191+
$(SRCBUILD)
192+
188193
touch.obj: $(srcdir)\touch.c
189194
$(SRCBUILD)
190195

os2/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ $(LIBOBJS) $(PDCOBJS) $(DEMOOBJS) : $(PDCURSES_HEADERS)
101101
$(PDCOBJS) : $(PDCURSES_OS2_H)
102102
$(DEMOS) : $(LIBCURSES)
103103
panel.o ptest.o: $(PANEL_HEADER)
104+
terminfo.o: $(TERM_HEADER)
104105

105106
$(LIBOBJS) : %.o: $(srcdir)/%.c
106107
$(CC) -c $(CFLAGS) -o$@ $<

os2/Makefile.bcc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
5353
+inopts.obj +insch.obj +insstr.obj +instr.obj +kernel.obj +keyname.obj \
5454
+mouse.obj +move.obj +outopts.obj +overlay.obj +pad.obj +panel.obj \
5555
+printw.obj +refresh.obj +scanw.obj +scr_dump.obj +scroll.obj +slk.obj \
56-
+termattr.obj +touch.obj +util.obj +window.obj +debug.obj \
56+
+termattr.obj +terminfo.obj +touch.obj +util.obj +window.obj +debug.obj \
5757
+pdcclip.obj +pdcdisp.obj +pdcgetsc.obj +pdckbd.obj +pdcscrn.obj \
5858
+pdcsetsc.obj +pdcutil.obj ,lib.map
5959
-copy $(LIBCURSES) panel.lib

os2/iccos2.lrf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
-+scroll.obj &
3535
-+slk.obj &
3636
-+termattr.obj &
37+
-+terminfo.obj &
3738
-+touch.obj &
3839
-+util.obj &
3940
-+window.obj &

os2/iccos2.mak

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ slk.obj: $(srcdir)\slk.c $(PDCURSES_HEADERS)
160160
termattr.obj: $(srcdir)\termattr.c $(PDCURSES_HEADERS)
161161
$(BUILD) $(srcdir)\termattr.c
162162

163+
terminfo.obj: $(srcdir)\terminfo.c $(PDCURSES_HEADERS) $(TERM_HEADER)
164+
$(BUILD) $(srcdir)\terminfo.c
165+
163166
touch.obj: $(srcdir)\touch.c $(PDCURSES_HEADERS)
164167
$(BUILD) $(srcdir)\touch.c
165168

sdl1/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
9999
$(PDCOBJS) : $(PDCURSES_SDL_H)
100100
$(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
101101
tui.o tuidemo.o : $(PDCURSES_CURSES_H)
102+
terminfo.o : $(TERM_HEADER)
102103
panel.o ptest: $(PANEL_HEADER)
103104

104105
$(LIBOBJS) : %.o: $(srcdir)/%.c

vt/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ endif
124124
$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
125125
$(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
126126
tui.o tuidemo.o : $(PDCURSES_CURSES_H)
127+
terminfo.o : $(TERM_HEADER)
127128
panel.o ptest: $(PANEL_HEADER)
128129

129130
$(LIBOBJS) : %.o: $(srcdir)/%.c

vt/Makefile.dmc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h
1212
PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
1313

1414
PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h
15+
TERM_HEADER = $(PDCURSES_SRCDIR)\term.h
1516

1617
srcdir = $(PDCURSES_SRCDIR)\pdcurses
1718
osdir = $(PDCURSES_SRCDIR)\vt
@@ -55,7 +56,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
5556
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
5657
insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
5758
outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
58-
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
59+
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
5960
touch.obj util.obj window.obj debug.obj
6061

6162
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -68,6 +69,7 @@ testcurs.obj test_pan.obj tuidemo.obj widetest.obj worm.obj xmas.obj tui.obj
6869
$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
6970
$(PDCOBJS) : $(PDCURSES_VT_H)
7071
panel.obj ptest.obj: $(PANEL_HEADER)
72+
terminfo.obj: $(TERM_HEADER)
7173

7274
$(DEMOOBJS) : $(PDCURSES_CURSES_H)
7375
$(DEMOS) : $(LIBCURSES)
@@ -187,6 +189,9 @@ slk.obj: $(srcdir)\slk.c
187189
termattr.obj: $(srcdir)\termattr.c
188190
$(SRCBUILD)
189191

192+
terminfo.obj: $(srcdir)\terminfo.c
193+
$(SRCBUILD)
194+
190195
touch.obj: $(srcdir)\touch.c
191196
$(SRCBUILD)
192197

vt/Makefile.vc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ $(PDCOBJS) : $(PDCURSES_WIN_H)
101101
$(DEMOOBJS) : $(PDCURSES_CURSES_H)
102102
$(DEMOS) : $(LIBCURSES)
103103
panel.obj : $(PANEL_HEADER)
104+
terminfo.obj : $(TERM_HEADER)
104105

105106
!ifndef DLL
106107
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)

wincon/Makefile.dmc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h
1212
PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
1313

1414
PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h
15+
TERM_HEADER = $(PDCURSES_SRCDIR)\term.h
1516

1617
srcdir = $(PDCURSES_SRCDIR)\pdcurses
1718
osdir = $(PDCURSES_SRCDIR)\wincon
@@ -50,7 +51,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
5051
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
5152
insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
5253
outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
53-
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
54+
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
5455
touch.obj util.obj window.obj debug.obj
5556

5657
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -65,6 +66,7 @@ LIBS = winmm.lib
6566
$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
6667
$(PDCOBJS) : $(PDCURSES_WIN_H)
6768
panel.obj ptest.obj: $(PANEL_HEADER)
69+
term.obj : $(TERM_HEADER)
6870

6971
$(DEMOOBJS) : $(PDCURSES_CURSES_H)
7072
$(DEMOS) : $(LIBCURSES)
@@ -185,6 +187,9 @@ slk.obj: $(srcdir)\slk.c
185187
termattr.obj: $(srcdir)\termattr.c
186188
$(SRCBUILD)
187189

190+
terminfo.obj: $(srcdir)\terminfo.c
191+
$(SRCBUILD)
192+
188193
touch.obj: $(srcdir)\touch.c
189194
$(SRCBUILD)
190195

wingui/Makefile.dmc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h
1212
PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
1313

1414
PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h
15+
TERM_HEADER = $(PDCURSES_SRCDIR)\term.h
1516

1617
srcdir = $(PDCURSES_SRCDIR)\pdcurses
1718
osdir = $(PDCURSES_SRCDIR)\wingui
@@ -51,7 +52,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
5152
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
5253
insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
5354
outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
54-
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
55+
scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
5556
touch.obj util.obj window.obj debug.obj
5657

5758
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -66,6 +67,7 @@ LIBS = advapi32.lib gdi32.lib user32.lib shell32.lib comdlg32.lib winmm.lib
6667
$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
6768
$(PDCOBJS) : $(PDCURSES_WIN_H)
6869
panel.obj ptest.obj: $(PANEL_HEADER)
70+
terminfo.obj : $(TERM_HEADER)
6971

7072
$(DEMOOBJS) : $(PDCURSES_CURSES_H)
7173
$(DEMOS) : $(LIBCURSES)
@@ -186,6 +188,9 @@ slk.obj: $(srcdir)\slk.c
186188
termattr.obj: $(srcdir)\termattr.c
187189
$(SRCBUILD)
188190

191+
terminfo.obj: $(srcdir)\terminfo.c
192+
$(SRCBUILD)
193+
189194
touch.obj: $(srcdir)\touch.c
190195
$(SRCBUILD)
191196

wingui/Makefile.vc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ $(PDCOBJS) : $(PDCURSES_WIN_H)
101101
$(DEMOOBJS) : $(PDCURSES_CURSES_H)
102102
$(DEMOS) : $(LIBCURSES)
103103
panel.obj : $(PANEL_HEADER)
104+
terminfo.obj : $(TERM_HEADER)
104105

105106
!ifndef DLL
106107
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)

0 commit comments

Comments
 (0)