nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Render the two block glyphs using FillRect instead of DrawText.

Browse Source
This commit is contained in:
Bart House
2018-12-09 11:30:29 -08:00
parent f2195c1212
commit fccc3cbee6
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
win/win32/mhmap.c
View File

@@ -160,25 +160,33 @@ mswin_map_stretch(HWND hWnd, LPSIZE map_size, BOOL redraw)
// calculate back buffer scale // calculate back buffer scale
data->monitorScale = win10_monitor_scale(hWnd); data->monitorScale = win10_monitor_scale(hWnd);
if (data->bAsciiMode || Is_rogue_level(&u.uz)) { boolean bText = data->bAsciiMode || (u.uz.dlevel != 0 && Is_rogue_level(&u.uz));
if (bText && !data->bFitToScreenMode)
data->backScale = data->monitorScale; data->backScale = data->monitorScale;
} else { else
data->backScale = 1.0; data->backScale = 1.0;
}
/* set back buffer tile size */ /* set back buffer tile size */
data->xBackTile = (int) (data->tileWidth * data->backScale); if (bText && data->bFitToScreenMode) {
data->yBackTile = (int) (data->tileHeight * data->backScale); data->xBackTile = wnd_size.cx / COLNO;
data->yBackTile = wnd_size.cy / ROWNO;
data->yBackTile = max(data->yBackTile, 12);
} else {
data->xBackTile = (int)(data->tileWidth * data->backScale);
data->yBackTile = (int)(data->tileHeight * data->backScale);
}
if (data->bAsciiMode || Is_rogue_level(&u.uz)) { if (bText) {
LOGFONT lgfnt; LOGFONT lgfnt;
ZeroMemory(&lgfnt, sizeof(lgfnt)); ZeroMemory(&lgfnt, sizeof(lgfnt));
lgfnt.lfHeight = -data->yBackTile; // height of font lgfnt.lfHeight = -data->yBackTile; // height of font
lgfnt.lfWidth = -data->xBackTile; // average character width lgfnt.lfWidth = 0; // average character width
lgfnt.lfEscapement = 0; // angle of escapement lgfnt.lfEscapement = 0; // angle of escapement
lgfnt.lfOrientation = 0; // base-line orientation angle lgfnt.lfOrientation = 0; // base-line orientation angle
lgfnt.lfWeight = FW_NORMAL; // font weight lgfnt.lfWeight = FW_SEMIBOLD; // font weight
// lgfnt.lfWeight = FW_NORMAL; // font weight
lgfnt.lfItalic = FALSE; // italic attribute option lgfnt.lfItalic = FALSE; // italic attribute option
lgfnt.lfUnderline = FALSE; // underline attribute option lgfnt.lfUnderline = FALSE; // underline attribute option
lgfnt.lfStrikeOut = FALSE; // strikeout attribute option lgfnt.lfStrikeOut = FALSE; // strikeout attribute option
@@ -191,13 +199,18 @@ mswin_map_stretch(HWND hWnd, LPSIZE map_size, BOOL redraw)
NH_A2W(iflags.wc_font_map, lgfnt.lfFaceName, LF_FACESIZE); NH_A2W(iflags.wc_font_map, lgfnt.lfFaceName, LF_FACESIZE);
} else { } else {
lgfnt.lfPitchAndFamily = FIXED_PITCH; // pitch and family lgfnt.lfPitchAndFamily = FIXED_PITCH; // pitch and family
NH_A2W(NHMAP_FONT_NAME, lgfnt.lfFaceName, LF_FACESIZE); // NH_A2W(NHMAP_FONT_NAME, lgfnt.lfFaceName, LF_FACESIZE);
NH_A2W("Courier New", lgfnt.lfFaceName, LF_FACESIZE);
} }
TEXTMETRIC textMetrics; TEXTMETRIC textMetrics;
HFONT font; HFONT font = NULL;
while (1) { while (1) {
if (font != NULL)
DeleteObject(font);
font = CreateFontIndirect(&lgfnt); font = CreateFontIndirect(&lgfnt);
SelectObject(data->backBufferDC, font); SelectObject(data->backBufferDC, font);
@@ -210,7 +223,7 @@ mswin_map_stretch(HWND hWnd, LPSIZE map_size, BOOL redraw)
} }
if (textMetrics.tmAveCharWidth > data->xBackTile) { if (textMetrics.tmAveCharWidth > data->xBackTile) {
lgfnt.lfWidth++; lgfnt.lfHeight++;
continue; continue;
} }
@@ -256,7 +269,7 @@ mswin_map_stretch(HWND hWnd, LPSIZE map_size, BOOL redraw)
/* calculate front buffer tile size */ /* calculate front buffer tile size */
if (wnd_size.cx > 0 && wnd_size.cy > 0 && data->bFitToScreenMode) { if (wnd_size.cx > 0 && wnd_size.cy > 0 && !bText && data->bFitToScreenMode) {
double windowAspectRatio = double windowAspectRatio =
(double) wnd_size.cx / (double) wnd_size.cy; (double) wnd_size.cx / (double) wnd_size.cy;
@@ -893,9 +906,22 @@ paintGlyph(PNHMapWindow data, int i, int j, RECT * rect)
#endif #endif
if (data->bUnicodeFont) { if (data->bUnicodeFont) {
wch = winos_ascii_to_wide(ch); wch = winos_ascii_to_wide(ch);
DrawTextW(data->backBufferDC, &wch, 1, rect, if (wch == 0x2591 || wch == 0x2592) {
DT_CENTER | DT_VCENTER | DT_NOPREFIX int level = 80;
| DT_SINGLELINE); HBRUSH brush = CreateSolidBrush(RGB(level, level, level));
FillRect(data->backBufferDC, rect, brush);
DeleteObject(brush);
level = (wch == 0x2591 ? 100 : 200);
brush = CreateSolidBrush(RGB(level, level, level));
RECT smallRect = { rect->left + 1, rect->top + 1,
rect->right - 1, rect->bottom - 1 };
FillRect(data->backBufferDC, &smallRect, brush);
DeleteObject(brush);
} else {
DrawTextW(data->backBufferDC, &wch, 1, rect,
DT_CENTER | DT_VCENTER | DT_NOPREFIX
| DT_SINGLELINE);
}
} else { } else {
DrawTextA(data->backBufferDC, &ch, 1, rect, DrawTextA(data->backBufferDC, &ch, 1, rect,
DT_CENTER | DT_VCENTER | DT_NOPREFIX DT_CENTER | DT_VCENTER | DT_NOPREFIX