more followup (trunk only)

make the handling recognition use an int instead of string.
This commit is contained in:
nethack.allison
2006-09-21 05:53:08 +00:00
parent 39d5f48ce0
commit 72011cb75f
8 changed files with 68 additions and 53 deletions

View File

@@ -386,7 +386,7 @@ tty_decgraphics_termcap_fixup()
* Do not select NA ASCII as the primary font since people may
* reasonably be using the UK character set.
*/
if (SYMHANDLING("DEC")) xputs("\033)0");
if (SYMHANDLING(H_DEC)) xputs("\033)0");
#ifdef PC9800
init_hilite();
#endif
@@ -449,19 +449,19 @@ tty_start_screen()
xputs(TI);
xputs(VS);
#ifdef PC9800
if (!SYMHANDLING("IBM"))
if (!SYMHANDLING(H_IBM))
tty_ascgraphics_hilite_fixup();
/* set up callback in case option is not set yet but toggled later */
ascgraphics_mode_callback = tty_ascgraphics_hilite_fixup;
# ifdef ASCIIGRAPH
if (SYMHANDLING("IBM")) init_hilite();
if (SYMHANDLING(H_IBM)) init_hilite();
/* set up callback in case option is not set yet but toggled later */
ibmgraphics_mode_callback = init_hilite;
# endif
#endif /* PC9800 */
#ifdef TERMLIB
if (SYMHANDLING("DEC")) tty_decgraphics_termcap_fixup();
if (SYMHANDLING(H_DEC)) tty_decgraphics_termcap_fixup();
/* set up callback in case option is not set yet but toggled later */
decgraphics_mode_callback = tty_decgraphics_termcap_fixup;
#endif

View File

@@ -2402,7 +2402,7 @@ int in_ch;
register char ch = (char)in_ch;
# if defined(ASCIIGRAPH) && !defined(NO_TERMS)
if (SYMHANDLING("IBM") || iflags.eight_bit_tty) {
if (SYMHANDLING(H_IBM) || iflags.eight_bit_tty) {
/* IBM-compatible displays don't need other stuff */
(void) putchar(ch);
} else if (ch & 0x80) {

View File

@@ -183,7 +183,7 @@ HGDIOBJ mswin_get_font(int win_type, int attr, HDC hdc, BOOL replace)
UINT mswin_charset()
{
CHARSETINFO cis;
if( SYMHANDLING("IBM") )
if( SYMHANDLING(H_IBM) )
if( TranslateCharsetInfo((DWORD*)GetOEMCP(), &cis, TCI_SRCCODEPAGE) )
return cis.ciCharset;
else