mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-22 11:22:18 -04:00
render textscreen content to an upscaled intermediate texture (#944)
* render textscreen content to an upscaled intermediate texture * scale upscaled texture only to double framebuffer size Could you please repeat your tests with this one @liPillON ? * only create intermediate texture for normal font, increase scaling factor to 4 * remove small and large font * get rid of the highdpi_font, always initialize renderer with SDL_WINDOW_ALLOW_HIGHDPI Why is this even optional?
This commit is contained in:
Fabian Greffrath
GitHub
parent
9180d56ec9
commit
fc24be131c
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 7.7 KiB |
@ -1,140 +0,0 @@
|
|||||||
/* Font data generated from small.png; do not edit.
|
|
||||||
Please see textscreen/fonts/README for copyright
|
|
||||||
information. */
|
|
||||||
|
|
||||||
static const uint8_t small_font_data[] =
|
|
||||||
{
|
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x4e, 0x00,
|
|
||||||
0xf6, 0xf5, 0xb1, 0x6f, 0x00, 0xea, 0x04, 0x00,
|
|
||||||
0x00, 0xe4, 0x04, 0x00, 0x40, 0xaa, 0xe4, 0x00,
|
|
||||||
0x40, 0xee, 0xe4, 0x00, 0x00, 0x60, 0x06, 0x00,
|
|
||||||
0xff, 0x9f, 0xf9, 0xff, 0x00, 0x96, 0x69, 0x00,
|
|
||||||
0xff, 0x69, 0x96, 0xff, 0xe0, 0x74, 0x75, 0x00,
|
|
||||||
0x60, 0x69, 0x6f, 0x06, 0xc0, 0x44, 0x74, 0x03,
|
|
||||||
0xe0, 0xaa, 0xba, 0x03, 0x22, 0x27, 0x27, 0x22,
|
|
||||||
0x10, 0x73, 0x13, 0x00, 0x80, 0xec, 0x8c, 0x00,
|
|
||||||
0x40, 0x4e, 0xe4, 0x04, 0xa0, 0xaa, 0xa0, 0x00,
|
|
||||||
0xf0, 0xb9, 0xaa, 0x00, 0x16, 0x96, 0x86, 0x06,
|
|
||||||
0x00, 0x00, 0xff, 0x00, 0x40, 0x4e, 0xe4, 0xf4,
|
|
||||||
0x40, 0x4e, 0x44, 0x04, 0x40, 0x44, 0xe4, 0x04,
|
|
||||||
0x20, 0xf4, 0x24, 0x00, 0x40, 0xf2, 0x42, 0x00,
|
|
||||||
0x00, 0x10, 0x07, 0x00, 0x00, 0xf5, 0x05, 0x00,
|
|
||||||
0x00, 0x72, 0x0f, 0x00, 0x00, 0x7f, 0x02, 0x00,
|
|
||||||
0x00, 0x00, 0x00, 0x00, 0x20, 0x22, 0x02, 0x02,
|
|
||||||
0x50, 0x05, 0x00, 0x00, 0x50, 0x57, 0x75, 0x05,
|
|
||||||
0x22, 0x25, 0x54, 0x22, 0x50, 0x24, 0x12, 0x05,
|
|
||||||
0x52, 0x52, 0x35, 0x06, 0x20, 0x02, 0x00, 0x00,
|
|
||||||
0x40, 0x22, 0x22, 0x04, 0x10, 0x22, 0x22, 0x01,
|
|
||||||
0x50, 0x72, 0x52, 0x00, 0x20, 0x72, 0x22, 0x00,
|
|
||||||
0x00, 0x00, 0x20, 0x12, 0x00, 0x70, 0x00, 0x00,
|
|
||||||
0x00, 0x00, 0x20, 0x02, 0x40, 0x24, 0x12, 0x01,
|
|
||||||
0x20, 0x75, 0x55, 0x02, 0x20, 0x23, 0x22, 0x07,
|
|
||||||
0x20, 0x45, 0x12, 0x07, 0x70, 0x24, 0x54, 0x02,
|
|
||||||
0x40, 0x56, 0x47, 0x04, 0x70, 0x31, 0x54, 0x02,
|
|
||||||
0x60, 0x31, 0x55, 0x02, 0x70, 0x44, 0x22, 0x02,
|
|
||||||
0x20, 0x25, 0x55, 0x02, 0x20, 0x55, 0x46, 0x03,
|
|
||||||
0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x20, 0x01,
|
|
||||||
0x00, 0x24, 0x21, 0x04, 0x00, 0x07, 0x07, 0x00,
|
|
||||||
0x00, 0x21, 0x24, 0x01, 0x20, 0x45, 0x02, 0x02,
|
|
||||||
0x20, 0x55, 0x11, 0x06, 0x20, 0x55, 0x57, 0x05,
|
|
||||||
0x30, 0x35, 0x55, 0x03, 0x20, 0x15, 0x51, 0x02,
|
|
||||||
0x30, 0x55, 0x55, 0x03, 0x70, 0x71, 0x11, 0x07,
|
|
||||||
0x70, 0x71, 0x11, 0x01, 0x20, 0x15, 0x55, 0x02,
|
|
||||||
0x50, 0x75, 0x55, 0x05, 0x70, 0x22, 0x22, 0x07,
|
|
||||||
0x40, 0x44, 0x54, 0x02, 0x50, 0x35, 0x55, 0x05,
|
|
||||||
0x10, 0x11, 0x11, 0x07, 0x50, 0x57, 0x55, 0x05,
|
|
||||||
0x40, 0x75, 0x57, 0x01, 0x20, 0x55, 0x55, 0x02,
|
|
||||||
0x30, 0x55, 0x13, 0x01, 0x20, 0x55, 0x35, 0x06,
|
|
||||||
0x30, 0x55, 0x53, 0x05, 0x20, 0x25, 0x54, 0x02,
|
|
||||||
0x70, 0x22, 0x22, 0x02, 0x50, 0x55, 0x55, 0x07,
|
|
||||||
0x50, 0x55, 0x55, 0x02, 0x50, 0x55, 0x75, 0x05,
|
|
||||||
0x50, 0x25, 0x55, 0x05, 0x50, 0x25, 0x22, 0x02,
|
|
||||||
0x70, 0x24, 0x12, 0x07, 0x60, 0x22, 0x22, 0x06,
|
|
||||||
0x10, 0x21, 0x42, 0x04, 0x30, 0x22, 0x22, 0x03,
|
|
||||||
0x20, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
|
|
||||||
0x10, 0x02, 0x00, 0x00, 0x00, 0x43, 0x56, 0x06,
|
|
||||||
0x10, 0x31, 0x55, 0x03, 0x00, 0x16, 0x11, 0x06,
|
|
||||||
0x40, 0x64, 0x55, 0x06, 0x00, 0x52, 0x17, 0x06,
|
|
||||||
0x40, 0x72, 0x22, 0x02, 0x00, 0x56, 0x65, 0x34,
|
|
||||||
0x10, 0x31, 0x55, 0x05, 0x20, 0x30, 0x22, 0x07,
|
|
||||||
0x40, 0x60, 0x44, 0x34, 0x10, 0x51, 0x53, 0x05,
|
|
||||||
0x20, 0x22, 0x22, 0x02, 0x00, 0x75, 0x55, 0x05,
|
|
||||||
0x00, 0x53, 0x55, 0x05, 0x00, 0x52, 0x55, 0x02,
|
|
||||||
0x00, 0x53, 0x35, 0x11, 0x00, 0x56, 0x65, 0x44,
|
|
||||||
0x00, 0x16, 0x11, 0x01, 0x00, 0x16, 0x42, 0x03,
|
|
||||||
0x20, 0x72, 0x22, 0x02, 0x00, 0x55, 0x55, 0x07,
|
|
||||||
0x00, 0x55, 0x55, 0x02, 0x00, 0x55, 0x75, 0x05,
|
|
||||||
0x00, 0x55, 0x52, 0x05, 0x00, 0x55, 0x65, 0x34,
|
|
||||||
0x00, 0x47, 0x12, 0x07, 0x24, 0x12, 0x22, 0x04,
|
|
||||||
0x22, 0x02, 0x22, 0x02, 0x21, 0x42, 0x22, 0x01,
|
|
||||||
0xa0, 0x05, 0x00, 0x00, 0x20, 0x55, 0x75, 0x00,
|
|
||||||
0x20, 0x15, 0x51, 0x32, 0x05, 0x55, 0x55, 0x07,
|
|
||||||
0x12, 0x52, 0x17, 0x06, 0xa4, 0x43, 0x56, 0x06,
|
|
||||||
0x05, 0x43, 0x56, 0x06, 0x42, 0x43, 0x56, 0x06,
|
|
||||||
0x52, 0x42, 0x56, 0x06, 0x00, 0x16, 0x11, 0x36,
|
|
||||||
0x52, 0x52, 0x17, 0x06, 0x05, 0x52, 0x17, 0x06,
|
|
||||||
0x42, 0x52, 0x17, 0x06, 0x50, 0x30, 0x22, 0x07,
|
|
||||||
0x52, 0x30, 0x22, 0x07, 0x42, 0x30, 0x22, 0x07,
|
|
||||||
0x05, 0x52, 0x57, 0x05, 0x52, 0x52, 0x57, 0x05,
|
|
||||||
0x24, 0x17, 0x13, 0x07, 0x00, 0xad, 0x5e, 0x0e,
|
|
||||||
0xe0, 0xf5, 0x55, 0x0d, 0x52, 0x20, 0x55, 0x02,
|
|
||||||
0x05, 0x52, 0x55, 0x02, 0x42, 0x52, 0x55, 0x02,
|
|
||||||
0x52, 0x50, 0x55, 0x07, 0x42, 0x50, 0x55, 0x07,
|
|
||||||
0x05, 0x55, 0x65, 0x34, 0x05, 0x52, 0x55, 0x02,
|
|
||||||
0x05, 0x55, 0x55, 0x07, 0x20, 0x16, 0x61, 0x02,
|
|
||||||
0x2c, 0x72, 0x22, 0x0f, 0x50, 0x25, 0x27, 0x02,
|
|
||||||
0x30, 0x35, 0xd5, 0x05, 0x48, 0xe4, 0x54, 0x02,
|
|
||||||
0x24, 0x43, 0x56, 0x06, 0x24, 0x30, 0x22, 0x07,
|
|
||||||
0x12, 0x52, 0x55, 0x02, 0x24, 0x50, 0x55, 0x07,
|
|
||||||
0x5a, 0x30, 0x55, 0x05, 0x5a, 0x90, 0xdb, 0x09,
|
|
||||||
0x56, 0x0e, 0x0f, 0x00, 0x52, 0x02, 0x07, 0x00,
|
|
||||||
0x20, 0x20, 0x51, 0x02, 0x00, 0x70, 0x11, 0x00,
|
|
||||||
0x00, 0xe0, 0x88, 0x00, 0x11, 0x25, 0x8d, 0xc4,
|
|
||||||
0x11, 0x25, 0xa1, 0x8e, 0x20, 0x20, 0x22, 0x02,
|
|
||||||
0x00, 0xa0, 0xa5, 0x00, 0x00, 0x50, 0x5a, 0x00,
|
|
||||||
0x28, 0x28, 0x28, 0x28, 0x5a, 0x5a, 0x5a, 0x5a,
|
|
||||||
0xeb, 0xeb, 0xeb, 0xeb, 0x44, 0x44, 0x44, 0x44,
|
|
||||||
0x44, 0x74, 0x44, 0x44, 0x44, 0x47, 0x47, 0x44,
|
|
||||||
0xaa, 0xba, 0xaa, 0xaa, 0x00, 0xf0, 0xaa, 0xaa,
|
|
||||||
0x00, 0x47, 0x47, 0x44, 0xaa, 0x8b, 0xab, 0xaa,
|
|
||||||
0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x8f, 0xab, 0xaa,
|
|
||||||
0xaa, 0x8b, 0x0f, 0x00, 0xaa, 0xfa, 0x00, 0x00,
|
|
||||||
0x44, 0x47, 0x07, 0x00, 0x00, 0x70, 0x44, 0x44,
|
|
||||||
0x44, 0xc4, 0x00, 0x00, 0x44, 0xf4, 0x00, 0x00,
|
|
||||||
0x00, 0xf0, 0x44, 0x44, 0x44, 0xc4, 0x44, 0x44,
|
|
||||||
0x00, 0xf0, 0x00, 0x00, 0x44, 0xf4, 0x44, 0x44,
|
|
||||||
0x44, 0x4c, 0x4c, 0x44, 0xaa, 0xaa, 0xaa, 0xaa,
|
|
||||||
0xaa, 0x2a, 0x0e, 0x00, 0x00, 0x2e, 0xaa, 0xaa,
|
|
||||||
0xaa, 0x0b, 0x0f, 0x00, 0x00, 0x0f, 0xab, 0xaa,
|
|
||||||
0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x0f, 0x0f, 0x00,
|
|
||||||
0xaa, 0x0b, 0xab, 0xaa, 0x44, 0x0f, 0x0f, 0x00,
|
|
||||||
0xaa, 0xfa, 0x00, 0x00, 0x00, 0x0f, 0x4f, 0x44,
|
|
||||||
0x00, 0xf0, 0xaa, 0xaa, 0xaa, 0xea, 0x00, 0x00,
|
|
||||||
0x44, 0x4c, 0x0c, 0x00, 0x00, 0x4c, 0x4c, 0x44,
|
|
||||||
0x00, 0xe0, 0xaa, 0xaa, 0xaa, 0xfa, 0xaa, 0xaa,
|
|
||||||
0x44, 0x4f, 0x4f, 0x44, 0x44, 0x74, 0x00, 0x00,
|
|
||||||
0x00, 0xc0, 0x44, 0x44, 0xff, 0xff, 0xff, 0xff,
|
|
||||||
0x00, 0x00, 0xff, 0xff, 0x33, 0x33, 0x33, 0x33,
|
|
||||||
0xcc, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0x00, 0x00,
|
|
||||||
0x00, 0xa0, 0x55, 0x0a, 0x30, 0x35, 0x95, 0x05,
|
|
||||||
0xf0, 0x19, 0x11, 0x01, 0x00, 0x5f, 0x55, 0x05,
|
|
||||||
0x00, 0x17, 0x12, 0x07, 0x00, 0x5e, 0x55, 0x02,
|
|
||||||
0x00, 0xaa, 0x2e, 0x01, 0x00, 0x5a, 0x44, 0x04,
|
|
||||||
0x70, 0x52, 0x25, 0x07, 0x20, 0x75, 0x55, 0x02,
|
|
||||||
0x60, 0x99, 0x66, 0x0f, 0x60, 0x21, 0x55, 0x02,
|
|
||||||
0x00, 0xd6, 0x6b, 0x00, 0x80, 0x9f, 0xf9, 0x01,
|
|
||||||
0x60, 0x71, 0x11, 0x06, 0x20, 0x55, 0x55, 0x05,
|
|
||||||
0x70, 0x70, 0x70, 0x00, 0x20, 0x27, 0x70, 0x00,
|
|
||||||
0x10, 0x42, 0x12, 0x07, 0x40, 0x12, 0x42, 0x07,
|
|
||||||
0x80, 0x44, 0x44, 0x44, 0x44, 0x44, 0x25, 0x00,
|
|
||||||
0x00, 0x02, 0x07, 0x02, 0xa0, 0x05, 0x5a, 0x00,
|
|
||||||
0x52, 0x02, 0x00, 0x00, 0x00, 0x60, 0x06, 0x00,
|
|
||||||
0x00, 0x00, 0x02, 0x00, 0x4c, 0x54, 0x46, 0x00,
|
|
||||||
0x57, 0x55, 0x00, 0x00, 0x43, 0x72, 0x00, 0x00,
|
|
||||||
0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const txt_font_t small_font =
|
|
||||||
{
|
|
||||||
"small", small_font_data, 4, 8,
|
|
||||||
};
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
@ -43,9 +43,7 @@ typedef struct
|
|||||||
|
|
||||||
// Fonts:
|
// Fonts:
|
||||||
|
|
||||||
#include "fonts/small.h"
|
|
||||||
#include "fonts/normal.h"
|
#include "fonts/normal.h"
|
||||||
#include "fonts/large.h"
|
|
||||||
#include "fonts/codepage.h"
|
#include "fonts/codepage.h"
|
||||||
|
|
||||||
// Time between character blinks in ms
|
// Time between character blinks in ms
|
||||||
@ -56,6 +54,7 @@ SDL_Window *TXT_SDLWindow = NULL;
|
|||||||
static SDL_Surface *screenbuffer;
|
static SDL_Surface *screenbuffer;
|
||||||
static unsigned char *screendata;
|
static unsigned char *screendata;
|
||||||
static SDL_Renderer *renderer;
|
static SDL_Renderer *renderer;
|
||||||
|
static SDL_Texture *texture_upscaled;
|
||||||
|
|
||||||
// Current input mode.
|
// Current input mode.
|
||||||
static txt_input_mode_t input_mode = TXT_INPUT_NORMAL;
|
static txt_input_mode_t input_mode = TXT_INPUT_NORMAL;
|
||||||
@ -70,10 +69,6 @@ static void *event_callback_data;
|
|||||||
// Font we are using:
|
// Font we are using:
|
||||||
static const txt_font_t *font;
|
static const txt_font_t *font;
|
||||||
|
|
||||||
// Dummy "font" that means to try highdpi rendering, or fallback to
|
|
||||||
// normal_font otherwise.
|
|
||||||
static const txt_font_t highdpi_font = { "normal-highdpi", NULL, 8, 16 };
|
|
||||||
|
|
||||||
// Mapping from SDL keyboard scancode to internal key code.
|
// Mapping from SDL keyboard scancode to internal key code.
|
||||||
static const int scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
|
static const int scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
|
||||||
|
|
||||||
@ -106,121 +101,6 @@ static const SDL_Color ega_colors[] =
|
|||||||
{0xfe, 0xfe, 0xfe, 0xff}, // 15: Bright white
|
{0xfe, 0xfe, 0xfe, 0xff}, // 15: Bright white
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
// Examine system DPI settings to determine whether to use the large font.
|
|
||||||
|
|
||||||
static int Win32_UseLargeFont(void)
|
|
||||||
{
|
|
||||||
HDC hdc = GetDC(NULL);
|
|
||||||
int dpix;
|
|
||||||
|
|
||||||
if (!hdc)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
dpix = GetDeviceCaps(hdc, LOGPIXELSX);
|
|
||||||
ReleaseDC(NULL, hdc);
|
|
||||||
|
|
||||||
// 144 is the DPI when using "150%" scaling. If the user has this set
|
|
||||||
// then consider this an appropriate threshold for using the large font.
|
|
||||||
|
|
||||||
return dpix >= 144;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const txt_font_t *FontForName(const char *name)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
const txt_font_t *fonts[] =
|
|
||||||
{
|
|
||||||
&small_font,
|
|
||||||
&normal_font,
|
|
||||||
&large_font,
|
|
||||||
&highdpi_font,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
for (i = 0; fonts[i]->name != NULL; ++i)
|
|
||||||
{
|
|
||||||
if (!strcmp(fonts[i]->name, name))
|
|
||||||
{
|
|
||||||
return fonts[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// Select the font to use, based on screen resolution
|
|
||||||
//
|
|
||||||
// If the highest screen resolution available is less than
|
|
||||||
// 640x480, use the small font.
|
|
||||||
//
|
|
||||||
|
|
||||||
static void ChooseFont(void)
|
|
||||||
{
|
|
||||||
SDL_DisplayMode desktop_info;
|
|
||||||
char *env;
|
|
||||||
|
|
||||||
// Allow normal selection to be overridden from an environment variable:
|
|
||||||
env = M_getenv("TEXTSCREEN_FONT");
|
|
||||||
if (env != NULL)
|
|
||||||
{
|
|
||||||
font = FontForName(env);
|
|
||||||
|
|
||||||
if (font != NULL)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get desktop resolution.
|
|
||||||
// If in doubt and we can't get a list, always prefer to
|
|
||||||
// fall back to the normal font:
|
|
||||||
if (SDL_GetCurrentDisplayMode(0, &desktop_info))
|
|
||||||
{
|
|
||||||
font = &highdpi_font;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// On tiny low-res screens (eg. palmtops) use the small font.
|
|
||||||
// If the screen resolution is at least 1920x1080, this is
|
|
||||||
// a modern high-resolution display, and we can use the
|
|
||||||
// large font.
|
|
||||||
|
|
||||||
if (desktop_info.w < 640 || desktop_info.h < 480)
|
|
||||||
{
|
|
||||||
font = &small_font;
|
|
||||||
}
|
|
||||||
#ifdef _WIN32
|
|
||||||
// On Windows we can use the system DPI settings to make a
|
|
||||||
// more educated guess about whether to use the large font.
|
|
||||||
|
|
||||||
else if (Win32_UseLargeFont())
|
|
||||||
{
|
|
||||||
font = &large_font;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
// TODO: Detect high DPI on Linux by inquiring about Gtk+ scale
|
|
||||||
// settings. This looks like it should just be a case of shelling
|
|
||||||
// out to invoke the 'gsettings' command, eg.
|
|
||||||
// gsettings get org.gnome.desktop.interface text-scaling-factor
|
|
||||||
// and using large_font if the result is >= 2.
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// highdpi_font usually means normal_font (the normal resolution
|
|
||||||
// version), but actually means "set the HIGHDPI flag and try
|
|
||||||
// to use large_font if we initialize successfully".
|
|
||||||
font = &highdpi_font;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Initialize text mode screen
|
// Initialize text mode screen
|
||||||
//
|
//
|
||||||
@ -243,37 +123,28 @@ void TXT_PreInit(SDL_Window *preset_window, SDL_Renderer *preset_renderer)
|
|||||||
int TXT_Init(void)
|
int TXT_Init(void)
|
||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
|
SDL_RendererInfo info;
|
||||||
|
|
||||||
if (SDL_Init(SDL_INIT_VIDEO) < 0)
|
if (SDL_Init(SDL_INIT_VIDEO) < 0)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ChooseFont();
|
font = &normal_font;
|
||||||
|
|
||||||
screen_image_w = TXT_SCREEN_W * font->w;
|
screen_image_w = TXT_SCREEN_W * font->w;
|
||||||
screen_image_h = TXT_SCREEN_H * font->h;
|
screen_image_h = TXT_SCREEN_H * font->h;
|
||||||
|
|
||||||
// If highdpi_font is selected, try to initialize high dpi rendering.
|
// try to initialize high dpi rendering.
|
||||||
if (font == &highdpi_font)
|
flags |= SDL_WINDOW_ALLOW_HIGHDPI;
|
||||||
{
|
|
||||||
flags |= SDL_WINDOW_ALLOW_HIGHDPI;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TXT_SDLWindow == NULL)
|
if (TXT_SDLWindow == NULL)
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
|
|
||||||
if (font == &normal_font || font == &highdpi_font)
|
w = 3 * screen_image_w / 2;
|
||||||
{
|
h = 3 * screen_image_h / 2;
|
||||||
w = 3 * screen_image_w / 2;
|
|
||||||
h = 3 * screen_image_h / 2;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
w = screen_image_w;
|
|
||||||
h = screen_image_h;
|
|
||||||
}
|
|
||||||
flags |= SDL_WINDOW_RESIZABLE;
|
flags |= SDL_WINDOW_RESIZABLE;
|
||||||
|
|
||||||
TXT_SDLWindow = SDL_CreateWindow("",
|
TXT_SDLWindow = SDL_CreateWindow("",
|
||||||
@ -296,32 +167,6 @@ int TXT_Init(void)
|
|||||||
if (renderer == NULL)
|
if (renderer == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
// Special handling for OS X retina display. If we successfully set the
|
|
||||||
// highdpi flag, check the output size for the screen renderer. If we get
|
|
||||||
// the 2x doubled size we expect from a retina display, use the large font
|
|
||||||
// for drawing the screen.
|
|
||||||
if ((SDL_GetWindowFlags(TXT_SDLWindow) & SDL_WINDOW_ALLOW_HIGHDPI) != 0)
|
|
||||||
{
|
|
||||||
int render_w, render_h;
|
|
||||||
|
|
||||||
if (SDL_GetRendererOutputSize(renderer, &render_w, &render_h) == 0
|
|
||||||
&& render_w >= TXT_SCREEN_W * large_font.w
|
|
||||||
&& render_h >= TXT_SCREEN_H * large_font.h)
|
|
||||||
{
|
|
||||||
font = &large_font;
|
|
||||||
// Note that we deliberately do not update screen_image_{w,h}
|
|
||||||
// since these are the dimensions of textscreen image in screen
|
|
||||||
// coordinates, not pixels.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Failed to initialize for high dpi (retina display) rendering? If so
|
|
||||||
// then use the normal resolution font instead.
|
|
||||||
if (font == &highdpi_font)
|
|
||||||
{
|
|
||||||
font = &normal_font;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Instead, we draw everything into an intermediate 8-bit surface
|
// Instead, we draw everything into an intermediate 8-bit surface
|
||||||
// the same dimensions as the screen. SDL then takes care of all the
|
// the same dimensions as the screen. SDL then takes care of all the
|
||||||
// 8->32 bit (or whatever depth) color conversions for us.
|
// 8->32 bit (or whatever depth) color conversions for us.
|
||||||
@ -340,6 +185,22 @@ int TXT_Init(void)
|
|||||||
screendata = malloc(TXT_SCREEN_W * TXT_SCREEN_H * 2);
|
screendata = malloc(TXT_SCREEN_W * TXT_SCREEN_H * 2);
|
||||||
memset(screendata, 0, TXT_SCREEN_W * TXT_SCREEN_H * 2);
|
memset(screendata, 0, TXT_SCREEN_W * TXT_SCREEN_H * 2);
|
||||||
|
|
||||||
|
SDL_GetRendererInfo(renderer, &info);
|
||||||
|
|
||||||
|
if (!(info.flags & SDL_RENDERER_SOFTWARE))
|
||||||
|
{
|
||||||
|
// Set the scaling quality for rendering the upscaled texture to "linear",
|
||||||
|
// which looks much softer and smoother than "nearest" but does a better
|
||||||
|
// job at downscaling from the upscaled texture to screen.
|
||||||
|
|
||||||
|
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
|
||||||
|
|
||||||
|
texture_upscaled = SDL_CreateTexture(renderer,
|
||||||
|
SDL_GetWindowPixelFormat(TXT_SDLWindow),
|
||||||
|
SDL_TEXTUREACCESS_TARGET,
|
||||||
|
2*screenbuffer->w, 2*screenbuffer->h);
|
||||||
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -478,7 +339,7 @@ void TXT_UpdateScreenArea(int x, int y, int w, int h)
|
|||||||
|
|
||||||
SDL_UnlockSurface(screenbuffer);
|
SDL_UnlockSurface(screenbuffer);
|
||||||
|
|
||||||
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
|
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, texture_upscaled ? "nearest" : "linear");
|
||||||
|
|
||||||
// TODO: This is currently creating a new texture every time we render
|
// TODO: This is currently creating a new texture every time we render
|
||||||
// the screen; find a more efficient way to do it.
|
// the screen; find a more efficient way to do it.
|
||||||
@ -486,9 +347,26 @@ void TXT_UpdateScreenArea(int x, int y, int w, int h)
|
|||||||
|
|
||||||
SDL_RenderClear(renderer);
|
SDL_RenderClear(renderer);
|
||||||
GetDestRect(&rect);
|
GetDestRect(&rect);
|
||||||
SDL_RenderCopy(renderer, screentx, NULL, &rect);
|
|
||||||
SDL_RenderPresent(renderer);
|
|
||||||
|
|
||||||
|
if (texture_upscaled)
|
||||||
|
{
|
||||||
|
// Render this intermediate texture into the upscaled texture
|
||||||
|
// using "nearest" integer scaling.
|
||||||
|
|
||||||
|
SDL_SetRenderTarget(renderer, texture_upscaled);
|
||||||
|
SDL_RenderCopy(renderer, screentx, NULL, NULL);
|
||||||
|
|
||||||
|
// Finally, render this upscaled texture to screen using linear scaling.
|
||||||
|
|
||||||
|
SDL_SetRenderTarget(renderer, NULL);
|
||||||
|
SDL_RenderCopy(renderer, texture_upscaled, NULL, NULL);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SDL_RenderCopy(renderer, screentx, NULL, &rect);
|
||||||
|
}
|
||||||
|
|
||||||
|
SDL_RenderPresent(renderer);
|
||||||
SDL_DestroyTexture(screentx);
|
SDL_DestroyTexture(screentx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user