VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-23 23:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

pdc_fthick now needed for narrow (bitmapped) SDL -- currently always 1.

Browse Source
This commit is contained in:
William McBrine
2018-11-24 14:00:36 -05:00
parent 8740a65112
commit 6df3ef28ba
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdl1/pdcscrn.c
View File

@@ -14,7 +14,6 @@
# endif
TTF_Font *pdc_ttffont = NULL;
int pdc_font_size = 17;
int pdc_fthick;
#endif
SDL_Surface *pdc_screen = NULL, *pdc_font = NULL, *pdc_icon = NULL,
@@ -23,7 +22,7 @@ int pdc_sheight = 0, pdc_swidth = 0, pdc_yoffset = 0, pdc_xoffset = 0;
SDL_Color pdc_color[256];
Uint32 pdc_mapped[256];
int pdc_fheight, pdc_fwidth, pdc_flastc;
int pdc_fheight, pdc_fwidth, pdc_fthick, pdc_flastc;
bool pdc_own_screen;
static int max_height, max_width;
@@ -223,6 +222,7 @@ int PDC_scr_open(int argc, char **argv)
#else
pdc_fheight = pdc_font->h / 8;
pdc_fwidth = pdc_font->w / 32;
pdc_fthick = 1;
if (!SP->mono)
pdc_flastc = pdc_font->format->palette->ncolors - 1;

2
sdl1/pdcsdl.h
View File

@@ -20,10 +20,8 @@ extern SDL_Color pdc_color[256]; /* colors for font palette */
extern Uint32 pdc_mapped[256]; /* colors for FillRect(), as
used in _highlight() */
extern int pdc_fheight, pdc_fwidth; /* font height and width */
#ifdef PDC_WIDE
extern int pdc_fthick; /* thickness for highlights and
rendered ACS glyphs */
#endif
extern int pdc_flastc; /* font palette's last color
(treated as the foreground) */
extern bool pdc_own_screen; /* if pdc_screen was not set

4
sdl2/pdcscrn.c
View File

@@ -25,7 +25,6 @@ int pdc_font_size =
# else
17;
# endif
int pdc_fthick;
#endif
SDL_Window *pdc_window = NULL;
@@ -35,7 +34,7 @@ int pdc_sheight = 0, pdc_swidth = 0, pdc_yoffset = 0, pdc_xoffset = 0;
SDL_Color pdc_color[256];
Uint32 pdc_mapped[256];
int pdc_fheight, pdc_fwidth, pdc_flastc;
int pdc_fheight, pdc_fwidth, pdc_fthick, pdc_flastc;
bool pdc_own_window;
/* COLOR_PAIR to attribute encoding table. */
@@ -233,6 +232,7 @@ int PDC_scr_open(int argc, char **argv)
#else
pdc_fheight = pdc_font->h / 8;
pdc_fwidth = pdc_font->w / 32;
pdc_fthick = 1;
if (!SP->mono)
pdc_flastc = pdc_font->format->palette->ncolors - 1;

2
sdl2/pdcsdl.h
View File

@@ -21,10 +21,8 @@ extern SDL_Color pdc_color[256]; /* colors for font palette */
extern Uint32 pdc_mapped[256]; /* colors for FillRect(), as
used in _highlight() */
extern int pdc_fheight, pdc_fwidth; /* font height and width */
#ifdef PDC_WIDE
extern int pdc_fthick; /* thickness for highlights and
rendered ACS glyphs */
#endif
extern int pdc_flastc; /* font palette's last color
(treated as the foreground) */
extern bool pdc_own_window; /* if pdc_window was not set