luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update and unify font handling

This commit is contained in:
Holger Vogt 2019-12-28 14:34:46 +01:00
parent 5aa7ab6f4b
commit 4d9167c446
1 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/winmain.c
View File

@ -117,7 +117,9 @@ static int VisibleRows = 10; /* Number of visible lines in text window
static BOOL DoUpdate = FALSE; /* Update text window */ static BOOL DoUpdate = FALSE; /* Update text window */
static WNDPROC swProc = NULL; /* original string window procedure */ static WNDPROC swProc = NULL; /* original string window procedure */
static WNDPROC twProc = NULL; /* original text window procedure */ static WNDPROC twProc = NULL; /* original text window procedure */
static HFONT sfont; /* Font for source and analysis window */ static HFONT efont; /* Font for element windows */
static HFONT tfont; /* Font for text window */
static HFONT sfont; /* Font for string window */
extern bool ft_ngdebug; /* some additional debug info printed */ extern bool ft_ngdebug; /* some additional debug info printed */
extern bool ft_batchmode; extern bool ft_batchmode;
@ -210,6 +212,8 @@ SetAnalyse(char *Analyse, /* in: analysis type */
WaitForIdle(); WaitForIdle();
OldAn[0] = '\0';
if (((DecaPercent == OldPercent) && !strcmp(OldAn, Analyse)) || !strcmp(Analyse, "or")) if (((DecaPercent == OldPercent) && !strcmp(OldAn, Analyse)) || !strcmp(Analyse, "or"))
return; return;
@ -263,14 +267,16 @@ SetAnalyse(char *Analyse, /* in: analysis type */
wchar_t tw[256]; wchar_t tw[256];
swprintf(sw, 256, L"%S", s); swprintf(sw, 256, L"%S", s);
swprintf(tw, 256, L"%S", t); swprintf(tw, 256, L"%S", t);
/* Analysis window */
SetWindowTextW(hwAnalyse, sw); SetWindowTextW(hwAnalyse, sw);
/* ngspice task bar */
SetWindowTextW(hwMain, tw); SetWindowTextW(hwMain, tw);
#endif #endif
InvalidateRgn(hwAnalyse, NULL, TRUE); InvalidateRgn(hwAnalyse, NULL, TRUE);
UpdateWindow(hwAnalyse);
InvalidateRgn(hwMain, NULL, TRUE); InvalidateRgn(hwMain, NULL, TRUE);
UpdateWindow(hwMain);
} }
UpdateWindow(hwAnalyse);
UpdateWindow(hwMain);
} }
@ -544,7 +550,7 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
DEFAULT_AFTER: DEFAULT_AFTER:
#ifdef EXT_ASC #ifdef EXT_ASC
return DefWindowProc(hwnd, uMsg, wParam, lParam); return DefWindowProc(hwnd, uMsg, wParam, lParam);
#else #else
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
@ -640,7 +646,7 @@ StringWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
else { else {
history_reset_pos(*pp_hi); history_reset_pos(*pp_hi);
} }
strcpy(SBuffer + n_char_returned, CRLF); strcpy(SBuffer + n_char_returned, CRLF);
ClearInput(); ClearInput();
@ -775,7 +781,7 @@ Element_OnPaint(HWND hwnd)
o = GetSysColorBrush(COLOR_BTNFACE); o = GetSysColorBrush(COLOR_BTNFACE);
FillRect(hdc, &s, o); FillRect(hdc, &s, o);
SetBkMode(hdc, TRANSPARENT); SetBkMode(hdc, TRANSPARENT);
SelectObject(hdc, sfont); SelectObject(hdc, efont);
ExtTextOutW(hdc, s.left + 1, s.top + 1, ETO_CLIPPED, &s, bufferW, (unsigned)i, NULL); ExtTextOutW(hdc, s.left + 1, s.top + 1, ETO_CLIPPED, &s, bufferW, (unsigned)i, NULL);
#endif #endif
/* End */ /* End */
@ -952,7 +958,7 @@ MakeArgcArgv(char *cmdline, int *argc, char ***argv)
/* Main entry point for our Windows application */ /* Main entry point for our Windows application */
#ifdef EXT_ASC #ifdef EXT_ASC
int WINAPI int WINAPI
WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpszCmdLine, _In_ int nCmdShow) WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpszCmdLine, _In_ int nCmdShow)
#elif __MINGW32__ /* MINGW bug not knowing wWinMain */ #elif __MINGW32__ /* MINGW bug not knowing wWinMain */
@ -1052,7 +1058,7 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
#endif #endif
/* Define text window class */ /* Define text window class */
#ifdef EXT_ASC #ifdef EXT_ASC
if (!GetClassInfo(NULL, "EDIT", &twTextClass)) if (!GetClassInfo(NULL, "EDIT", &twTextClass))
goto THE_END; goto THE_END;
@ -1076,7 +1082,7 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
#endif #endif
/* Define string window class */ /* Define string window class */
#ifdef EXT_ASC #ifdef EXT_ASC
if (!GetClassInfo(NULL, "EDIT", &swStringClass)) if (!GetClassInfo(NULL, "EDIT", &swStringClass))
goto THE_END; goto THE_END;
@ -1100,7 +1106,7 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
#endif #endif
/* Define status element class */ /* Define status element class */
#ifdef EXT_ASC #ifdef EXT_ASC
hwElementClass.style = CS_HREDRAW | CS_VREDRAW; hwElementClass.style = CS_HREDRAW | CS_VREDRAW;
hwElementClass.lpfnWndProc = ElementWindowProc; hwElementClass.lpfnWndProc = ElementWindowProc;
hwElementClass.cbClsExtra = 0; hwElementClass.cbClsExtra = 0;
@ -1129,9 +1135,19 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
goto THE_END; goto THE_END;
#endif #endif
/* Font for element status windows (source, analysis) */ /* Font for element status windows (source, analysis, Quit button) */
sfont = CreateFontW(16, 0, 0, 0, FW_SEMIBOLD, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, L""); efont = CreateFontW(16, 6, 0, 0, FW_SEMIBOLD, FALSE, FALSE, FALSE,
// sfont = CreateFontW(15, 0, 0, 0, FW_SEMIBOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, NONANTIALIASED_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier"); /*Create main window */ ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
ANTIALIASED_QUALITY, VARIABLE_PITCH, L"");
/* efont = CreateFontW(16, 0, 0, 0, FW_SEMIBOLD, FALSE, FALSE, FALSE,
DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
NONANTIALIASED_QUALITY, VARIABLE_PITCH, L"Segoe UI");*/
/* efont = CreateFontW(15, 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE,
ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
NONANTIALIASED_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier");*/
if (!efont)
efont = GetStockFont(ANSI_FIXED_FONT);
#ifdef EXT_ASC #ifdef EXT_ASC
SystemParametersInfo(SPI_GETWORKAREA, 0, &wsize, 0); SystemParametersInfo(SPI_GETWORKAREA, 0, &wsize, 0);
#else #else
@ -1148,7 +1164,7 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
0, iyt * 2, ix, iyt, NULL, NULL, hInst, NULL); 0, iyt * 2, ix, iyt, NULL, NULL, hInst, NULL);
#endif #endif
#else #else
#ifdef EXT_ASC #ifdef EXT_ASC
hwMain = CreateWindow(hwClassName, hwWindowName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, hwMain = CreateWindow(hwClassName, hwWindowName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
0, 0, ix, iy, NULL, NULL, hInst, NULL); 0, 0, ix, iy, NULL, NULL, hInst, NULL);
#else #else
@ -1173,17 +1189,15 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
if (!twText) if (!twText)
goto THE_END; goto THE_END;
/* Ansii fixed font */ #ifdef EXT_ASC
#ifdef EXT_ASC
{ {
HDC textDC; HDC textDC;
HFONT font;
TEXTMETRIC tm; TEXTMETRIC tm;
font = GetStockFont(ANSI_FIXED_FONT); tfont = GetStockFont(ANSI_FIXED_FONT);
SetWindowFont(twText, font, FALSE); SetWindowFont(twText, tfont, FALSE);
textDC = GetDC(twText); textDC = GetDC(twText);
if (textDC) { if (textDC) {
SelectObject(textDC, font); SelectObject(textDC, tfont);
if (GetTextMetrics(textDC, &tm)) { if (GetTextMetrics(textDC, &tm)) {
RowHeight = tm.tmHeight; RowHeight = tm.tmHeight;
WinLineWidth = 90 * tm.tmAveCharWidth; WinLineWidth = 90 * tm.tmAveCharWidth;
@ -1192,19 +1206,19 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
} }
} }
#else #else
{ {
HDC textDC; HDC textDC;
HFONT font;
TEXTMETRICW tm; TEXTMETRICW tm;
// font = CreateFontW(14, 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, NONANTIALIASED_QUALITY, FIXED_PITCH | FF_MODERN, L"Lucida Console"); tfont = CreateFontW(15, 0, 0, 0, FW_MEDIUM, FALSE, FALSE,
// if(!font) FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
font = CreateFontW(15, 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, NONANTIALIASED_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier"); NONANTIALIASED_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier");
if(!font) /* Ansi fixed font */
font = GetStockFont(ANSI_FIXED_FONT); if(!tfont)
SetWindowFont( twText, font, FALSE); tfont = GetStockFont(ANSI_FIXED_FONT);
SetWindowFont( twText, tfont, FALSE);
textDC = GetDC( twText); textDC = GetDC( twText);
if (textDC) { if (textDC) {
SelectObject( textDC, font); SelectObject( textDC, tfont);
if (GetTextMetricsW( textDC, &tm)) { if (GetTextMetricsW( textDC, &tm)) {
RowHeight = tm.tmHeight; RowHeight = tm.tmHeight;
WinLineWidth = 90 * tm.tmAveCharWidth; WinLineWidth = 90 * tm.tmAveCharWidth;
@ -1216,7 +1230,14 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
/* Create string window for input. Give a handle to history info to /* Create string window for input. Give a handle to history info to
* the window for saving and retrieving commands */ * the window for saving and retrieving commands */
#ifdef EXT_ASC /* Font for element status windows (source, analysis) */
sfont = CreateFontW(16, 0, 0, 0, FW_SEMIBOLD, FALSE, FALSE, FALSE,
DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
ANTIALIASED_QUALITY, VARIABLE_PITCH, L"");
/* Ansi fixed font */
if(!sfont)
sfont = GetStockFont(ANSI_FIXED_FONT);
#ifdef EXT_ASC
swString = CreateWindowEx(WS_EX_NOPARENTNOTIFY, swClassName, swWindowName, swString = CreateWindowEx(WS_EX_NOPARENTNOTIFY, swClassName, swWindowName,
ES_LEFT | WS_CHILD | WS_BORDER | ES_LEFT | WS_CHILD | WS_BORDER |
ES_AUTOHSCROLL, /* Allow text to scroll */ ES_AUTOHSCROLL, /* Allow text to scroll */
@ -1247,6 +1268,7 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
TEXTMETRICW tm; TEXTMETRICW tm;
stringDC = GetDC(swString); stringDC = GetDC(swString);
if (stringDC) { if (stringDC) {
SelectObject(stringDC, sfont);
if (GetTextMetricsW(stringDC, &tm)) if (GetTextMetricsW(stringDC, &tm))
LineHeight = tm.tmHeight + tm.tmExternalLeading + BorderSize; LineHeight = tm.tmHeight + tm.tmExternalLeading + BorderSize;
ReleaseDC(swString, stringDC); ReleaseDC(swString, stringDC);
@ -1254,23 +1276,21 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
} }
#endif #endif
/* Element windows */
/* Create source window */ /* Create source window */
#ifdef EXT_ASC #ifdef EXT_ASC
hwSource = CreateWindowEx(WS_EX_NOPARENTNOTIFY, hwElementClassName, hwSourceWindowName, hwSource = CreateWindowEx(WS_EX_NOPARENTNOTIFY, hwElementClassName, hwSourceWindowName,
WS_CHILD, WS_CHILD,
0, 0, SourceLength, StatusElHeight, hwMain, NULL, hInst, NULL); 0, 0, SourceLength, StatusElHeight, hwMain, NULL, hInst, NULL);
if (!hwSource)
goto THE_END;
#else #else
hwSource = CreateWindowExW(WS_EX_NOPARENTNOTIFY, hwElementClassNameW, hwSourceWindowNameW, hwSource = CreateWindowExW(WS_EX_NOPARENTNOTIFY, hwElementClassNameW, hwSourceWindowNameW,
WS_CHILD, WS_CHILD,
0, 0, SourceLength, StatusElHeight, hwMain, NULL, hInst, NULL); 0, 0, SourceLength, StatusElHeight, hwMain, NULL, hInst, NULL);
if (!hwSource) goto THE_END;
#endif #endif
if (!hwSource)
goto THE_END;
SetWindowFont(hwSource, efont, FALSE);
/* Create analysis window */ /* Create analysis window */
#ifdef EXT_ASC #ifdef EXT_ASC
@ -1285,6 +1305,8 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
if (!hwAnalyse) if (!hwAnalyse)
goto THE_END; goto THE_END;
SetWindowFont(hwAnalyse, efont, FALSE);
/* Create "Quit" button */ /* Create "Quit" button */
#ifdef EXT_ASC #ifdef EXT_ASC
hwQuitButton = CreateWindow("BUTTON", "Quit", WS_CHILD | BS_PUSHBUTTON, 0, 0, QuitButtonLength, hwQuitButton = CreateWindow("BUTTON", "Quit", WS_CHILD | BS_PUSHBUTTON, 0, 0, QuitButtonLength,
@ -1296,6 +1318,9 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
if (!hwQuitButton) if (!hwQuitButton)
goto THE_END; goto THE_END;
SetWindowFont(hwQuitButton, efont, FALSE);
/* Define a minimum width */ /* Define a minimum width */
int MinWidth = AnalyseLength + SourceLength + QuitButtonLength + 48; int MinWidth = AnalyseLength + SourceLength + QuitButtonLength + 48;
if (WinLineWidth < MinWidth) if (WinLineWidth < MinWidth)