joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update font

Browse Source
This commit is contained in:
Wengier
2021-05-20 00:04:06 -04:00
parent 8cf136e61e
commit 932613ed80
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/sdlmain.cpp
View File

@@ -10346,6 +10346,7 @@ bool vid_select_glsl_shader_menu_callback(DOSBoxMenu* const menu, DOSBoxMenu::it
#endif
#ifdef USE_TTF
void UpdateDefaultPrinterFont();
void ttf_reset() {
OUTPUT_TTF_Select(2);
resetFontSize();
@@ -10383,8 +10384,10 @@ bool vid_select_ttf_font_menu_callback(DOSBoxMenu* const menu, DOSBoxMenu::item*
if (*name) {
SetVal("render", "ttf.font", name);
void ttf_reset(void);
ttf_reset();
#if C_PRINTER
if (TTF_using() && printfont) UpdateDefaultPrinterFont();
#endif
}
}
chdir( Temp_CurrentDir );
@@ -10921,7 +10924,6 @@ bool ttf_auto_boxdraw_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const
}
#if C_PRINTER
void UpdateDefaultPrinterFont();
bool ttf_print_font_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED

29
src/misc/programs.cpp
View File

@@ -88,7 +88,8 @@ public:
};
static std::vector<InternalProgramEntry*> internal_progs;
void EMS_Startup(Section* sec), EMS_DoShutDown(), resetFontSize();
void EMS_Startup(Section* sec), EMS_DoShutDown(), resetFontSize(), UpdateDefaultPrinterFont();
bool TTF_using();
void PROGRAMS_Shutdown(void) {
LOG(LOG_MISC,LOG_DEBUG)("Shutting down internal programs list");
@@ -1331,7 +1332,7 @@ void CONFIG::Run(void) {
}
#if defined(USE_TTF)
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(pvars[0].c_str(), "dos")) {
mountwarning = section->Get_bool("mountwarning");
@@ -1381,6 +1382,9 @@ void CONFIG::Run(void) {
if (!strcasecmp(inputline.substr(0, 9).c_str(), "ttf.font=")) {
#if defined(USE_TTF)
ttf_reset();
#if C_PRINTER
if (TTF_using() && printfont) UpdateDefaultPrinterFont();
#endif
#endif
} else if (!strcasecmp(inputline.substr(0, 9).c_str(), "ttf.lins=")||!strcasecmp(inputline.substr(0, 9).c_str(), "ttf.cols=")) {
#if defined(USE_TTF)
@@ -1413,66 +1417,65 @@ void CONFIG::Run(void) {
mainMenu.get_item("ttf_wpwp").check(wpType==1).refresh_item(mainMenu);
mainMenu.get_item("ttf_wpws").check(wpType==2).refresh_item(mainMenu);
mainMenu.get_item("ttf_wpxy").check(wpType==3).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 9).c_str(), "ttf.wpbg=")) {
#if defined(USE_TTF)
wpBG = section->Get_int("ttf.wpbg");
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 9).c_str(), "ttf.wpfg=")) {
#if defined(USE_TTF)
wpFG = section->Get_int("ttf.wpfg");
if (wpFG<0) wpFG = 7;
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 9).c_str(), "ttf.bold=")) {
#if defined(USE_TTF)
showbold = section->Get_bool("ttf.bold");
mainMenu.get_item("ttf_showbold").check(showbold).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 11).c_str(), "ttf.italic=")) {
#if defined(USE_TTF)
showital = section->Get_bool("ttf.italic");
mainMenu.get_item("ttf_showital").check(showital).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 14).c_str(), "ttf.underline=")) {
#if defined(USE_TTF)
showline = section->Get_bool("ttf.underline");
mainMenu.get_item("ttf_showline").check(showline).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 14).c_str(), "ttf.strikeout=")) {
#if defined(USE_TTF)
showsout = section->Get_bool("ttf.strikeout");
mainMenu.get_item("ttf_showsout").check(showsout).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 12).c_str(), "ttf.char512=")) {
#if defined(USE_TTF)
char512 = section->Get_bool("ttf.char512");
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 14).c_str(), "ttf.printfont=")) {
#if defined(USE_TTF) && C_PRINTER
printfont = section->Get_bool("ttf.printfont");
mainMenu.get_item("ttf_printfont").check(printfont).refresh_item(mainMenu);
void UpdateDefaultPrinterFont();
UpdateDefaultPrinterFont();
#endif
} else if (!strcasecmp(inputline.substr(0, 13).c_str(), "ttf.autodbcs=")) {
#if defined(USE_TTF)
dbcs_sbcs = section->Get_bool("ttf.autodbcs");
mainMenu.get_item("ttf_dbcs_sbcs").check(dbcs_sbcs).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 16).c_str(), "ttf.autoboxdraw=")) {
#if defined(USE_TTF)
autoboxdraw = section->Get_bool("ttf.autoboxdraw");
mainMenu.get_item("ttf_autoboxdraw").check(autoboxdraw).refresh_item(mainMenu);
resetFontSize();
if (TTF_using()) resetFontSize();
#endif
} else if (!strcasecmp(inputline.substr(0, 11).c_str(), "ttf.blinkc=")) {
#if defined(USE_TTF)