mirror of
https://github.com/VARCem/PDCurses.git
synced 2026-09-25 00:05:16 +00:00
More privacy for PDC_get_font(); orig_font was not used.
This commit is contained in:
William McBrine
5
curses.h
5
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 */
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 <curses.h>
|
||||
@@ -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);
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
# include <sys/movedata.h>
|
||||
#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();
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <curses.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
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();
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
#include <curses.h>
|
||||
#include <string.h>
|
||||
|
||||
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**************************************************************
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#define CURSES_LIBRARY 1
|
||||
#include <curses.h>
|
||||
|
||||
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.
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#define CURSES_LIBRARY 1
|
||||
#include <curses.h>
|
||||
|
||||
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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user