diff --git a/IMPLEMNT.md b/IMPLEMNT.md index a549f287..0771f85a 100644 --- a/IMPLEMNT.md +++ b/IMPLEMNT.md @@ -203,13 +203,14 @@ except checking for values out of range and null pointers. The non-portable functionality of reset_prog_mode() is handled here -- whatever's not done in _restore_mode(). In current ports: In OS/2, this -sets the keyboard to binary mode; in Win32, it enables or disables the -mouse pointer to match the saved mode; in others it does nothing. +sets the keyboard to binary mode; in Windows conosle, it enables or +disables the mouse pointer to match the saved mode; in others it does +nothing. ### void PDC_reset_shell_mode(void); -The same thing, for reset_shell_mode(). In OS/2 and Win32, it restores -the default console mode; in others it does nothing. +The same thing, for reset_shell_mode(). In OS/2 and Windows console, it +restores the default console mode; in others it does nothing. ### int PDC_resize_screen(int nlines, int ncols); diff --git a/README.md b/README.md index 2ad6ba31..cbd4a97e 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ This software is provided AS IS with NO WARRANTY whatsoever. Ports ----- -PDCurses has been ported to DOS, OS/2, Win32, X11 and SDL. A directory -containing the port-specific source files exists for each of these +PDCurses has been ported to DOS, OS/2, Windows, X11 and SDL. A directory +containing the port-specific source files exists for each of these platforms. Build instructions are in the README file for each platform: @@ -38,7 +38,7 @@ Build instructions are in the README file for each platform: - [OS/2](os2/README.md) - [SDL](sdl1/README.md) - [SDL2](sdl2/README.md) -- [Win32](win32/README.md) +- [Windows](win32/README.md) - [X11](x11/README.md) Distribution Status diff --git a/curses.h b/curses.h index 78cf64ee..258edeb1 100644 --- a/curses.h +++ b/curses.h @@ -15,7 +15,7 @@ PDCurses definitions list: (Only define those needed) PDC_RGB True if you want to use RGB color definitions (Red = 1, Green = 2, Blue = 4) instead of BGR. PDC_WIDE True if building wide-character support. - PDC_DLL_BUILD True if building a Win32 DLL. + PDC_DLL_BUILD True if building a Windows DLL. NCURSES_MOUSE_VERSION Use the ncurses mouse API instead of PDCurses' traditional mouse API. diff --git a/demos/newdemo.c b/demos/newdemo.c index df26daf2..31c765a2 100644 --- a/demos/newdemo.c +++ b/demos/newdemo.c @@ -327,8 +327,8 @@ int main(int argc, char **argv) init_pair(5, COLOR_BLUE, COLOR_WHITE); wattrset(win, COLOR_PAIR(5) | A_BLINK); - mvwaddstr(win, height - 2, 3, - " PDCurses 3.4 - DOS, OS/2, Win32, X11, SDL"); + mvwaddstr(win, height - 2, 2, + " PDCurses 3.4 - DOS, OS/2, Windows, X11, SDL"); wrefresh(win); /* Draw running messages */ diff --git a/doc/sdl.md b/doc/sdl.md index 17625bf8..5e20e7f0 100644 --- a/doc/sdl.md +++ b/doc/sdl.md @@ -3,7 +3,7 @@ SDL Considerations There are no special requirements to use PDCurses for SDL -- all PDCurses-compatible code should work fine. (In fact, you can even build -against the Win32 console pdcurses.dll, and then swap in the SDL +against the Windows console pdcurses.dll, and then swap in the SDL pdcurses.dll.) Nothing extra is needed beyond the base SDL library. However, there are some optional special features, described here. diff --git a/dos/pdcsetsc.c b/dos/pdcsetsc.c index 13114fdd..bbf66b6d 100644 --- a/dos/pdcsetsc.c +++ b/dos/pdcsetsc.c @@ -24,7 +24,7 @@ pdcsetsc PDC_set_title() sets the title of the window in which the curses program is running. This function may not do anything on some - platforms. (Currently it only works in Win32 and X11.) + platforms. ### Portability X/Open BSD SYS V diff --git a/libobjs.mif b/libobjs.mif index 080709c2..f687327c 100644 --- a/libobjs.mif +++ b/libobjs.mif @@ -1,4 +1,4 @@ -# Common elements for most of the DOS, OS/2 and Win32 +# Common elements for most of the DOS, OS/2 and Windows # makefiles (not Watcom) PDCURSES_CURSES_H = $(PDCURSES_SRCDIR)/curses.h diff --git a/makedist.mif b/makedist.mif index 318148b0..4c5f5756 100644 --- a/makedist.mif +++ b/makedist.mif @@ -1,5 +1,5 @@ # Makefile include: build a binary archive with Info-ZIP -# under DOS, OS/2 or Win32 +# under DOS, OS/2 or Windows dist: $(PDCLIBS) echo PDCurses $(VERDOT) for $(PLATFORM1) > file_id.diz diff --git a/os2/pdcsetsc.c b/os2/pdcsetsc.c index 406aa4fe..27b7db00 100644 --- a/os2/pdcsetsc.c +++ b/os2/pdcsetsc.c @@ -24,7 +24,7 @@ pdcsetsc PDC_set_title() sets the title of the window in which the curses program is running. This function may not do anything on some - platforms. (Currently it only works in Win32 and X11.) + platforms. ### Portability X/Open BSD SYS V diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index e833690e..a5a55c07 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -55,11 +55,11 @@ initscr screen to the given size. When called with (0, 0), it merely adjusts the internal structures to match the current size after the screen is resized by the user. On the currently supported - platforms, SDL, Win32, and X11 allow user resizing, while DOS, - OS/2, SDL and Win32 allow programmatic resizing. If you want to - support user resizing, you should check for getch() returning - KEY_RESIZE, and/or call is_termresized() at appropriate times; - if either condition occurs, call resize_term(0, 0). Then, with + platforms, SDL, Windows console, and X11 allow user resizing, while + DOS, OS/2, SDL and Windows console allow programmatic resizing. If + you want to support user resizing, you should check for getch() + returning KEY_RESIZE, and/or call is_termresized() at appropriate + times; if either condition occurs, call resize_term(0, 0). Then, with either user or programmatic resizing, you'll have to resize any windows you've created, as appropriate; resize_term() only handles stdscr and curscr. diff --git a/sdl1/pdcsetsc.c b/sdl1/pdcsetsc.c index 3d96da20..e9af6275 100644 --- a/sdl1/pdcsetsc.c +++ b/sdl1/pdcsetsc.c @@ -24,7 +24,7 @@ pdcsetsc PDC_set_title() sets the title of the window in which the curses program is running. This function may not do anything on some - platforms. (Currently it only works in Win32 and X11.) + platforms. ### Portability X/Open BSD SYS V diff --git a/sdl2/pdcsetsc.c b/sdl2/pdcsetsc.c index 4ebbd4d4..03fab6f4 100644 --- a/sdl2/pdcsetsc.c +++ b/sdl2/pdcsetsc.c @@ -24,7 +24,7 @@ pdcsetsc PDC_set_title() sets the title of the window in which the curses program is running. This function may not do anything on some - platforms. (Currently it only works in Win32 and X11.) + platforms. ### Portability X/Open BSD SYS V diff --git a/win32/README.md b/win32/README.md index 31b358ae..0870d236 100644 --- a/win32/README.md +++ b/win32/README.md @@ -1,8 +1,8 @@ -PDCurses for Win32 -================== +PDCurses for Windows console +============================ -This directory contains PDCurses source code files specific to Win32 -console mode (Win9x/Me/NT/2k/XP/Vista). +This directory contains PDCurses source code files specific to the +Microsoft Windows console. Building @@ -72,4 +72,5 @@ The files in this directory are released to the Public Domain. Acknowledgements ---------------- -Generic Win32 port was provided by Chris Szurgot +Windows console port was originally provided by Chris Szurgot + diff --git a/win32/pdcsetsc.c b/win32/pdcsetsc.c index 2c40d1da..432fee30 100644 --- a/win32/pdcsetsc.c +++ b/win32/pdcsetsc.c @@ -24,7 +24,7 @@ pdcsetsc PDC_set_title() sets the title of the window in which the curses program is running. This function may not do anything on some - platforms. (Currently it only works in Win32 and X11.) + platforms. ### Portability X/Open BSD SYS V diff --git a/win32/pdcutil.c b/win32/pdcutil.c index 111ed2ff..235a815e 100644 --- a/win32/pdcutil.c +++ b/win32/pdcutil.c @@ -19,5 +19,5 @@ void PDC_napms(int ms) const char *PDC_sysname(void) { - return "Win32"; + return "Windows"; } diff --git a/x11/pdcsetsc.c b/x11/pdcsetsc.c index 5d85c502..1ea3d958 100644 --- a/x11/pdcsetsc.c +++ b/x11/pdcsetsc.c @@ -26,7 +26,7 @@ pdcsetsc PDC_set_title() sets the title of the window in which the curses program is running. This function may not do anything on some - platforms. (Currently it only works in Win32 and X11.) + platforms. ### Portability X/Open BSD SYS V