From 86270d12e7b2e6d10cd856fbd6057dd18d24f5da Mon Sep 17 00:00:00 2001 From: William McBrine Date: Fri, 18 Aug 2006 20:11:05 +0000 Subject: [PATCH] Moved sizeable to dos-only, static. --- curses.h | 3 +-- dos/pdcscrn.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/curses.h b/curses.h index 3d519159..53c78ac0 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.217 2006/08/13 05:36:52 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.218 2006/08/18 20:10:58 wmcbrine Exp $ */ /*----------------------------------------------------------------------* * PDCurses * @@ -548,7 +548,6 @@ typedef struct bool orgcbr; /* original MSDOS ^-BREAK setting */ bool audible; /* FALSE if the bell is visual */ bool mono; /* TRUE if current screen is mono */ - bool sizeable; /* TRUE if adapter is resizeable */ bool resized; /* TRUE if TERM has been resized */ bool orig_attr; /* TRUE if we have the original colors */ short orig_fore; /* Original screen foreground color */ diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c index a0c7834f..8a041fdf 100644 --- a/dos/pdcscrn.c +++ b/dos/pdcscrn.c @@ -24,7 +24,7 @@ # include #endif -RCSID("$Id: pdcscrn.c,v 1.50 2006/08/13 06:32:29 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.51 2006/08/18 20:11:05 wmcbrine Exp $"); int pdc_adapter; /* screen type */ int pdc_scrnmode; /* default screen mode */ @@ -34,6 +34,8 @@ bool pdc_bogus_adapter; /* TRUE if adapter has insane values */ unsigned pdc_video_seg; /* video base segment */ unsigned pdc_video_ofs; /* video base offset */ +static bool sizeable = FALSE; /* TRUE if adapter is resizeable */ + static unsigned short *saved_screen = NULL; static int saved_lines = 0; static int saved_cols = 0; @@ -108,7 +110,7 @@ static void set_font(int size) case _EGACOLOR: case _EGAMONO: - if (SP->sizeable && (pdc_font != size)) + if (sizeable && (pdc_font != size)) { switch (size) { @@ -129,7 +131,7 @@ static void set_font(int size) case _VGACOLOR: case _VGAMONO: - if (SP->sizeable && (pdc_font != size)) + if (sizeable && (pdc_font != size)) { switch (size) { @@ -274,7 +276,7 @@ static int sanity_check(int adapter) if (pdc_bogus_adapter) { - SP->sizeable = FALSE; + sizeable = FALSE; pdc_direct_video = FALSE; } @@ -326,7 +328,7 @@ static int query_adapter_type(void) break; case 4: retval = _EGACOLOR; - SP->sizeable = TRUE; + sizeable = TRUE; break; case 5: retval = _EGAMONO; @@ -334,7 +336,7 @@ static int query_adapter_type(void) case 26: /* ...alt. VGA BIOS... */ case 7: retval = _VGACOLOR; - SP->sizeable = TRUE; + sizeable = TRUE; break; case 8: retval = _VGAMONO;