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

add some unicode support (trunk only)

Browse Source 
This patch attempts to add some levels of unicode support
to NetHack.

The master on/off switch for any Unicode support is
defining UNICODE_SUPPORT in config.h. Currently
there is code support for two subsets of unicode support:

UNICODE_DRAWING

If UNICODE_DRAWING is defined, then the data
structures used to house drawing symbols are expanded
to the size of wchar_t, big enough to hold unicode characters.
A typdef called `nhsym' is involved and if UNICODE_DRAWING
is defined, it is wchar_t, otherwise it is uchar.

UNICODE_WIDEWINPORT

If UNICODE_WIDEWINPORT is defined, then the data
structures inside the window port are expanded to the size of
wchar_t, big enough to hold unicode characters.  Both map
symbols and text within the window port are expanded, in order
for potential support for displaying multinational characters some
day, but this patch only provides viewing of map symbols.
A typdef called `nhwchar' is involved and if UNICODE_WIDEWINPORT
is defined, it is wchar_t, otherwise it is char.

The only window port with code support for UNICODE_WIDEWINPORT
currently is the TTY port.  Don't enable UNICODE_WIDEWINPORT
unless:
- it is a TTY port
- the underlying platform specific routines can
handle the larger data structures.

Don't enable UNICODE_SUPPORT unless:
- your compiler can handle wchar_t.
- your compiler can accept L'a' characters.
- your compiler can accept L"wide" strings.

Note that if your compiler can handle the above, you could
enable the larger data structures (currently if TTY) even if your
platform can't actually display unicode or UTF-8, by messing
with u_putch() in win/tty/wintty.c to only deal regular chars.
That should be the only function that actually pushes wide characters
out to the display.

If you enable UNICODE_SUPPORT, and your platform is capable
you will need to turn on the unicode run-time option to be able to
load unicode character sets from the symbol file, to be able to
push unicode characters to the display. You'll also want to load
a unicode symbol set once the unicode option is toggled on. In
a config file you would do that via these two lines:
OPTIONS=unicode
OPTIONS=symset:Unicode_non_US

The repository was stamped with NETHACK_PRE_UNICODE
prior to applying this patch, and stamped with
NETHACK_POST_UNICODE afterwards. The code differences
between those two tagged versions are this patch.
This commit is contained in:
nethack.allison
2006-10-17 23:55:42 +00:00
parent 3054c1c846
commit 7f0f43e6f9
22 changed files with 1193 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
sys/winnt/nttty.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)nttty.c 3.5 $Date$ */
/* SCCS Id: @(#)nttty.c 3.5 $Date$ */
/* Copyright (c) NetHack PC Development Team 1993 */
/* NetHack may be freely redistributed. See license for details. */
@@ -61,9 +61,6 @@ int GUILaunched;
extern int redirect_stdout;
static BOOL FDECL(CtrlHandler, (DWORD));
/* Flag for whether unicode is supported */
static boolean has_unicode;
#ifdef PORT_DEBUG
static boolean display_cursor_info = FALSE;
#endif
@@ -146,6 +143,12 @@ static void NDECL(init_ttycolor);
# endif
static void NDECL(really_move_cursor);
#ifdef UNICODE_WIDEWINPORT
void FDECL(xputc_core,(NHWCHAR_P));
#else
void FDECL(xputc_core,(int));
#endif
#define MAX_OVERRIDES 256
unsigned char key_overrides[MAX_OVERRIDES];
@@ -193,11 +196,14 @@ const char *s;
void
setftty()
{
static int cp = 0;
if (!cp) cp = GetConsoleOutputCP();
/* SetConsoleOutputCP(1250); */
#ifdef CHANGE_COLOR
if (altered_palette) adjust_palette();
#endif
start_screen();
has_unicode = ((GetVersion() & 0x80000000) == 0);
iflags.unicodecapable = ((GetVersion() & 0x80000000) == 0);
}
void
@@ -448,24 +454,61 @@ int x,y;
ttyDisplay->cury = y;
}
#ifdef UNICODE_WIDEWINPORT
#define T(x) L##x
#else
#define T(x) x
#endif
void
xputc_core(ch)
char ch;
xputc_core(ich)
#ifdef UNICODE_WIDEWINPORT
nhwchar ich;
#else
int ich;
#endif
{
static uchar c[2] = {0,0};
char ch = (char)ich;
#if 0
/*EURO symbol*/
if (ich == 0x20AC) {
if (!c[0]) {
wchar_t t[2]={0x20ac, 0x0000};
int cp = GetConsoleOutputCP();
(void) WideCharToMultiByte(cp,
0,
t, 1,
c, 2,
(LPCSTR)0,
(LPBOOL)0);
}
ich = (nhwchar)c[0];
}
#endif
#ifdef UNICODE_WIDEWINPORT
switch(ich) {
#else
switch(ch) {
case '\n':
#endif
case T('\n'):
cursor.Y++;
/* fall through */
case '\r':
case T('\r'):
cursor.X = 1;
break;
case '\b':
case T('\b'):
cursor.X--;
break;
default:
WriteConsoleOutputAttribute(hConOut,&attr,1,
cursor,&acount);
if (has_unicode) {
if (iflags.unicodedisp) {
#ifdef UNICODE_WIDEWINPORT
WriteConsoleOutputCharacterW(hConOut,&ich,1,
cursor,&ccount);
#else
/* Avoid bug in ANSI API on WinNT */
WCHAR c2[2];
int rc;
@@ -476,6 +519,7 @@ char ch;
c2, 2);
WriteConsoleOutputCharacterW(hConOut,c2,rc,
cursor,&ccount);
#endif
}
else {
WriteConsoleOutputCharacterA(hConOut,&ch,1,
@@ -487,7 +531,11 @@ char ch;
void
xputc(ch)
char ch;
#ifdef UNICODE_WIDEWINPORT
nhwchar ch;
#else
int ch;
#endif
{
cursor.X = ttyDisplay->curx;
cursor.Y = ttyDisplay->cury;
@@ -518,8 +566,8 @@ const char *s;
* for win32. It is used for glyphs only, not text.
*/
void
g_putch(in_ch)
int in_ch;
g_putch(in_sym)
int in_sym;
{
/* CP437 to Unicode mapping according to the Unicode Consortium */
static const WCHAR cp437[] =
@@ -557,12 +605,17 @@ int in_ch;
0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248,
0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0
};
unsigned char ch = (unsigned char)in_ch;
uchar ch = (uchar)in_sym;
cursor.X = ttyDisplay->curx;
cursor.Y = ttyDisplay->cury;
WriteConsoleOutputAttribute(hConOut,&attr,1,cursor,&acount);
if (has_unicode)
#ifdef UNICODE_DRAWING
if (symset[currentgraphics].name && iflags.unicodedisp)
WriteConsoleOutputCharacterW(hConOut,(LPCWSTR)&in_sym,1,cursor,&ccount);
else
#endif
if (SYMHANDLING(H_IBM))
WriteConsoleOutputCharacterW(hConOut,&cp437[ch],1,cursor,&ccount);
else
WriteConsoleOutputCharacterA(hConOut,&ch,1,cursor,&ccount);