New port: DOSVGA

README.md

@@ -36,6 +36,7 @@ platforms.
 Build instructions are in the README.md file for each platform:
 
 -  [DOS]
+-  [DOS with full VGA support]
 -  [OS/2]
 -  [SDL 1.x]
 -  [SDL 2.x]
@@ -58,6 +59,7 @@ William McBrine <[email protected]>
 [History]: docs/HISTORY.md
 [docs]: docs/README.md
 [DOS]: dos/README.md
+[DOS with full VGA support]: dosvga/README.md
 [OS/2]: os2/README.md
 [SDL 1.x]: sdl1/README.md
 [SDL 2.x]: sdl2/README.md

demos/testcurs.c

@@ -25,6 +25,9 @@
 
 #if HAVE_WIDE
 # include <wchar.h>
+# ifdef __DJGPP__
+static size_t wcslen(const wchar_t *);
+# endif
 #endif
 
 #if defined(PDCURSES) && !defined(XCURSES)
@@ -1209,7 +1212,7 @@ void gradient(int tmarg)
         move(tmarg + 3 + i, (COLS - 69) / 2);
         for (j = 0; j < len; j++)
         {
-            const int oval = j * 1000 / len;
+            const int oval = (int)(j * 1000L / len);
             const int reverse = 1000 - oval;
 
             if (!i)
@@ -1380,3 +1383,13 @@ void display_menu(int old_option, int new_option)
              "Use Up and Down Arrows to select - Enter to run - Q to quit");
     refresh();
 }
+
+#if HAVE_WIDE && defined(__DJGPP__)
+/* wide character function missing in DJGPP */
+static size_t wcslen(const wchar_t *str)
+{
+    size_t i;
+    for (i = 0; str[i] != L'\0'; ++i) {}
+    return i;
+}
+#endif

dosvga/Makefile

@@ -0,0 +1,89 @@
+# GNU Makefile for PDCurses - DOS
+#
+# Usage: make [-f path\Makefile] [DEBUG=Y] [WIDE=Y] [target]
+#
+# where target can be any of:
+# [all|libs|demos|pdcurses.a|testcurs.exe...]
+
+O = o
+E = .exe
+RM = del
+
+ifndef PDCURSES_SRCDIR
+	PDCURSES_SRCDIR = ..
+endif
+
+include $(PDCURSES_SRCDIR)/common/libobjs.mif
+
+osdir		= $(PDCURSES_SRCDIR)/dosvga
+
+PDCURSES_DOS_H	= $(osdir)/pdcdos.h
+
+CC		= gcc
+
+ifeq ($(DEBUG),Y)
+	CFLAGS  = -g -Wall -DPDCDEBUG
+	LDFLAGS = -g
+else
+	CFLAGS  = -O2 -Wall
+	LDFLAGS =
+endif
+
+CFLAGS += -I$(PDCURSES_SRCDIR)
+
+ifeq ($(WIDE),Y)
+	CFLAGS += -DPDC_WIDE
+endif
+
+LINK		= gcc
+
+LIBEXE		= ar
+LIBFLAGS	= rcv
+
+LIBCURSES	= pdcurses.a
+
+.PHONY: all libs clean demos dist
+
+all:	libs
+
+libs:	$(LIBCURSES)
+
+clean:
+	-$(RM) *.o
+	-$(RM) *.a
+	-$(RM) *.exe
+
+demos:	$(DEMOS)
+ifneq ($(DEBUG),Y)
+	strip *.exe
+endif
+
+$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+	$(LIBEXE) $(LIBFLAGS)S $@ addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o clear.o color.o debug.o delch.o deleteln.o
+	$(LIBEXE) $(LIBFLAGS)S $@ getch.o getstr.o getyx.o inch.o inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o keyname.o
+	$(LIBEXE) $(LIBFLAGS)S $@ mouse.o move.o outopts.o overlay.o pad.o panel.o pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o pdcsetsc.o
+	$(LIBEXE) $(LIBFLAGS)  $@ pdcutil.o printw.o refresh.o scanw.o scr_dump.o scroll.o slk.o termattr.o touch.o util.o window.o
+
+$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
+$(PDCOBJS) : $(PDCURSES_DOS_H)
+$(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
+panel.o : $(PANEL_HEADER)
+
+$(LIBOBJS) : %.o: $(srcdir)/%.c
+	$(CC) -c $(CFLAGS) $<
+
+$(PDCOBJS) : %.o: $(osdir)/%.c
+	$(CC) -c $(CFLAGS) $<
+
+firework.exe ozdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \
+ptest.exe: %.exe: $(demodir)/%.c
+	$(CC) $(CFLAGS) -o$@ $< $(LIBCURSES)
+
+tuidemo.exe: tuidemo.o tui.o
+	$(LINK) $(LDFLAGS) -o$@ tuidemo.o tui.o $(LIBCURSES)
+
+tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H)
+	$(CC) -c $(CFLAGS) -I$(demodir) -o$@ $<
+
+tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H)
+	$(CC) -c $(CFLAGS) -I$(demodir) -o$@ $<

dosvga/Makefile.bcc

@@ -0,0 +1,82 @@
+# Borland Makefile for PDCurses - DOS
+#
+# Usage: make -f [path\]Makefile.bcc [DEBUG=] [WIDE=Y] [MODEL=c|h|l|m|s] [target]
+#
+# where target can be any of:
+# [all|demos|pdcurses.lib|testcurs.exe...]
+
+!ifndef MODEL
+MODEL = l
+!endif
+
+O = obj
+E = .exe
+RM = del
+
+!ifndef PDCURSES_SRCDIR
+PDCURSES_SRCDIR = ..
+!endif
+
+!include $(PDCURSES_SRCDIR)\common\libobjs.mif
+
+osdir		= $(PDCURSES_SRCDIR)\dosvga
+
+!ifdef DEBUG
+CFLAGS		= -N -v -y -DPDCDEBUG
+!else
+CFLAGS		= -O
+!endif
+
+!ifdef WIDE
+WIDEOPT		= -DPDC_WIDE
+!else
+WIDEOPT		=
+!endif
+
+CPPFLAGS	= -I$(PDCURSES_SRCDIR)
+
+BUILD		= $(CC) -1- -G -d -w-par -c -m$(MODEL) $(CFLAGS) $(CPPFLAGS) $(WIDEOPT)
+
+LIBEXE		= tlib /C /E
+
+LIBCURSES	= pdcurses.lib
+
+all:	$(LIBCURSES)
+
+clean:
+	-$(RM) *.obj
+	-$(RM) *.lib
+	-$(RM) *.map
+	-$(RM) *.exe
+
+demos:	$(LIBCURSES) $(DEMOS)
+
+$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+	-$(RM) $@
+	$(LIBEXE) $@ @$(PDCURSES_SRCDIR)\common\borland.lrf
+
+.autodepend
+
+{$(srcdir)\}.c.obj:
+	$(BUILD) $<
+
+{$(osdir)\}.c.obj:
+	$(BUILD) $<
+
+{$(demodir)\}.c.obj:
+	$(BUILD) $<
+
+.c.obj:
+	$(BUILD) $<
+
+.obj.exe:
+	$(CC) -m$(MODEL) -e$@ $** $(LIBCURSES)
+
+tuidemo.exe:	tuidemo.obj tui.obj $(LIBCURSES)
+	$(CC) -m$(MODEL) -e$@ $**
+
+tui.obj: $(demodir)\tui.c $(demodir)\tui.h $(PDCURSES_CURSES_H)
+	$(BUILD) -I$(demodir) $(demodir)\tui.c
+
+tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
+	$(BUILD) -I$(demodir) $(demodir)\tuidemo.c

dosvga/Makefile.wcc

@@ -0,0 +1,39 @@
+# Watcom Makefile for PDCurses - DOS
+#
+# Usage: wmake -f [path\]Makefile.wcc [DEBUG=Y] [WIDE=Y] [MODEL=c|h|l|m|s|f] [target]
+#
+# where target can be any of:
+# [all|demos|pdcurses.lib|testcurs.exe...]
+
+!ifndef MODEL
+MODEL		= l
+!endif
+
+!ifdef %PDCURSES_SRCDIR
+PDCURSES_SRCDIR	= $(%PDCURSES_SRCDIR)
+!else
+PDCURSES_SRCDIR	= ..
+!endif
+
+osdir		= $(PDCURSES_SRCDIR)/dosvga
+
+!ifeq MODEL f
+CC		= wcc386
+TARGET		= dos4g
+!else
+CC		= wcc
+TARGET		= dos
+!endif
+
+CFLAGS		= -bt=$(TARGET) -m$(MODEL)
+
+!ifeq WIDE Y
+CFLAGS		+= -DPDC_WIDE
+!endif
+
+!include $(PDCURSES_SRCDIR)/common/watcom.mif
+
+$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+	%write wccdos.lrf $(LIBOBJS) $(PDCOBJS)
+	$(LIBEXE) $@ @wccdos.lrf
+	-$(RM) wccdos.lrf

dosvga/README.md

@@ -0,0 +1,58 @@
+PDCurses for DOS
+================
+
+This directory contains PDCurses source code files specific to the
+VGA-capable DOS port.
+
+
+Building
+--------
+
+- Choose the appropriate makefile for your compiler:
+
+        Makefile     - DJGPP
+        Makefile.bcc - Borland C++
+        Makefile.wcc - Watcom
+
+- For 16-bit compilers, you can change the memory MODEL as a command-
+  line option. (Large model is the default, and recommended.) With
+  Watcom, specifying "MODEL=f" (flat) will automatically switch to a
+  32-bit build.
+
+- Optionally, you can build in a different directory than the platform
+  directory by setting PDCURSES_SRCDIR to point to the directory where
+  you unpacked PDCurses, and changing to your target directory:
+
+        set PDCURSES_SRCDIR=c:\pdcurses
+
+- Build it:
+
+        make -f makefile
+
+  (For Watcom, use "wmake" instead of "make".) You'll get the library
+  (pdcurses.lib or .a, depending on your compiler) and a lot of object
+  files. Add the target "demos" to build the sample programs.
+
+  You can also give the optional parameter "WIDE=Y", to build the
+  library with wide-character (Unicode) support:
+
+        wmake -f Makefile.wcc WIDE=Y
+
+  (WIDE=Y is untested on the Borland compiler.)
+
+The font can be set via the environment variable PDC_FONT. The font must
+be in the PSF format, version 2.
+
+
+Distribution Status
+-------------------
+
+The files in this directory are released to the public domain.
+
+
+Acknowledgements
+----------------
+
+Watcom C port was provided by Pieter Kunst <[email protected]>
+
+DJGPP port was provided by David Nugent <[email protected]>