diff --git a/curses.h b/curses.h index 26c8929f..cdbcb538 100644 --- a/curses.h +++ b/curses.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curses.h,v 1.211 2006/08/11 07:33:25 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.212 2006/08/11 22:10:36 wmcbrine Exp $ */ /*----------------------------------------------------------------------* * PDCurses * @@ -45,7 +45,7 @@ PDCurses portable platform definitions list: **man-end****************************************************************/ -#define PDC_BUILD 2811 +#define PDC_BUILD 2812 #define PDCURSES 1 /* PDCurses-only routines */ #define XOPEN 1 /* X/Open Curses routines */ #define SYSVcurses 1 /* System V Curses routines */ @@ -580,7 +580,6 @@ typedef struct int visibility; /* Visibility of cursor */ int orig_cursor; /* Original cursor size */ int font; /* default font size */ - int orig_font; /* Original font size */ int lines; /* New value for LINES */ int cols; /* New value for COLS */ unsigned long _trap_mbe; /* trap these mouse button events */ diff --git a/curspriv.h b/curspriv.h index d2bb23f9..9f85a80e 100644 --- a/curspriv.h +++ b/curspriv.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curspriv.h,v 1.113 2006/08/11 20:59:44 wmcbrine Exp $ */ +/* $Id: curspriv.h,v 1.114 2006/08/11 22:10:36 wmcbrine Exp $ */ /* CURSPRIV.H @@ -93,9 +93,7 @@ int PDC_get_columns(void); bool PDC_get_ctrl_break(void); int PDC_get_cursor_pos(int *, int *); int PDC_get_cursor_mode(void); -int PDC_get_font(void); int PDC_get_rows(void); -int PDC_get_buffer_rows(void); void PDC_gotoyx(int, int); void PDC_init_atrtab(void); WINDOW *PDC_makenew(int, int, int, int); diff --git a/dos/pdcdos.h b/dos/pdcdos.h index ad40b4e5..41a01b73 100644 --- a/dos/pdcdos.h +++ b/dos/pdcdos.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: pdcdos.h,v 1.7 2006/08/11 19:50:51 wmcbrine Exp $ */ +/* $Id: pdcdos.h,v 1.8 2006/08/11 22:10:36 wmcbrine Exp $ */ #define CURSES_LIBRARY 1 #include @@ -116,6 +116,7 @@ enum void movedata(unsigned, unsigned, unsigned, unsigned, unsigned); #endif +int PDC_get_font(void); int PDC_get_scrn_mode(void); void PDC_putctty(chtype); int PDC_query_adapter_type(void); diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c index abf3a771..4ca1554c 100644 --- a/dos/pdcscrn.c +++ b/dos/pdcscrn.c @@ -24,7 +24,7 @@ # include #endif -RCSID("$Id: pdcscrn.c,v 1.42 2006/08/11 20:59:44 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.43 2006/08/11 22:10:36 wmcbrine Exp $"); Regs regs; /* used in various other modules */ @@ -145,7 +145,7 @@ int PDC_scr_open(int argc, char **argv) SP->adapter = PDC_query_adapter_type(); SP->scrnmode = PDC_get_scrn_mode(); - SP->orig_font = SP->font = PDC_get_font(); + SP->font = PDC_get_font(); SP->lines = PDC_get_rows(); SP->cols = PDC_get_columns(); diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c index b4e3d908..79f9ed68 100644 --- a/os2/pdcscrn.c +++ b/os2/pdcscrn.c @@ -20,7 +20,7 @@ #include #include -RCSID("$Id: pdcscrn.c,v 1.39 2006/08/11 20:59:44 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.40 2006/08/11 22:10:36 wmcbrine Exp $"); #ifdef EMXVIDEO static unsigned char *saved_screen = NULL; @@ -39,6 +39,7 @@ extern int PDC_query_adapter_type(VIOCONFIGINFO *); extern void PDC_set_keyboard_default(void); extern int PDC_set_scrn_mode(VIOMODEINFO); #endif +extern int PDC_get_font(void); extern int PDC_set_font(int); /*man-start************************************************************** @@ -184,7 +185,7 @@ int PDC_scr_open(int argc, char **argv) if (adapter == _UNIX_MONO) SP->mono = TRUE; #endif - SP->orig_font = SP->font = PDC_get_font(); + SP->font = PDC_get_font(); SP->lines = PDC_get_rows(); SP->cols = PDC_get_columns(); SP->orig_cursor = PDC_get_cursor_mode(); diff --git a/os2/pdcsetsc.c b/os2/pdcsetsc.c index 266e8a99..2c6839a3 100644 --- a/os2/pdcsetsc.c +++ b/os2/pdcsetsc.c @@ -19,7 +19,9 @@ #include #include -RCSID("$Id: pdcsetsc.c,v 1.25 2006/08/11 07:04:31 wmcbrine Exp $"); +RCSID("$Id: pdcsetsc.c,v 1.26 2006/08/11 22:10:36 wmcbrine Exp $"); + +extern int PDC_get_font(void); /*man-start************************************************************** diff --git a/win32/pdcgetsc.c b/win32/pdcgetsc.c index 18d9f90d..36834092 100644 --- a/win32/pdcgetsc.c +++ b/win32/pdcgetsc.c @@ -24,7 +24,7 @@ #define CURSES_LIBRARY 1 #include -RCSID("$Id: pdcgetsc.c,v 1.25 2006/08/11 07:04:31 wmcbrine Exp $"); +RCSID("$Id: pdcgetsc.c,v 1.26 2006/08/11 22:10:36 wmcbrine Exp $"); extern HANDLE hConOut, hConIn; @@ -88,27 +88,6 @@ int PDC_get_cursor_mode(void) return ci.dwSize; } -/*man-start************************************************************** - - PDC_get_font() - Get the current font size - - PDCurses Description: - This is a private PDCurses routine. - - This function returns the current font size. - - Portability: - PDCurses int PDC_get_font(void); - -**man-end****************************************************************/ - -int PDC_get_font(void) -{ - PDC_LOG(("PDC_get_font() - called\n")); - - return 0; -} - /*man-start************************************************************** PDC_get_rows() - Return number of screen rows. diff --git a/win32/pdcscrn.c b/win32/pdcscrn.c index 2ebcfc0f..7ce07f41 100644 --- a/win32/pdcscrn.c +++ b/win32/pdcscrn.c @@ -24,7 +24,7 @@ #define CURSES_LIBRARY 1 #include -RCSID("$Id: pdcscrn.c,v 1.52 2006/08/11 20:59:44 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.53 2006/08/11 22:10:36 wmcbrine Exp $"); #define PDC_RESTORE_NONE 0 #define PDC_RESTORE_BUFFER 1 @@ -38,6 +38,8 @@ static CONSOLE_SCREEN_BUFFER_INFO orig_scr; static CHAR_INFO *ciSaveBuffer = NULL; static DWORD dwConsoleMode = 0; +extern int PDC_get_buffer_rows(void); + /*man-start************************************************************** PDC_scr_close() - Internal low-level binding to close the physical screen diff --git a/x11/pdcgetsc.c b/x11/pdcgetsc.c index 6a61651e..5eb3177d 100644 --- a/x11/pdcgetsc.c +++ b/x11/pdcgetsc.c @@ -17,7 +17,7 @@ #include "pdcx11.h" -RCSID("$Id: pdcgetsc.c,v 1.17 2006/07/15 15:38:24 wmcbrine Exp $"); +RCSID("$Id: pdcgetsc.c,v 1.18 2006/08/11 22:10:36 wmcbrine Exp $"); /*man-start************************************************************** @@ -71,24 +71,3 @@ int PDC_get_rows(void) return XCursesLINES; } - -/*man-start************************************************************** - - PDC_get_font() - Get the current font size - - PDCurses Description: - This is a private PDCurses routine. - - This function returns the current font size. - - Portability: - PDCurses int PDC_get_font(void); - -**man-end****************************************************************/ - -int PDC_get_font(void) -{ - PDC_LOG(("PDC_get_font() - called\n")); - - return OK; -}