From c1d63d248b29a310b4ee7c4e7c6eea7668178e93 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Tue, 3 Jan 2006 19:54:29 +0000 Subject: [PATCH] Removed remaining FlexOS code and comments. --- curses.h | 25 +------------------------ curspriv.h | 25 +------------------------ dos/pdcdisp.c | 31 ++++++++----------------------- dos/pdcgetsc.c | 7 +------ dos/pdckbd.c | 14 +++----------- dos/pdcscrn.c | 23 ++++------------------- dos/pdcsetsc.c | 11 +---------- os2/pdcdisp.c | 20 +++----------------- os2/pdcgetsc.c | 4 +--- os2/pdckbd.c | 14 +++----------- os2/pdcscrn.c | 23 ++++------------------- os2/pdcsetsc.c | 11 +---------- pdcurses/initscr.c | 13 +------------ pdcurses/kernel.c | 15 +-------------- pdcurses/outopts.c | 5 +---- pdcurses/pdcwin.c | 37 +------------------------------------ pdcurses/termattr.c | 24 +----------------------- win32/pdcdisp.c | 11 +++-------- win32/pdcgetsc.c | 7 +------ win32/pdckbd.c | 14 +++----------- win32/pdcscrn.c | 23 ++++------------------- win32/pdcsetsc.c | 11 +---------- x11/pdcdisp.c | 7 +++---- x11/pdckbd.c | 11 +++-------- x11/pdcscrn.c | 23 ++++------------------- x11/pdcsetsc.c | 8 +------- 26 files changed, 59 insertions(+), 358 deletions(-) diff --git a/curses.h b/curses.h index 76bcd40f..0441a3ca 100644 --- a/curses.h +++ b/curses.h @@ -18,7 +18,7 @@ *************************************************************************** */ /* -$Id: curses.h,v 1.62 2006/01/03 08:32:11 wmcbrine Exp $ +$Id: curses.h,v 1.63 2006/01/03 19:54:29 wmcbrine Exp $ */ /* *---------------------------------------------------------------------- @@ -145,7 +145,6 @@ PDCurses definitions list: (Only define those needed) DOS True if compiling for DOS. OS2 True if compiling for OS/2. WIN32 True if compiling for Windoze 95 or Windoze NT - FLEXOS True if compiling for Flexos. HC True if using a Metaware compiler. TC True if using a Borland compiler. MSC True if using a Microsoft compiler. @@ -251,7 +250,6 @@ PDCurses portable platform definitions list: * Metaware definitions: * HC * DOS -* FLEXOS */ #ifdef __HIGHC__ # define HC 1 @@ -264,9 +262,6 @@ PDCurses portable platform definitions list: # include # include # endif -# ifdef __FLEXOS__ /* define this on the command line */ -# define FLEXOS 2 /* or latest major release value. */ -# endif #endif /*---------------------------------------- @@ -456,9 +451,6 @@ PDCurses portable platform definitions list: # endif # define DOS 6 # include -# ifdef __FLEXOS__ /* define this on the command line */ -# define FLEXOS 2 /* or latest major release value. */ -# endif # define CURSES__32BIT__ # ifdef _cplusplus # define CPLUSPLUS 1 @@ -1527,21 +1519,6 @@ extern chtype *acs_map; #define CTL_HOME 0x1bf /* Control-Home PC only */ #define CTL_END 0x1c0 /* Control-End PC only */ -#if defined(FLEXOS) -# define KEY_MOUSE 0x1c1 /* "mouse" key */ -# define KEY_A1 KEY_HOME/* upper left on Virtual keypad */ -# define KEY_A2 KEY_UP /* upper middle on Virt. keypad */ -# define KEY_A3 KEY_PPAGE/* upper right on Vir. keypad */ -# define KEY_B1 KEY_LEFT/* middle left on Virt. keypad */ -# define KEY_B2 0x00 /* center on Virt. keypad */ -# define KEY_B3 KEY_RIGHT/* middle right on Vir. keypad */ -# define KEY_C1 KEY_LL /* lower left on Virt. keypad */ -# define KEY_C2 KEY_DOWN /* lower middle on Virt. keypad */ -# define KEY_C3 KEY_NPAGE /* lower right on Vir. keypad */ -# define KEY_MAX KEY_MOUSE /* Maximum curses key */ -#endif - - #if defined(DOS) || defined (OS2) || defined(XCURSES) || defined(WIN32) # define KEY_A1 0x1c1 /* upper left on Virtual keypad */ # define KEY_A2 0x1c2 /* upper middle on Virt. keypad */ diff --git a/curspriv.h b/curspriv.h index 810db1bc..ce696758 100644 --- a/curspriv.h +++ b/curspriv.h @@ -18,7 +18,7 @@ *************************************************************************** */ /* -$Id: curspriv.h,v 1.13 2006/01/03 16:59:55 wmcbrine Exp $ +$Id: curspriv.h,v 1.14 2006/01/03 19:54:29 wmcbrine Exp $ */ /* * @@ -104,9 +104,6 @@ $Id: curspriv.h,v 1.13 2006/01/03 16:59:55 wmcbrine Exp $ * * DOS The one we all know and love:-} * OS/2 The new kid on the block. -* FLEXOS A Real-time, protected-mode OS from -* Digital Research, Inc. -* (AKA, the 4680 from IBM...) */ /*----------------------------------------*/ @@ -164,19 +161,6 @@ $Id: curspriv.h,v 1.13 2006/01/03 16:59:55 wmcbrine Exp $ # endif #endif -/*----------------------------------------*/ -#ifdef FLEXOS -# define FAST_VIDEO 1 /* We can use scopy() */ -# define GMODE 0 /* KLUDGE ALERT! - * GMODE == 0 defines character mode structures in FLEXTAB.H. - * GMODE == 1 defines graphics mode structures in FLEXTAB.H. - */ -#include -extern VIRCON vir; -#endif - - - /*---------------------------------------------------------------------- * MALLOC DEBUGGING SUPPORT: @@ -264,7 +248,6 @@ extern WINDOW* twin; /* used by many routines */ #define _VGAMONO 0x08 #define _MCGACOLOR 0x0a #define _MCGAMONO 0x0b -#define _FLEXOS 0x20 /* A Flexos console */ #define _MDS_GENIUS 0x30 #define _UNIX_COLOR 0x40 #define _UNIX_MONO 0x41 @@ -360,12 +343,6 @@ int PDC_get_scrn_mode Args(( void )); int PDC_query_adapter_type Args(( void )); # endif -# ifdef FLEXOS -int PDC_flexos_8bitmode Args(( void )); -int PDC_flexos_16bitmode Args(( void )); -char* PDC_flexos_gname Args(( void )); -# endif - # ifdef UNIX int PDC_kbhit Args((void)); int PDC_setup_keys Args((void)); diff --git a/dos/pdcdisp.c b/dos/pdcdisp.c index 6fe94ff9..eff60b00 100644 --- a/dos/pdcdisp.c +++ b/dos/pdcdisp.c @@ -30,7 +30,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.9 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.10 2006/01/03 19:54:29 wmcbrine Exp $"; #endif #ifdef PC @@ -55,8 +55,7 @@ void movedata(unsigned sseg, unsigned soff, unsigned dseg, unsigned doff, unsign input characters, the update will be prematurely terminated. PDCurses Return Value: - This routine returns ERR if it is unable to accomplish it's task. - This return value is ONLY under FLEXOS. + This routine returns ERR if it is unable to accomplish its task. The return value OK is returned if there were no errors. @@ -237,9 +236,6 @@ int PDC_cursor_on() PDC_set_cursor_mode((SP->cursor & 0xff00) >> 8, (SP->cursor & 0x00ff)); break; - case _FLEXOS: - PDC_set_cursor_mode(SP->visible_cursor, 0); - break; default: break; } @@ -259,7 +255,7 @@ int PDC_cursor_on() Returns OK upon success, ERR upon failure. PDCurses Errors: - ERR will be returned (in the case of FLEXOS) if the hardware cursor + ERR will be returned if the hardware cursor can not be disabled. Portability: @@ -277,20 +273,12 @@ int PDC_cursor_off() { PDC_LOG(("PDC_cursor_off() - called\n")); - if (SP->visible_cursor) + if (SP->visible_cursor) { SP->visible_cursor = FALSE; - switch (SP->adapter) - { - case _FLEXOS: - PDC_set_cursor_mode(SP->visible_cursor, 0); - break; - default: - PDC_set_cursor_mode(32, 33); /* turn it off */ - break; - } + PDC_set_cursor_mode(32, 33); /* turn it off */ } - return( OK ); + return OK; } /*man-start********************************************************************* @@ -521,11 +509,8 @@ chtype color; fills them with the colour 'attr' instead. PDCurses Return Value: - The PDC_scroll() function returns OK on success otherwise ERR is returned. - - PDCurses Errors: - An error will only be returned on the Flexos platform if s_copy() - fails. + The PDC_scroll() function returns OK on success otherwise ERR is + returned. Portability: PDCurses int PDC_scroll( int urow, int lcol, int rcol, diff --git a/dos/pdcgetsc.c b/dos/pdcgetsc.c index 7c6abc6d..b37aedd0 100644 --- a/dos/pdcgetsc.c +++ b/dos/pdcgetsc.c @@ -24,7 +24,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.6 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -464,11 +464,6 @@ int PDC_get_rows() PDCurses Return Value: Returns the current BIOS Video Mode Number. - PDCurses Errors: - The FLEXOS version of this routine returns an ERR. - The UNIX version of this routine returns an ERR. - The EMXVIDEO version of this routine returns an ERR. - Portability: PDCurses int PDC_get_scrn_mode( void ); diff --git a/dos/pdckbd.c b/dos/pdckbd.c index de5eaac0..e240d0e9 100644 --- a/dos/pdckbd.c +++ b/dos/pdckbd.c @@ -32,7 +32,7 @@ #ifdef PDCDEBUG -char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.9 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.10 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /******************************************************************************* @@ -312,13 +312,8 @@ int PDC_get_bios_key() Returns the current OS Control Break Check state. PDCurses Return Value: - DOS: - This function returns TRUE on if the Control Break - Check is enabled otherwise FALSE is returned. - - FLEXOS: - This function returns TRUE on if the Keyboard Mode - allows a break to bre reported otherwise FALSE is returned. + This function returns TRUE on if the Control Break + Check is enabled otherwise FALSE is returned. PDCurses Errors: No errors are defined for this function. @@ -551,9 +546,6 @@ extern WINDOW* _getch_win_; This function returns -1 if the passed character is invalid, or the WINDOW* 'w' is NULL, or 'w's keypad is not active. - This function returns 0 under Flexos if the passed character - is 0x0300. (-:Forget why. --Frotz 911130:-) - Otherwise, this function returns the PDCurses equivalent of the passed character. See the function key and key macros in diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c index 8adda759..9867ab35 100644 --- a/dos/pdcscrn.c +++ b/dos/pdcscrn.c @@ -32,7 +32,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.8 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.9 2006/01/03 19:54:29 wmcbrine Exp $"; #endif static unsigned short *saved_screen = NULL; @@ -44,21 +44,13 @@ char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.8 2006/01/03 07:34:43 wmcbrine Exp $" PDC_scr_close() - Internal low-level binding to close the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must close the screen before writing to it. This is a nop for the DOS platform. - This function is provided in order to reset the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. - PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to close the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_close( void ); @@ -154,20 +146,13 @@ int mode2; PDC_scr_open() - Internal low-level binding to open the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must open the screen before writing to it. - - This function is provided in order to access the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. + This is a NOP for the DOS platform. PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to open the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_open( SCREEN* internal, bool echo ); diff --git a/dos/pdcsetsc.c b/dos/pdcsetsc.c index 35c2e1fd..5e71f6ae 100644 --- a/dos/pdcsetsc.c +++ b/dos/pdcsetsc.c @@ -24,7 +24,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.5 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -36,9 +36,6 @@ char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp Forces the appropriate 80x25 alpha mode given the display adapter. - Since we currently do not support changing the virtual console size, - this routine is a NOP under Flexos. - PDCurses Return Value: This function returns OK upon success otherwise ERR is returned. @@ -140,9 +137,6 @@ int endrow; adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_font( int size ); @@ -254,9 +248,6 @@ int size; adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_rows( int rows ); diff --git a/os2/pdcdisp.c b/os2/pdcdisp.c index 56aaef01..55158498 100644 --- a/os2/pdcdisp.c +++ b/os2/pdcdisp.c @@ -30,7 +30,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.5 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -43,8 +43,7 @@ char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $" input characters, the update will be prematurely terminated. PDCurses Return Value: - This routine returns ERR if it is unable to accomplish it's task. - This return value is ONLY under FLEXOS. + This routine returns ERR if it is unable to accomplish its task. The return value OK is returned if there were no errors. @@ -174,7 +173,7 @@ int PDC_cursor_on() Returns OK upon success, ERR upon failure. PDCurses Errors: - ERR will be returned (in the case of FLEXOS) if the hardware cursor + ERR will be returned if the hardware cursor can not be disabled. Portability: @@ -396,10 +395,6 @@ chtype color; PDCurses Return Value: The PDC_scroll() function returns OK on success otherwise ERR is returned. - PDCurses Errors: - An error will only be returned on the Flexos platform if s_copy() - fails. - Portability: PDCurses int PDC_scroll( int urow, int lcol, int rcol, int nlines, chtype attr ); @@ -422,15 +417,6 @@ chtype attr; { extern unsigned char atrtab[MAX_ATRTAB]; int phys_attr=chtype_attr(attr); -#ifdef FLEXOS - int srow=0; - int scol=0; - int drow=0; - int dcol=0; - int nrows=0; - int ncols=0; - char blank = (char) SP->blank; -#endif #ifndef EMXVIDEO USHORT ch=(phys_attr | SP->blank); diff --git a/os2/pdcgetsc.c b/os2/pdcgetsc.c index 53c5a85a..9a0ca653 100644 --- a/os2/pdcgetsc.c +++ b/os2/pdcgetsc.c @@ -24,7 +24,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.6 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.7 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -396,8 +396,6 @@ int PDC_get_rows(void) Returns the current BIOS Video Mode Number. PDCurses Errors: - The FLEXOS version of this routine returns an ERR. - The UNIX version of this routine returns an ERR. The EMXVIDEO version of this routine returns an ERR. Portability: diff --git a/os2/pdckbd.c b/os2/pdckbd.c index 1757edb6..6b64204c 100644 --- a/os2/pdckbd.c +++ b/os2/pdckbd.c @@ -33,7 +33,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.8 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.9 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /******************************************************************************* @@ -378,13 +378,8 @@ int PDC_get_bios_key(void) Returns the current OS Control Break Check state. PDCurses Return Value: - DOS: - This function returns TRUE on if the Control Break - Check is enabled otherwise FALSE is returned. - - FLEXOS: - This function returns TRUE on if the Keyboard Mode - allows a break to bre reported otherwise FALSE is returned. + This function returns TRUE on if the Control Break + Check is enabled otherwise FALSE is returned. PDCurses Errors: No errors are defined for this function. @@ -624,9 +619,6 @@ extern WINDOW* _getch_win_; This function returns -1 if the passed character is invalid, or the WINDOW* 'w' is NULL, or 'w's keypad is not active. - This function returns 0 under Flexos if the passed character - is 0x0300. (-:Forget why. --Frotz 911130:-) - Otherwise, this function returns the PDCurses equivalent of the passed character. See the function key and key macros in diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c index 8fb116c9..c15b41e9 100644 --- a/os2/pdcscrn.c +++ b/os2/pdcscrn.c @@ -25,7 +25,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.6 2006/01/03 19:54:29 wmcbrine Exp $"; #endif #ifdef EMXVIDEO @@ -43,21 +43,13 @@ char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp $" PDC_scr_close() - Internal low-level binding to close the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must close the screen before writing to it. This is a nop for the DOS platform. - This function is provided in order to reset the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. - PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to close the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_close( void ); @@ -139,20 +131,13 @@ bool PDC_scrn_modes_equal(int mode1, int mode2) PDC_scr_open() - Internal low-level binding to open the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must open the screen before writing to it. - - This function is provided in order to access the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. + This is a NOP for the DOS platform. PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to open the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_open( SCREEN* internal, bool echo ); diff --git a/os2/pdcsetsc.c b/os2/pdcsetsc.c index f6683406..a1d71714 100644 --- a/os2/pdcsetsc.c +++ b/os2/pdcsetsc.c @@ -28,7 +28,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.6 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -40,9 +40,6 @@ char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp Forces the appropriate 80x25 alpha mode given the display adapter. - Since we currently do not support changing the virtual console size, - this routine is a NOP under Flexos. - PDCurses Return Value: This function returns OK upon success otherwise ERR is returned. @@ -135,9 +132,6 @@ int PDC_set_cursor_mode( int startrow, int endrow ) adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_font( int size ); @@ -190,9 +184,6 @@ int PDC_set_font(int size) adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_rows( int rows ); diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index a0213f82..a1c5264b 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -61,7 +61,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_initscr = "$Id: initscr.c,v 1.12 2006/01/03 07:41:49 wmcbrine Exp $"; +char *rcsid_initscr = "$Id: initscr.c,v 1.13 2006/01/03 19:54:29 wmcbrine Exp $"; #else char* _curses_notice = "PDCurses 2.2 - Public Domain 1994"; #endif @@ -306,10 +306,6 @@ register int i; PDC_scr_open(SP, 0); -#ifdef FLEXOS - _flexos_16bitmode(); -#endif - LINES = SP->lines; COLS = SP->cols; @@ -469,10 +465,6 @@ int PDC_CDECL endwin() PDC_scr_close(); -# ifdef FLEXOS - _flexos_8bitmode(); -# endif - # if defined(DOS) || defined(OS2) reset_shell_mode(); # endif @@ -553,9 +545,6 @@ extern void free(); SP->orig_font = PDC_get_font(); SP->orgcbr = PDC_get_ctrl_break(); SP->blank = ' '; -#ifdef FLEXOS - _flexos_16bitmode(); -#endif savetty(); LINES = PDC_get_rows(); COLS = PDC_get_columns(); diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c index 03b20b91..0c6bbdd7 100644 --- a/pdcurses/kernel.c +++ b/pdcurses/kernel.c @@ -80,7 +80,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_kernel = "$Id: kernel.c,v 1.18 2006/01/03 19:09:44 wmcbrine Exp $"; +char *rcsid_kernel = "$Id: kernel.c,v 1.19 2006/01/03 19:54:29 wmcbrine Exp $"; #endif RIPPEDOFFLINE linesripped[5]; @@ -202,9 +202,6 @@ int PDC_CDECL def_prog_mode() { PDC_LOG(("def_prog_mode() - called\n")); -#ifdef FLEXOS - _flexos_16bitmode(); -#endif c_pr_tty.been_set = TRUE; memcpy(&c_pr_tty.saved, SP, sizeof(SCREEN)); @@ -222,9 +219,6 @@ int PDC_CDECL def_shell_mode() { PDC_LOG(("def_shell_mode() - called\n")); -#ifdef FLEXOS - _flexos_8bitmode(); -#endif c_sh_tty.been_set = TRUE; memcpy(&c_sh_tty.saved, SP, sizeof(SCREEN)); @@ -273,9 +267,6 @@ int PDC_CDECL reset_prog_mode() #endif PDC_set_rows(c_pr_tty.saved.lines); } -#ifdef FLEXOS - _flexos_16bitmode(); -#endif #if defined(WIN32) || (defined(OS2) && !defined(EMXVIDEO)) PDC_reset_prog_mode(); @@ -331,10 +322,6 @@ int PDC_CDECL reset_shell_mode() } #endif -#ifdef FLEXOS - _flexos_8bitmode(); -#endif - #if defined(WIN32) || (defined(OS2) && !defined(EMXVIDEO)) PDC_reset_shell_mode(); #endif diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c index f5c1768d..ba2bd420 100644 --- a/pdcurses/outopts.c +++ b/pdcurses/outopts.c @@ -41,7 +41,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_outopts = "$Id: outopts.c,v 1.2 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_outopts = "$Id: outopts.c,v 1.3 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -118,9 +118,6 @@ char *rcsid_outopts = "$Id: outopts.c,v 1.2 2006/01/03 07:34:43 wmcbrine Exp $" PDCurses Description: idlok() and idcok() are provided for portability. - This may have some value for the FLEXOS platform, but there is - no code in PDCurses at this time (910725) that takes advantage - of this. Though not explicitly stated, the cursor will be made visible again, if leaveok() is passed a FALSE value. diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c index 889ef227..943c47a8 100644 --- a/pdcurses/pdcwin.c +++ b/pdcurses/pdcwin.c @@ -36,7 +36,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.9 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.10 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -483,9 +483,6 @@ int *len; PDCurses Errors: No errors are defined for this function under DOS. - An ERR may be returned under FLEXOS if s_copy() fails. See the - Flexos Programmer's Reference Manual for details on the error. - Portability: PDCurses int PDC_chg_attr_pair( chtype chr, chtype attr ); @@ -512,35 +509,8 @@ chtype attr; # endif #endif -#ifdef FLEXOS - UBYTE c = (UBYTE) chr; - UBYTE a = (UBYTE) phys_attr; -#endif - PDC_LOG(("PDC_chg_attr_pair() - called\n")); -#ifdef FLEXOS - drect.r_row = PDC_get_cur_row(); - drect.r_col = PDC_get_cur_col(); - drect.r_nrow = 1; - drect.r_ncol = 1; - - sframe.fr_pl[0] = (UBYTE *) & c; - sframe.fr_pl[1] = (UBYTE *) & a; - sframe.fr_pl[2] = (UBYTE *) " "; - sframe.fr_nrow = 1; - sframe.fr_ncol = 1; - sframe.fr_use = 0x00; - - srect.r_col = 0; - srect.r_row = 0; - srect.r_nrow = 1; - srect.r_ncol = 1; - - retcode = s_copy(0x03, 0x01L, 0L, (far unsigned short *) &drect, (far unsigned short *) &sframe, (far unsigned short *) &srect); - return( (retcode < 0L) ? ERR : OK ); -#endif - #ifdef DOS regs.h.ah = 0x09; regs.h.al = chr & A_CHARTEXT; @@ -569,11 +539,6 @@ chtype attr; return( OK ); #endif -#ifdef UNIX -/* INCOMPLETE - check attribute and output attr and/or color */ - putchar(chr & A_CHARTEXT); - return(OK); -#endif } #endif diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c index a0165a00..987a52c1 100644 --- a/pdcurses/termattr.c +++ b/pdcurses/termattr.c @@ -48,7 +48,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_termattr = "$Id: termattr.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_termattr = "$Id: termattr.c,v 1.6 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -112,8 +112,6 @@ char *rcsid_termattr = "$Id: termattr.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp For DOS, has_ic() and has_il() always return TRUE, as the speed of the DIRECT VIDEO or even BIOS writes is quicker than on a serial terminal. - For FLEXOS, this value has meaning and depends on the terminal, - though at this time, it is a constant TRUE. In addition to the above definition for longname(), the form of this string is the adapter name (or video card name) and the text @@ -146,9 +144,6 @@ char *rcsid_termattr = "$Id: termattr.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp **man-end**********************************************************************/ -#ifdef FLEXOS -extern char* _flexos_gname(); -#endif static char _display[ 128 ]; static char _shrtnme[ 14 ]; @@ -309,15 +304,6 @@ char* PDC_CDECL longname() } #endif -#ifdef FLEXOS - switch (SP->adapter) - { - case _FLEXOS: sprintf(_display, "%s", _cursesgname()); break; - default: sprintf(_display, "Unknown-%dx%d", LINES, COLS); break; - } -#endif - - if (SP->bogus_adapter) strcat(_display, " (Clone)"); @@ -392,14 +378,6 @@ char* PDC_CDECL termname() } #endif -#ifdef FLEXOS - switch (SP->adapter) - { - case _FLEXOS: sprintf(_shrtnme, "%s", _cursesgname()); break; - default: sprintf(_shrtnme, "Unknown"); break; - } -#endif - return (_shrtnme); } /***********************************************************************/ diff --git a/win32/pdcdisp.c b/win32/pdcdisp.c index fb17d0c6..06b53dcb 100644 --- a/win32/pdcdisp.c +++ b/win32/pdcdisp.c @@ -29,7 +29,7 @@ extern HANDLE hConOut; #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.5 2006/01/03 19:54:29 wmcbrine Exp $"; #endif static CHAR_INFO ci[512]; @@ -43,8 +43,7 @@ static CHAR_INFO ci[512]; input characters, the update will be prematurely terminated. PDCurses Return Value: - This routine returns ERR if it is unable to accomplish it's task. - This return value is ONLY under FLEXOS. + This routine returns ERR if it is unable to accomplish its task. The return value OK is returned if there were no errors. @@ -159,7 +158,7 @@ int PDC_cursor_on(void) Returns OK upon success, ERR upon failure. PDCurses Errors: - ERR will be returned (in the case of FLEXOS) if the hardware cursor + ERR will be returned if the hardware cursor can not be disabled. Portability: @@ -365,10 +364,6 @@ int PDC_putctty( chtype character, chtype color ) PDCurses Return Value: The PDC_scroll() function returns OK on success otherwise ERR is returned. - PDCurses Errors: - An error will only be returned on the Flexos platform if s_copy() - fails. - Portability: PDCurses int PDC_scroll( int urow, int lcol, int rcol, int nlines, chtype attr ); diff --git a/win32/pdcgetsc.c b/win32/pdcgetsc.c index 78e37c13..9c55f48a 100644 --- a/win32/pdcgetsc.c +++ b/win32/pdcgetsc.c @@ -22,7 +22,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.3 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.4 2006/01/03 19:54:29 wmcbrine Exp $"; #endif extern HANDLE hConOut, hConIn; @@ -313,11 +313,6 @@ int PDC_get_columns(void) PDCurses Return Value: Returns the current BIOS Video Mode Number. - PDCurses Errors: - The FLEXOS version of this routine returns an ERR. - The UNIX version of this routine returns an ERR. - The EMXVIDEO version of this routine returns an ERR. - Portability: PDCurses int PDC_get_scrn_mode( void ); diff --git a/win32/pdckbd.c b/win32/pdckbd.c index 63eb630c..2d5fad8e 100644 --- a/win32/pdckbd.c +++ b/win32/pdckbd.c @@ -25,7 +25,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.20 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.21 2006/01/03 19:54:29 wmcbrine Exp $"; #endif #define KEY_STATE TRUE @@ -790,13 +790,8 @@ int PDC_get_bios_key(void) Returns the current OS Control Break Check state. PDCurses Return Value: - DOS: - This function returns TRUE if the Control Break - Check is enabled otherwise FALSE is returned. - - FLEXOS: - This function returns TRUE on if the Keyboard Mode - allows a break to bre reported otherwise FALSE is returned. + This function returns TRUE if the Control Break + Check is enabled otherwise FALSE is returned. PDCurses Errors: No errors are defined for this function. @@ -984,9 +979,6 @@ int PDC_sysgetch(void) This function returns -1 if the passed character is invalid, or the WINDOW* 'w' is NULL, or 'w's keypad is not active. - This function returns 0 under Flexos if the passed character - is 0x0300. (-:Forget why. --Frotz 911130:-) - Otherwise, this function returns the PDCurses equivalent of the passed character. See the function key and key macros in diff --git a/win32/pdcscrn.c b/win32/pdcscrn.c index b5df1a52..f8de51a5 100644 --- a/win32/pdcscrn.c +++ b/win32/pdcscrn.c @@ -22,7 +22,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.13 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.14 2006/01/03 19:54:29 wmcbrine Exp $"; #endif #define PDC_RESTORE_NONE 0 @@ -50,21 +50,13 @@ static DWORD dwConsoleMode=0; PDC_scr_close() - Internal low-level binding to close the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must close the screen before writing to it. This is a nop for the DOS platform. - This function is provided in order to reset the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. - PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to close the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_close( void ); @@ -151,20 +143,13 @@ bool PDC_scrn_modes_equal(int mode1, int mode2) PDC_scr_open() - Internal low-level binding to open the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must open the screen before writing to it. - - This function is provided in order to access the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. + This is a NOP for the DOS platform. PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to open the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_open( SCREEN* internal, bool echo ); diff --git a/win32/pdcsetsc.c b/win32/pdcsetsc.c index a991330e..80111e20 100644 --- a/win32/pdcsetsc.c +++ b/win32/pdcsetsc.c @@ -22,7 +22,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.5 2006/01/03 19:54:29 wmcbrine Exp $"; #endif extern HANDLE hConOut; @@ -36,9 +36,6 @@ extern HANDLE hConOut; Forces the appropriate 80x25 alpha mode given the display adapter. - Since we currently do not support changing the virtual console size, - this routine is a NOP under Flexos. - PDCurses Return Value: This function returns OK upon success otherwise ERR is returned. @@ -102,9 +99,6 @@ int PDC_set_cursor_mode( int startrow, int endrow ) adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_font( int size ); @@ -136,9 +130,6 @@ int PDC_set_font(int size) adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_rows( int rows ); diff --git a/x11/pdcdisp.c b/x11/pdcdisp.c index ece6e47e..59341984 100644 --- a/x11/pdcdisp.c +++ b/x11/pdcdisp.c @@ -30,7 +30,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.5 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -43,8 +43,7 @@ char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.4 2006/01/03 07:34:43 wmcbrine Exp $" input characters, the update will be prematurely terminated. PDCurses Return Value: - This routine returns ERR if it is unable to accomplish it's task. - This return value is ONLY under FLEXOS. + This routine returns ERR if it is unable to accomplish its task. The return value OK is returned if there were no errors. @@ -133,7 +132,7 @@ int PDC_cursor_on() Returns OK upon success, ERR upon failure. PDCurses Errors: - ERR will be returned (in the case of FLEXOS) if the hardware cursor + ERR will be returned if the hardware cursor can not be disabled. Portability: diff --git a/x11/pdckbd.c b/x11/pdckbd.c index 0b0d0b24..e0e8dde9 100644 --- a/x11/pdckbd.c +++ b/x11/pdckbd.c @@ -25,7 +25,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.8 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.9 2006/01/03 19:54:29 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -106,13 +106,8 @@ bool PDC_check_bios_key() Returns the current OS Control Break Check state. PDCurses Return Value: - DOS: - This function returns TRUE if the Control Break - Check is enabled otherwise FALSE is returned. - - FLEXOS: - This function returns TRUE on if the Keyboard Mode - allows a break to bre reported otherwise FALSE is returned. + This function returns TRUE if the Control Break + Check is enabled otherwise FALSE is returned. PDCurses Errors: No errors are defined for this function. diff --git a/x11/pdcscrn.c b/x11/pdcscrn.c index ccd83ff9..db8f9c8f 100644 --- a/x11/pdcscrn.c +++ b/x11/pdcscrn.c @@ -24,7 +24,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.5 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.6 2006/01/03 19:54:29 wmcbrine Exp $"; #endif bool GLOBAL_sb_on=FALSE; @@ -35,21 +35,13 @@ bool GLOBAL_slk_on=FALSE; PDC_scr_close() - Internal low-level binding to close the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must close the screen before writing to it. This is a nop for the DOS platform. - This function is provided in order to reset the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. - PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to close the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_close( void ); @@ -104,20 +96,13 @@ int mode2; PDC_scr_open() - Internal low-level binding to open the physical screen PDCurses Description: - This function provides a low-level binding for the Flexos - platform which must open the screen before writing to it. - - This function is provided in order to access the FlexOS 16 bit - character set for input rather than the limited input - character set associated with the VT52. + This is a NOP in DOS. PDCurses Return Value: This function returns OK on success, otherwise an ERR is returned. PDCurses Errors: - The DOS platform will never fail. The Flexos platform may fail - depending on the ability to open the current virtual console in - 8 (as opposed to 16) bit mode. + The DOS platform will never fail. Portability: PDCurses int PDC_scr_open( SCREEN* internal, bool echo ); diff --git a/x11/pdcsetsc.c b/x11/pdcsetsc.c index 817f0cd6..234b4697 100644 --- a/x11/pdcsetsc.c +++ b/x11/pdcsetsc.c @@ -24,7 +24,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.3 2006/01/03 07:34:43 wmcbrine Exp $"; +char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.4 2006/01/03 19:54:29 wmcbrine Exp $"; #endif @@ -47,9 +47,6 @@ char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.3 2006/01/03 07:34:43 wmcbrine Exp adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_font( int size ); @@ -88,9 +85,6 @@ int size; adapter identity problem. e.g. Two adapters report the same identifying characteristics. - It is also an error to attempt to change the size of the Flexos - console (as there is currently no support for that). - Portability: PDCurses int PDC_set_rows( int rows );