OSDN Git Service

Merge pull request #35763 (shimitei/hengband/fix/multi_window into master).
[hengbandforosx/hengbandosx.git] / src / main-win.c
index df8303a..08d64dd 100644 (file)
@@ -1,4 +1,4 @@
-/* File: main-win.c */
+/* File: main-win.c */
 
 /*
  * Copyright (c) 1997 Ben Harrison, Skirmantas Kligys, and others
 
 #include "angband.h"
 
-
 #ifdef WINDOWS
-
+#include <windows.h>
 #include <direct.h>
+#include <locale.h>
+#include "z-term.h"
 
 /*
  * Extract the "WIN32" flag from the compiler
 #define IDM_FILE_OPEN                  101
 #define IDM_FILE_SAVE                  110
 #define IDM_FILE_SCORE                 120
+#define IDM_FILE_MOVIE                 121
 #define IDM_FILE_EXIT                  130
 
 #define IDM_WINDOW_VIS_0               200
 #define IDM_WINDOW_D_HGT_6             276
 #define IDM_WINDOW_D_HGT_7             277
 
-#define IDM_OPTIONS_NO_GRAPHICS         400
-#define IDM_OPTIONS_OLD_GRAPHICS 401
-#define IDM_OPTIONS_NEW_GRAPHICS 402
-#define IDM_OPTIONS_BIGTILE            409
-#define IDM_OPTIONS_SOUND              410
-#define IDM_OPTIONS_SAVER              420
-#define IDM_OPTIONS_MAP                        430
-#define IDM_OPTIONS_BG                 440
-#define IDM_OPTIONS_OPEN_BG            441
+#define IDM_OPTIONS_NO_GRAPHICS          400
+#define IDM_OPTIONS_OLD_GRAPHICS  401
+#define IDM_OPTIONS_NEW_GRAPHICS  402
+#define IDM_OPTIONS_NEW2_GRAPHICS 403
+#define IDM_OPTIONS_BIGTILE              409
+#define IDM_OPTIONS_SOUND                410
+#define IDM_OPTIONS_MUSIC                411
+#define IDM_OPTIONS_SAVER                420
+#define IDM_OPTIONS_MAP                          430
+#define IDM_OPTIONS_BG                   440
+#define IDM_OPTIONS_OPEN_BG              441
 
 #define IDM_DUMP_SCREEN_HTML   450
 
 /*
  * This may need to be removed for some compilers XXX XXX XXX
  */
+#if 0
 #define STRICT
+#endif
 
 /*
  * Exclude parts of WINDOWS.H that are not needed
@@ -404,7 +410,7 @@ struct _term_data
        uint map_tile_hgt;
 
        bool map_active;
-#ifdef JP
+#if 1 /* #ifdef JP */
        LOGFONT lf;
 #endif
 
@@ -434,6 +440,16 @@ static term_data data[MAX_TERM_DATA];
 static term_data *my_td;
 
 /*
+ * Remember normal size of main window when maxmized
+ */
+POINT normsize;
+
+/*
+ * was main window maximized on previous playing
+ */
+bool win_maximized = FALSE;
+
+/*
  * game in progress
  */
 bool game_in_progress = FALSE;
@@ -500,15 +516,11 @@ static bool can_use_graphics = FALSE;
  */
 static DIBINIT infGraph;
 
-#ifdef USE_TRANSPARENCY
-
 /*
  * The global bitmap mask
  */
 static DIBINIT infMask;
 
-#endif /* USE_TRANSPARENCY */
-
 #endif /* USE_GRAPHICS */
 
 
@@ -520,7 +532,6 @@ static DIBINIT infMask;
 static bool can_use_sound = FALSE;
 
 #define SAMPLE_MAX 8
-
 /*
  * An array of sound file names
  */
@@ -529,6 +540,25 @@ static cptr sound_file[SOUND_MAX][SAMPLE_MAX];
 #endif /* USE_SOUND */
 
 
+
+#ifdef USE_MUSIC
+
+#define SAMPLE_MUSIC_MAX 16
+static cptr music_file[MUSIC_BASIC_MAX][SAMPLE_MUSIC_MAX];
+static cptr dungeon_music_file[1000][SAMPLE_MUSIC_MAX];
+static cptr town_music_file[1000][SAMPLE_MUSIC_MAX];
+static cptr quest_music_file[1000][SAMPLE_MUSIC_MAX];
+static bool can_use_music = FALSE;
+
+static MCI_OPEN_PARMS mop;
+static char mci_device_type[256];
+
+int current_music_type = 0;
+int current_music_id = 0;
+
+#endif /* USE_MUSIC */
+
+
 /*
  * Full path to ANGBAND.INI
  */
@@ -549,8 +579,9 @@ static cptr AngList = "AngList";
  */
 static cptr ANGBAND_DIR_XTRA_GRAF;
 static cptr ANGBAND_DIR_XTRA_SOUND;
+static cptr ANGBAND_DIR_XTRA_MUSIC;
 static cptr ANGBAND_DIR_XTRA_HELP;
-#ifndef JP
+#if 0 /* #ifndef JP */
 static cptr ANGBAND_DIR_XTRA_FONT;
 #endif
 #ifdef USE_MUSIC
@@ -569,6 +600,14 @@ static COLORREF win_clr[256];
  */
 static bool Term_no_press = FALSE;
 
+/*
+ * Copy and paste
+ */
+static bool mouse_down = FALSE;
+static bool paint_rect = FALSE;
+static int mousex = 0, mousey = 0;
+static int oldx, oldy;
+
 
 /*
  * The "simple" color values
@@ -738,7 +777,7 @@ static int init_bg(void)
 
        hBG = LoadImage(NULL, bmfile,  IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
        if (!hBG) {
-               plog_fmt("ÊÉ»æÍѥӥåȥޥåנ'%s' ¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£", bmfile);
+               plog_fmt(_("壁紙用ビットマップ '%s' を読み込めません。", "Can't load the bitmap file '%s'."), bmfile);
                use_bg = 0;
                return 0;
        }
@@ -754,7 +793,7 @@ static int init_bg(void)
        dcbg = CreateCompatibleDC(wnddc);
 
        bmimage = LoadImage(NULL, "bg.bmp", LR_LOADFROMFILE, 0, 0, 0);
-       if (!bmimage) quit("bg.bmp¤¬Æɤߤ³¤á¤Ê¤¤¡ª");
+       if (!bmimage) quit("bg.bmpが読みこめない!");
        bmimage_old = SelectObject(dcimage, bmimage);
 
        CreateCompatibleBitmap();
@@ -825,7 +864,7 @@ static cptr extract_file_name(cptr s)
  *
  * Return a pointer to a static buffer holding the capitalized base name.
  */
-#ifndef JP
+#if 0 /* #ifndef JP */
 static char *analyze_font(char *path, int *wp, int *hp)
 {
        int wid, hgt;
@@ -849,7 +888,7 @@ static char *analyze_font(char *path, int *wp, int *hp)
        }
 
        /* Find first 'X' */
-       s = strchr(p, 'X');
+       s = my_strchr(p, 'X');
 
        /* Extract font width */
        wid = atoi(p);
@@ -981,12 +1020,7 @@ static void validate_file(cptr s)
        /* Verify or fail */
        if (!check_file(s))
        {
-#ifdef JP
-               quit_fmt("ɬÍפʥե¡¥¤¥ë[%s]¤¬¸«¤¢¤¿¤ê¤Þ¤»¤ó¡£", s);
-#else
-               quit_fmt("Cannot find required file:\n%s", s);
-#endif
-
+               quit_fmt(_("必要なファイル[%s]が見あたりません。", "Cannot find required file:\n%s"), s);
        }
 }
 
@@ -1002,12 +1036,7 @@ static void validate_dir(cptr s, bool vital)
                /* This directory contains needed data */
                if (vital)
                {
-#ifdef JP
-               quit_fmt("ɬÍפʥǥ£¥ì¥¯¥È¥ê[%s]¤¬¸«¤¢¤¿¤ê¤Þ¤»¤ó¡£", s);
-#else
-                       quit_fmt("Cannot find required directory:\n%s", s);
-#endif
-
+                       quit_fmt(_("必要なディレクトリ[%s]が見あたりません。", "Cannot find required directory:\n%s"), s);
                }
                /* Attempt to create this directory */
                else if (mkdir(s))
@@ -1067,29 +1096,42 @@ static void term_getsize(term_data *td)
 /*
  * Write the "prefs" for a single term
  */
-static void save_prefs_aux(term_data *td, cptr sec_name)
+static void save_prefs_aux(int i)
 {
+       term_data *td = &data[i];
+       char sec_name[128];
        char buf[1024];
 
        RECT rc;
+       WINDOWPLACEMENT lpwndpl;
 
        /* Paranoia */
        if (!td->w) return;
 
+       /* Make section name */
+       sprintf(sec_name, "Term-%d", i);
+
        /* Visible */
-       strcpy(buf, td->visible ? "1" : "0");
-       WritePrivateProfileString(sec_name, "Visible", buf, ini_file);
+       if (i > 0)
+       {
+               strcpy(buf, td->visible ? "1" : "0");
+               WritePrivateProfileString(sec_name, "Visible", buf, ini_file);
+       }
 
        /* Font */
 #ifdef JP
-       strcpy(buf, td->lf.lfFaceName[0]!='\0' ? td->lf.lfFaceName : "£Í£Ó ¥´¥·¥Ã¥¯");
+       strcpy(buf, td->lf.lfFaceName[0]!='\0' ? td->lf.lfFaceName : "ï¼­ï¼³ ã\82´ã\82·ã\83\83ã\82¯");
 #else
+#if 0
        strcpy(buf, td->font_file ? td->font_file : "8X13.FON");
+#else
+       strcpy(buf, td->lf.lfFaceName[0]!='\0' ? td->lf.lfFaceName : "Courier");
+#endif
 #endif
 
        WritePrivateProfileString(sec_name, "Font", buf, ini_file);
 
-#ifdef JP
+#if 1 /* #ifdef JP */
        wsprintf(buf, "%d", td->lf.lfWidth);
        WritePrivateProfileString(sec_name, "FontWid", buf, ini_file);
        wsprintf(buf, "%d", td->lf.lfHeight);
@@ -1109,14 +1151,30 @@ static void save_prefs_aux(term_data *td, cptr sec_name)
        wsprintf(buf, "%d", td->tile_hgt);
        WritePrivateProfileString(sec_name, "TileHgt", buf, ini_file);
 
+       /* Get window placement and dimensions */
+       lpwndpl.length = sizeof(WINDOWPLACEMENT);
+       GetWindowPlacement(td->w, &lpwndpl);
+
+       /* Acquire position in *normal* mode (not minimized) */
+       rc = lpwndpl.rcNormalPosition;
+
        /* Window size (x) */
-       wsprintf(buf, "%d", td->cols);
+       if (i == 0) wsprintf(buf, "%d", normsize.x);
+       else wsprintf(buf, "%d", td->cols);
        WritePrivateProfileString(sec_name, "NumCols", buf, ini_file);
 
        /* Window size (y) */
-       wsprintf(buf, "%d", td->rows);
+       if (i == 0) wsprintf(buf, "%d", normsize.y);
+       else wsprintf(buf, "%d", td->rows);
        WritePrivateProfileString(sec_name, "NumRows", buf, ini_file);
 
+       /* Maxmized (only main window) */
+       if (i == 0)
+       {
+               strcpy(buf, IsZoomed(td->w) ? "1" : "0");
+               WritePrivateProfileString(sec_name, "Maximized", buf, ini_file);
+       }
+
        /* Acquire position */
        GetWindowRect(td->w, &rc);
 
@@ -1129,8 +1187,11 @@ static void save_prefs_aux(term_data *td, cptr sec_name)
        WritePrivateProfileString(sec_name, "PositionY", buf, ini_file);
 
        /* Window Z position */
-       strcpy(buf, td->posfix ? "1" : "0");
-       WritePrivateProfileString(sec_name, "PositionFix", buf, ini_file);
+       if (i > 0)
+       {
+               strcpy(buf, td->posfix ? "1" : "0");
+               WritePrivateProfileString(sec_name, "PositionFix", buf, ini_file);
+       }
 }
 
 
@@ -1157,6 +1218,10 @@ static void save_prefs(void)
        strcpy(buf, arg_sound ? "1" : "0");
        WritePrivateProfileString("Angband", "Sound", buf, ini_file);
 
+       /* Save the "arg_sound" flag */
+       strcpy(buf, arg_music ? "1" : "0");
+       WritePrivateProfileString("Angband", "Music", buf, ini_file);
+
        /* bg */
        strcpy(buf, use_bg ? "1" : "0");
        WritePrivateProfileString("Angband", "BackGround", buf, ini_file);
@@ -1166,11 +1231,7 @@ static void save_prefs(void)
        /* Save window prefs */
        for (i = 0; i < MAX_TERM_DATA; ++i)
        {
-               term_data *td = &data[i];
-
-               sprintf(buf, "Term-%d", i);
-
-               save_prefs_aux(td, buf);
+               save_prefs_aux(i);
        }
 }
 
@@ -1178,20 +1239,39 @@ static void save_prefs(void)
 /*
  * Load the "prefs" for a single term
  */
-static void load_prefs_aux(term_data *td, cptr sec_name)
+static void load_prefs_aux(int i)
 {
+       term_data *td = &data[i];
+       char sec_name[128];
        char tmp[1024];
 
-       int wid, hgt;
+       int wid, hgt, posx, posy;
+       int dispx = GetSystemMetrics( SM_CXVIRTUALSCREEN);
+       int dispy = GetSystemMetrics( SM_CYVIRTUALSCREEN);
+       posx=0;
+       posy=0;
+       
+       /* Make section name */
+       sprintf(sec_name, "Term-%d", i);
+
+       /* Make section name */
+       sprintf(sec_name, "Term-%d", i);
 
        /* Visible */
-       td->visible = (GetPrivateProfileInt(sec_name, "Visible", td->visible, ini_file) != 0);
+       if (i > 0)
+       {
+               td->visible = (GetPrivateProfileInt(sec_name, "Visible", td->visible, ini_file) != 0);
+       }
 
        /* Desired font, with default */
 #ifdef JP
-       GetPrivateProfileString(sec_name, "Font", "£Í£Ó ¥´¥·¥Ã¥¯", tmp, 127, ini_file);
+       GetPrivateProfileString(sec_name, "Font", "ï¼­ï¼³ ã\82´ã\82·ã\83\83ã\82¯", tmp, 127, ini_file);
 #else
+#if 0
        GetPrivateProfileString(sec_name, "Font", "8X13.FON", tmp, 127, ini_file);
+#else
+       GetPrivateProfileString(sec_name, "Font", "Courier", tmp, 127, ini_file);
+#endif
 #endif
 
 
@@ -1199,7 +1279,7 @@ static void load_prefs_aux(term_data *td, cptr sec_name)
        td->bizarre = (GetPrivateProfileInt(sec_name, "Bizarre", td->bizarre, ini_file) != 0);
 
        /* Analyze font, save desired font name */
-#ifdef JP
+#if 1 /* #ifdef JP */
        td->font_want = string_make(tmp);
        hgt = 15; wid = 0;
        td->lf.lfWidth  = GetPrivateProfileInt(sec_name, "FontWid", wid, ini_file);
@@ -1211,7 +1291,7 @@ static void load_prefs_aux(term_data *td, cptr sec_name)
 
 
        /* Tile size */
-#ifdef JP
+#if 1 /* #ifdef JP */
        td->tile_wid = GetPrivateProfileInt(sec_name, "TileWid", td->lf.lfWidth, ini_file);
        td->tile_hgt = GetPrivateProfileInt(sec_name, "TileHgt", td->lf.lfHeight, ini_file);
 #else
@@ -1223,13 +1303,25 @@ static void load_prefs_aux(term_data *td, cptr sec_name)
        /* Window size */
        td->cols = GetPrivateProfileInt(sec_name, "NumCols", td->cols, ini_file);
        td->rows = GetPrivateProfileInt(sec_name, "NumRows", td->rows, ini_file);
+       normsize.x = td->cols; normsize.y = td->rows;
+
+       /* Window size */
+       if (i == 0)
+       {
+               win_maximized = GetPrivateProfileInt(sec_name, "Maximized", win_maximized, ini_file);
+       }
 
        /* Window position */
-       td->pos_x = GetPrivateProfileInt(sec_name, "PositionX", td->pos_x, ini_file);
-       td->pos_y = GetPrivateProfileInt(sec_name, "PositionY", td->pos_y, ini_file);
+       posx = GetPrivateProfileInt(sec_name, "PositionX", posx, ini_file);
+       posy = GetPrivateProfileInt(sec_name, "PositionY", posy, ini_file);
+       td->pos_x = MIN(MAX(0, posx), dispx-128);
+       td->pos_y = MIN(MAX(0, posy), dispy-128);
 
        /* Window Z position */
-       td->posfix = GetPrivateProfileInt(sec_name, "PositionFix", td->posfix, ini_file);
+       if (i > 0)
+       {
+               td->posfix = GetPrivateProfileInt(sec_name, "PositionFix", td->posfix, ini_file);
+       }
 }
 
 
@@ -1240,8 +1332,6 @@ static void load_prefs(void)
 {
        int i;
 
-       char buf[1024];
-
        /* Extract the "arg_graphics" flag */
        arg_graphics = GetPrivateProfileInt("Angband", "Graphics", GRAPHICS_NONE, ini_file);
 
@@ -1252,6 +1342,9 @@ static void load_prefs(void)
        /* Extract the "arg_sound" flag */
        arg_sound = (GetPrivateProfileInt("Angband", "Sound", 0, ini_file) != 0);
 
+       /* Extract the "arg_sound" flag */
+       arg_music = (GetPrivateProfileInt("Angband", "Music", 0, ini_file) != 0);
+
        /* bg */
        use_bg = GetPrivateProfileInt("Angband", "BackGround", 0, ini_file);
        GetPrivateProfileString("Angband", "BackGroundBitmap", "bg.bmp", bg_bitmap_file, 1023, ini_file);
@@ -1259,15 +1352,11 @@ static void load_prefs(void)
        /* Load window prefs */
        for (i = 0; i < MAX_TERM_DATA; ++i)
        {
-               term_data *td = &data[i];
-
-               sprintf(buf, "Term-%d", i);
-
-               load_prefs_aux(td, buf);
+               load_prefs_aux(i);
        }
 }
 
-#ifdef USE_SOUND
+#if defined(USE_SOUND) || defined(USE_MUSIC)
 
 /*
  * XXX XXX XXX - Taken from files.c.
@@ -1297,13 +1386,13 @@ static s16b tokenize_whitespace(char *buf, s16b num, char **tokens)
                char *t;
 
                /* Skip leading whitespace */
-               for ( ; *s && isspace(*s); ++s) /* loop */;
+               for ( ; *s && iswspace(*s); ++s) /* loop */;
 
                /* All done */
                if (!*s) break;
 
                /* Find next whitespace, if any */
-               for (t = s; *t && !isspace(*t); ++t) /* loop */;
+               for (t = s; *t && !iswspace(*t); ++t) /* loop */;
 
                /* Nuke and advance (if necessary) */
                if (*t) *t++ = '\0';
@@ -1319,6 +1408,10 @@ static s16b tokenize_whitespace(char *buf, s16b num, char **tokens)
        return (k);
 }
 
+#endif /* USE_SOUND || USE_MUSIC */
+
+#ifdef USE_SOUND
+
 static void load_sound_prefs(void)
 {
        int i, j, num;
@@ -1328,6 +1421,7 @@ static void load_sound_prefs(void)
        char *zz[SAMPLE_MAX];
 
        /* Access the sound.cfg */
+
        path_build(ini_path, 1024, ANGBAND_DIR_XTRA_SOUND, "sound.cfg");
 
        for (i = 0; i < SOUND_MAX; i++)
@@ -1350,6 +1444,99 @@ static void load_sound_prefs(void)
 
 #endif /* USE_SOUND */
 
+#ifdef USE_MUSIC
+
+static void load_music_prefs(void)
+{
+       int i, j, num;
+       char tmp[1024];
+       char ini_path[1024];
+       char wav_path[1024];
+       char *zz[SAMPLE_MAX];
+       char key[80];
+
+       /* Access the music.cfg */
+
+       path_build(ini_path, 1024, ANGBAND_DIR_XTRA_MUSIC, "music.cfg");
+
+       GetPrivateProfileString("Device", "type", "", mci_device_type, 256, ini_path);
+
+       for (i = 0; i < MUSIC_BASIC_MAX; i++)
+       {
+               GetPrivateProfileString("Basic", angband_music_basic_name[i], "", tmp, 1024, ini_path);
+
+               num = tokenize_whitespace(tmp, SAMPLE_MUSIC_MAX, zz);
+
+               for (j = 0; j < num; j++)
+               {
+                       /* Access the sound */
+                       path_build(wav_path, 1024, ANGBAND_DIR_XTRA_MUSIC, zz[j]);
+
+                       /* Save the sound filename, if it exists */
+                       if (check_file(wav_path))
+                               music_file[i][j] = string_make(zz[j]);
+               }
+       }
+
+       for (i = 0; i < max_d_idx; i++)
+       {
+               sprintf(key, "dungeon%03d", i);
+               GetPrivateProfileString("Dungeon", key, "", tmp, 1024, ini_path);
+
+               num = tokenize_whitespace(tmp, SAMPLE_MUSIC_MAX, zz);
+
+               for (j = 0; j < num; j++)
+               {
+                       /* Access the sound */
+                       path_build(wav_path, 1024, ANGBAND_DIR_XTRA_MUSIC, zz[j]);
+
+                       /* Save the sound filename, if it exists */
+                       if (check_file(wav_path))
+                               dungeon_music_file[i][j] = string_make(zz[j]);
+               }
+       }
+
+       for (i = 0; i < 1000; i++) /*!< @todo クエスト最大数指定 */
+       {
+               sprintf(key, "quest%03d", i);
+               GetPrivateProfileString("Quest", key, "", tmp, 1024, ini_path);
+
+               num = tokenize_whitespace(tmp, SAMPLE_MUSIC_MAX, zz);
+
+               for (j = 0; j < num; j++)
+               {
+                       /* Access the sound */
+                       path_build(wav_path, 1024, ANGBAND_DIR_XTRA_MUSIC, zz[j]);
+
+                       /* Save the sound filename, if it exists */
+                       if (check_file(wav_path))
+                               quest_music_file[i][j] = string_make(zz[j]);
+               }
+       }
+
+       for (i = 0; i < 1000; i++) /*!< @todo 町最大数指定 */
+       {
+               sprintf(key, "town%03d", i);
+               GetPrivateProfileString("Town", key, "", tmp, 1024, ini_path);
+
+               num = tokenize_whitespace(tmp, SAMPLE_MUSIC_MAX, zz);
+
+               for (j = 0; j < num; j++)
+               {
+                       /* Access the sound */
+                       path_build(wav_path, 1024, ANGBAND_DIR_XTRA_MUSIC, zz[j]);
+
+                       /* Save the sound filename, if it exists */
+                       if (check_file(wav_path))
+                               town_music_file[i][j] = string_make(zz[j]);
+               }
+       }
+
+
+}
+
+#endif /* USE_MUSIC */
+
 /*
  * Create the new global palette based on the bitmap palette
  * (if any), and the standard 16 entry palette derived from
@@ -1399,12 +1586,7 @@ static int new_palette(void)
                if ((nEntries == 0) || (nEntries > 220))
                {
                        /* Warn the user */
-#ifdef JP
-                       plog("²èÌ̤ò16¥Ó¥Ã¥È¤«24¥Ó¥Ã¥È¥«¥é¡¼¥â¡¼¥É¤Ë¤·¤Æ²¼¤µ¤¤¡£");
-#else
-                       plog("Please switch to high- or true-color mode.");
-#endif
-
+                       plog(_("画面を16ビットか24ビットカラーモードにして下さい。", "Please switch to high- or true-color mode."));
 
                        /* Cleanup */
                        rnfree(lppe, lppeSize);
@@ -1456,12 +1638,7 @@ static int new_palette(void)
 
        /* Create a new palette, or fail */
        hNewPal = CreatePalette(pLogPal);
-#ifdef JP
-       if (!hNewPal) quit("¥Ñ¥ì¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-       if (!hNewPal) quit("Cannot create palette!");
-#endif
-
+       if (!hNewPal) quit(_("パレットを作成できません!", "Cannot create palette!"));
 
        /* Free the palette */
        rnfree(pLogPal, pLogPalSize);
@@ -1474,11 +1651,7 @@ static int new_palette(void)
        SelectPalette(hdc, hNewPal, 0);
        i = RealizePalette(hdc);
        ReleaseDC(td->w, hdc);
-#ifdef JP
-       if (i == 0) quit("¥Ñ¥ì¥Ã¥È¤ò¥·¥¹¥Æ¥à¥¨¥ó¥È¥ê¤Ë¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-       if (i == 0) quit("Cannot realize palette!");
-#endif
+       if (i == 0) quit(_("パレットをシステムエントリにマップできません!", "Cannot realize palette!"));
 
 
        /* Sub-windows */
@@ -1512,23 +1685,51 @@ static bool init_graphics(void)
        /* if (can_use_graphics != arg_graphics) */
        {
                char buf[1024];
-               int wid, hgt;
+               int wid, hgt, twid, thgt, ox, oy;
                cptr name;
 
                if (arg_graphics == GRAPHICS_ADAM_BOLT)
                {
                        wid = 16;
                        hgt = 16;
-
+                       twid = 16;
+                       thgt = 16;
+                       ox = 0;
+                       oy = 0;
                        name = "16X16.BMP";
 
                        ANGBAND_GRAF = "new";
                }
+               else if (arg_graphics == GRAPHICS_HENGBAND)
+               {
+                       /*! @todo redraw 
+                       wid = 64;
+                       hgt = 64;
+                       twid = 32;
+                       thgt = 32;
+                       ox = -16;
+                       oy = -24;
+                       name = "64X64.BMP";
+                       */
+
+                       wid = 32;
+                       hgt = 32;
+                       twid = 32;
+                       thgt = 32;
+                       ox = 0;
+                       oy = 0;
+                       name = "32X32.BMP";
+
+                       ANGBAND_GRAF = "ne2";
+               }
                else
                {
                        wid = 8;
                        hgt = 8;
-
+                       twid = 8;
+                       thgt = 8;
+                       ox = 0;
+                       oy = 0;
                        name = "8X8.BMP";
                        ANGBAND_GRAF = "old";
                }
@@ -1539,20 +1740,17 @@ static bool init_graphics(void)
                /* Load the bitmap or quit */
                if (!ReadDIB(data[0].w, buf, &infGraph))
                {
-#ifdef JP
-                       plog_fmt("¥Ó¥Ã¥È¥Þ¥Ã¥× '%s' ¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£", name);
-#else
-                       plog_fmt("Cannot read bitmap file '%s'", name);
-#endif
-
+                       plog_fmt(_("ビットマップ '%s' を読み込めません。", "Cannot read bitmap file '%s'"), name);
                        return (FALSE);
                }
 
                /* Save the new sizes */
                infGraph.CellWidth = wid;
                infGraph.CellHeight = hgt;
-
-#ifdef USE_TRANSPARENCY
+               infGraph.TileWidth = twid;
+               infGraph.TileHeight = thgt;
+               infGraph.OffsetX = ox;
+               infGraph.OffsetY = oy;
 
                if (arg_graphics == GRAPHICS_ADAM_BOLT)
                {
@@ -1566,8 +1764,18 @@ static bool init_graphics(void)
                                return (FALSE);
                        }
                }
+               if (arg_graphics == GRAPHICS_HENGBAND)
+               {
+                       /* Access the mask file */
+                       path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_GRAF, "mask32.bmp");
 
-#endif /* USE_TRANSPARENCY */
+                       /* Load the bitmap or quit */
+                       if (!ReadDIB(data[0].w, buf, &infMask))
+                       {
+                               plog_fmt("Cannot read bitmap file '%s'", buf);
+                               return (FALSE);
+                       }
+               }
 
                /* Activate a palette */
                if (!new_palette())
@@ -1575,12 +1783,7 @@ static bool init_graphics(void)
                        /* Free bitmap XXX XXX XXX */
 
                        /* Oops */
-#ifdef JP
-                       plog("¥Ñ¥ì¥Ã¥È¤ò¼Â¸½¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-                       plog("Cannot activate palette!");
-#endif
-
+                       plog(_("パレットを実現できません!", "Cannot activate palette!"));
                        return (FALSE);
                }
 
@@ -1594,6 +1797,37 @@ static bool init_graphics(void)
 #endif /* USE_GRAPHICS */
 
 
+#ifdef USE_MUSIC
+/*
+ * Initialize music
+ */
+static bool init_music(void)
+{
+       /* Initialize once */
+       if (!can_use_music)
+       {
+               /* Load the prefs */
+               load_music_prefs();
+
+               /* Sound available */
+               can_use_music = TRUE;
+       }
+
+       /* Result */
+       return (can_use_music);
+}
+
+/*
+ * Hack -- Stop a music
+ */
+static void stop_music(void)
+{
+       mciSendCommand(mop.wDeviceID, MCI_STOP, 0, 0);
+       mciSendCommand(mop.wDeviceID, MCI_CLOSE, 0, 0);
+}
+
+#endif /* USE_MUSIC */
+
 #ifdef USE_SOUND
 /*
  * Initialize sound
@@ -1647,7 +1881,7 @@ static errr term_force_font(term_data *td, cptr path)
 {
        int wid, hgt;
 
-#ifndef JP
+#if 0 /* #ifndef JP */
        int i;
        char *base;
        char buf[1024];
@@ -1656,7 +1890,7 @@ static errr term_force_font(term_data *td, cptr path)
        /* Forget the old font (if needed) */
        if (td->font_id) DeleteObject(td->font_id);
 
-#ifdef JP
+#if 1 /* #ifdef JP */
        /* Unused */
        (void)path;
 
@@ -1761,7 +1995,7 @@ static errr term_force_font(term_data *td, cptr path)
  */
 static void term_change_font(term_data *td)
 {
-#ifdef JP
+#if 1 /* #ifdef JP */
        CHOOSEFONT cf;
 
        memset(&cf, 0, sizeof(cf));
@@ -1873,6 +2107,28 @@ static void term_data_redraw(term_data *td)
 }
 
 
+void Term_inversed_area(HWND hWnd, int x, int y, int w, int h)
+{
+       HDC hdc;
+       HPEN oldPen;
+       HBRUSH myBrush, oldBrush;
+
+       term_data *td = (term_data *)GetWindowLong(hWnd, 0);
+       int tx = td->size_ow1 + x * td->tile_wid;
+       int ty = td->size_oh1 + y * td->tile_hgt;
+       int tw = w * td->tile_wid - 1;
+       int th = h * td->tile_hgt - 1;
+
+       hdc = GetDC(hWnd);
+       myBrush = CreateSolidBrush(RGB(255, 255, 255));
+       oldBrush = SelectObject(hdc, myBrush);
+       oldPen = SelectObject(hdc, GetStockObject(NULL_PEN) );
+
+       PatBlt(hdc, tx, ty, tw, th, PATINVERT);
+
+       SelectObject(hdc, oldBrush);
+       SelectObject(hdc, oldPen);
+}
 
 
 
@@ -1978,12 +2234,7 @@ static errr Term_xtra_win_react(void)
                if (arg_sound && !init_sound())
                {
                        /* Warning */
-#ifdef JP
-                       plog("¥µ¥¦¥ó¥É¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-                       plog("Cannot initialize sound!");
-#endif
-
+                       plog(_("サウンドを初期化できません!", "Cannot initialize sound!"));
 
                        /* Cannot enable */
                        arg_sound = FALSE;
@@ -1995,6 +2246,30 @@ static errr Term_xtra_win_react(void)
 
 #endif
 
+#ifdef USE_MUSIC
+
+       /* Handle "arg_sound" */
+       if (use_music != arg_music)
+       {
+               /* Initialize (if needed) */
+               if (arg_music && !init_music())
+               {
+                       /* Warning */
+                       plog(_("BGMを初期化できません!", "Cannot initialize BGM!"));
+                       /* Cannot enable */
+                       arg_music = FALSE;
+               }
+
+               /* Change setting */
+               use_music = arg_music;
+
+               if(!arg_music) stop_music();
+               else select_floor_music();
+
+       }
+
+#endif
+
 
 #ifdef USE_GRAPHICS
 
@@ -2005,12 +2280,7 @@ static errr Term_xtra_win_react(void)
                if (arg_graphics && !init_graphics())
                {
                        /* Warning */
-#ifdef JP
-                       plog("¥°¥é¥Õ¥£¥Ã¥¯¥¹¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó!");
-#else
-                       plog("Cannot initialize graphics!");
-#endif
-
+                       plog(_("グラフィックスを初期化できません!", "Cannot initialize graphics!"));
 
                        /* Cannot enable */
                        arg_graphics = GRAPHICS_NONE;
@@ -2189,7 +2459,7 @@ static errr Term_xtra_win_sound(int v)
        if (i == 0) return (1);
 
        /* Build the path */
-       path_build(buf, 1024, ANGBAND_DIR_XTRA_SOUND, sound_file[v][Rand_simple(i)]);
+       path_build(buf, 1024, ANGBAND_DIR_XTRA_SOUND, sound_file[v][Rand_external(i)]);
 
 #ifdef WIN32
 
@@ -2211,6 +2481,118 @@ static errr Term_xtra_win_sound(int v)
 #endif /* USE_SOUND */
 }
 
+/*
+ * Hack -- play a music
+ */
+static errr Term_xtra_win_music(int n, int v)
+{
+#ifdef USE_MUSIC
+       int i = 0;
+       char buf[1024];
+#endif /* USE_MUSIC */
+
+       /* Sound disabled */
+
+       if(!use_music) return (1);
+
+       /* Illegal sound */
+       if(n == TERM_XTRA_MUSIC_BASIC && ((v < 0) || (v >= MUSIC_BASIC_MAX))) return (1);
+       else if(v < 0 || v >= 1000) return(1); /*!< TODO */
+
+#ifdef USE_MUSIC
+
+       switch(n)
+       {
+       case TERM_XTRA_MUSIC_BASIC:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!music_file[v][i]) break;
+               break;
+       case TERM_XTRA_MUSIC_DUNGEON:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!dungeon_music_file[v][i]) break;
+               break;
+       case TERM_XTRA_MUSIC_QUEST:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!quest_music_file[v][i]) break;
+               break;
+       case TERM_XTRA_MUSIC_TOWN:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!town_music_file[v][i]) break;
+               break;
+       }
+
+       /* No sample */
+       if (i == 0)
+       {
+               //mciSendCommand(mop.wDeviceID, MCI_STOP, 0, 0);
+               //mciSendCommand(mop.wDeviceID, MCI_CLOSE, 0, 0);
+               return (1);
+       }
+
+       switch(n)
+       {
+       case TERM_XTRA_MUSIC_BASIC:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!music_file[v][i]) break;
+               break;
+       case TERM_XTRA_MUSIC_DUNGEON:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!dungeon_music_file[v][i]) break;
+               break;
+       case TERM_XTRA_MUSIC_QUEST:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!quest_music_file[v][i]) break;
+               break;
+       case TERM_XTRA_MUSIC_TOWN:
+               for (i = 0; i < SAMPLE_MAX; i++) if(!town_music_file[v][i]) break;
+               break;
+       }
+
+       /* No sample */
+       if (i == 0)
+       {
+               mciSendCommand(mop.wDeviceID, MCI_STOP, 0, 0);
+               mciSendCommand(mop.wDeviceID, MCI_CLOSE, 0, 0);
+               return (1);
+       }
+
+       switch(n)
+       {
+       case TERM_XTRA_MUSIC_BASIC:
+               path_build(buf, 1024, ANGBAND_DIR_XTRA_MUSIC, music_file[v][Rand_external(i)]);
+               break;
+       case TERM_XTRA_MUSIC_DUNGEON:
+               path_build(buf, 1024, ANGBAND_DIR_XTRA_MUSIC, dungeon_music_file[v][Rand_external(i)]);
+               break;
+       case TERM_XTRA_MUSIC_QUEST:
+               path_build(buf, 1024, ANGBAND_DIR_XTRA_MUSIC, quest_music_file[v][Rand_external(i)]);
+               break;
+       case TERM_XTRA_MUSIC_TOWN:
+               path_build(buf, 1024, ANGBAND_DIR_XTRA_MUSIC, town_music_file[v][Rand_external(i)]);
+               break;
+       }
+
+       if(current_music_type == n && current_music_id == v)
+       {
+               return (0);
+       }
+       current_music_type = n;
+       current_music_id = v;
+
+#ifdef WIN32
+
+       mop.lpstrDeviceType = mci_device_type;  
+       mop.lpstrElementName = buf;
+       mciSendCommand(mop.wDeviceID, MCI_STOP, 0, 0);
+       mciSendCommand(mop.wDeviceID, MCI_CLOSE, 0, 0);
+       mciSendCommand(mop.wDeviceID, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT, (DWORD)&mop);
+       mciSendCommand(mop.wDeviceID, MCI_SEEK, MCI_SEEK_TO_START, 0);
+       mciSendCommand(mop.wDeviceID, MCI_PLAY, MCI_NOTIFY, (DWORD)&mop);
+       return (0);
+
+#endif /* WIN32 */
+
+#else /* USE_MUSIC */
+
+       return (1);
+
+#endif /* USE_MUSIC */
+
+}
+
 
 /*
  * Delay for "x" milliseconds
@@ -2263,6 +2645,15 @@ static errr Term_xtra_win(int n, int v)
                        return (Term_xtra_win_noise());
                }
 
+               /* Play a music */
+               case TERM_XTRA_MUSIC_BASIC:
+               case TERM_XTRA_MUSIC_DUNGEON:
+               case TERM_XTRA_MUSIC_QUEST:
+               case TERM_XTRA_MUSIC_TOWN:
+               {
+                       return (Term_xtra_win_music(n, v));
+               }
+
                /* Make a special sound */
                case TERM_XTRA_SOUND:
                {
@@ -2445,8 +2836,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
        RECT rc;
        HDC hdc;
 
-
-#ifdef JP
+#if 1 /* #ifdef JP */
        static HBITMAP  WALL;
        static HBRUSH   myBrush, oldBrush;
        static HPEN     oldPen;
@@ -2514,7 +2904,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
                for (i = 0; i < n; i++)
                {
 #ifdef JP
-                       if (use_bigtile && *(s+i)=="¢£"[0] && *(s+i+1)=="¢£"[1])
+                       if (use_bigtile && *(s+i)=="■"[0] && *(s+i+1)=="■"[1])
                        {
                                rc.right += td->font_wid;
 
@@ -2533,7 +2923,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
                                rc.left += 2 * td->tile_wid;
                                rc.right += 2 * td->tile_wid;
                        }
-                       else if ( iskanji(*(s+i)) )  /*  £²¥Ð¥¤¥Èʸ»ú  */
+                       else if ( iskanji(*(s+i)) )  /*  2バイト文字  */
                        {
                                rc.right += td->font_wid;
                                /* Dump the text */
@@ -2560,6 +2950,29 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
                                rc.right += td->tile_wid;
                        } else {
                                /* Dump the text */
+                               ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc, s+i, 1, NULL);
+
+                               /* Advance */
+                               rc.left += td->tile_wid;
+                               rc.right += td->tile_wid;
+                       }
+#else
+#if 1
+                       if (*(s+i)==127){
+                               oldBrush = SelectObject(hdc, myBrush);
+                               oldPen = SelectObject(hdc, GetStockObject(NULL_PEN) );
+
+                               /* Dump the wall */
+                               Rectangle(hdc, rc.left, rc.top, rc.right+1, rc.bottom+1);
+
+                               SelectObject(hdc, oldBrush);
+                               SelectObject(hdc, oldPen);
+
+                               /* Advance */
+                               rc.left += td->tile_wid;
+                               rc.right += td->tile_wid;
+                       } else {
+                               /* Dump the text */
                                ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc,
                                       s+i, 1, NULL);
 
@@ -2576,6 +2989,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
                        rc.left += td->tile_wid;
                        rc.right += td->tile_wid;
 #endif
+#endif
 
                }
        }
@@ -2609,27 +3023,18 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s)
  *
  * If "graphics" is not available, we simply "wipe" the given grids.
  */
-# ifdef USE_TRANSPARENCY
 static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp)
-# else /* USE_TRANSPARENCY */
-static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
-# endif /* USE_TRANSPARENCY */
 {
        term_data *td = (term_data*)(Term->data);
 
 #ifdef USE_GRAPHICS
 
        int i;
-       int x1, y1, w1, h1;
-       int x2, y2, w2, h2, tw2;
-
-# ifdef USE_TRANSPARENCY
-
+       int x1, y1, w1, h1, tw1, th1;
+       int x2, y2, w2, h2, tw2 = 0;
        int x3, y3;
 
-       HDC hdcMask;
-
-# endif /* USE_TRANSPARENCY */
+       HDC hdcMask = NULL;
 
        HDC hdc;
        HDC hdcSrc;
@@ -2645,6 +3050,8 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        /* Size of bitmap cell */
        w1 = infGraph.CellWidth;
        h1 = infGraph.CellHeight;
+       tw1 = infGraph.TileWidth;
+       th1 = infGraph.TileHeight;
 
        /* Size of window cell */
        if (td->map_active)
@@ -2663,8 +3070,8 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        }
 
        /* Location of window cell */
-       x2 = x * w2 + td->size_ow1;
-       y2 = y * h2 + td->size_oh1;
+       x2 = x * w2 + td->size_ow1 + infGraph.OffsetX;
+       y2 = y * h2 + td->size_oh1 + infGraph.OffsetY;
 
        /* Info */
        hdc = GetDC(td->w);
@@ -2673,22 +3080,19 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        hdcSrc = CreateCompatibleDC(hdc);
        hbmSrcOld = SelectObject(hdcSrc, infGraph.hBitmap);
 
-# ifdef USE_TRANSPARENCY
-
-       if (arg_graphics == GRAPHICS_ADAM_BOLT)
+       if (arg_graphics == GRAPHICS_ADAM_BOLT || arg_graphics == GRAPHICS_HENGBAND)
        {
                hdcMask = CreateCompatibleDC(hdc);
                SelectObject(hdcMask, infMask.hBitmap);
        }
 
-# endif /* USE_TRANSPARENCY */
-
        /* Draw attr/char pairs */
        for (i = 0; i < n; i++, x2 += w2)
        {
                byte a = ap[i];
                char c = cp[i];
 
+
                /* Extract picture */
                int row = (a & 0x7F);
                int col = (c & 0x7F);
@@ -2697,15 +3101,15 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
                x1 = col * w1;
                y1 = row * h1;
 
-# ifdef USE_TRANSPARENCY
-
-               if (arg_graphics == GRAPHICS_ADAM_BOLT)
+               if (arg_graphics == GRAPHICS_ADAM_BOLT || arg_graphics == GRAPHICS_HENGBAND)
                {
                        x3 = (tcp[i] & 0x7F) * w1;
                        y3 = (tap[i] & 0x7F) * h1;
+                       tw2 = tw2 * w1 / tw1;
+                       h2 = h2 * h1 / th1;
 
                        /* Perfect size */
-                       if ((w1 == tw2) && (h1 == h2))
+                       if ((tw1 == tw2) && (th1 == h2))
                        {
                                /* Copy the terrain picture from the bitmap to the window */
                                BitBlt(hdc, x2, y2, tw2, h2, hdcSrc, x3, y3, SRCCOPY);
@@ -2724,7 +3128,9 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
                                SetStretchBltMode(hdc, COLORONCOLOR);
 
                                /* Copy the terrain picture from the bitmap to the window */
-                               StretchBlt(hdc, x2, y2, tw2, h2, hdcSrc, x3, y3, w1, h1, SRCCOPY);
+                               StretchBlt(hdc, x2, y2, tw2, h2, hdcMask, x3, y3, w1, h1, SRCAND);
+
+                               StretchBlt(hdc, x2, y2, tw2, h2, hdcSrc, x3, y3, w1, h1, SRCPAINT);
 
                                /* Only draw if terrain and overlay are different */
                                if ((x1 != x3) || (y1 != y3))
@@ -2738,9 +3144,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
                        }
                }
                else
-
-# endif /* USE_TRANSPARENCY */
-
                {
                        /* Perfect size */
                        if ((w1 == tw2) && (h1 == h2))
@@ -2765,17 +3168,13 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
        SelectObject(hdcSrc, hbmSrcOld);
        DeleteDC(hdcSrc);
 
-# ifdef USE_TRANSPARENCY
-
-       if (arg_graphics == GRAPHICS_ADAM_BOLT)
+       if (arg_graphics == GRAPHICS_ADAM_BOLT || arg_graphics == GRAPHICS_HENGBAND)
        {
                /* Release */
                SelectObject(hdcMask, hbmSrcOld);
                DeleteDC(hdcMask);
        }
 
-# endif /* USE_TRANSPARENCY */
-
        /* Release */
        ReleaseDC(td->w, hdc);
 
@@ -2798,9 +3197,7 @@ static void windows_map(void)
        int x, min_x, max_x;
        int y, min_y, max_y;
 
-#ifdef USE_TRANSPARENCY
        byte ta, tc;
-#endif
 
        /* Only in graphics mode */
        if (!use_graphics) return;
@@ -2824,26 +3221,18 @@ static void windows_map(void)
        {
                for (y = min_y; y < max_y; y++)
                {
-#ifdef USE_TRANSPARENCY
                        map_info(y, x, &a, (char*)&c, &ta, (char*)&tc);
-#else /* USE_TRANSPARENCY */
-                       map_info(y, x, &a, (char*)&c);
-#endif /* USE_TRANSPARENCY */
 
                        /* Ignore non-graphics */
                        if ((a & 0x80) && (c & 0x80))
                        {
-#ifdef USE_TRANSPARENCY
                                Term_pict_win(x - min_x, y - min_y, 1, &a, &c, &ta, &tc);
-#else /* USE_TRANSPARENCY */
-                               Term_pict_win(x - min_x, y - min_y, 1, &a, &c);
-#endif /* USE_TRANSPARENCY */
                        }
                }
        }
 
        /* Hilite the player */
-       Term_curs_win(px - min_x, py - min_y);
+       Term_curs_win(p_ptr->x - min_x, p_ptr->y - min_y);
 
        /* Wait for a keypress, flush key buffer */
        Term_inkey(&c, TRUE, TRUE);
@@ -2916,7 +3305,7 @@ static void init_windows(void)
 
        term_data *td;
 
-#ifndef JP
+#if 0 /* #ifndef JP */
        char buf[1024];
 #endif
 
@@ -2924,7 +3313,7 @@ static void init_windows(void)
        td = &data[0];
        WIPE(td, term_data);
 #ifdef JP
-       td->s = "ÊѶòÈÚÅÜ";
+       td->s = "変愚蛮怒";
 #else
        td->s = angband_term_name[0];
 #endif
@@ -2940,8 +3329,7 @@ static void init_windows(void)
        td->pos_x = 7 * 30;
        td->pos_y = 7 * 20;
        td->posfix = FALSE;
-
-#ifdef JP
+#if 1 /* #ifdef JP */
        td->bizarre = TRUE;
 #endif
        /* Sub windows */
@@ -2961,7 +3349,7 @@ static void init_windows(void)
                td->pos_x = (7 - i) * 30;
                td->pos_y = (7 - i) * 20;
                td->posfix = FALSE;
-#ifdef JP
+#if 1 /* #ifdef JP */
                        td->bizarre = TRUE;
 #endif
        }
@@ -2993,14 +3381,14 @@ static void init_windows(void)
        {
                td = &data[i];
 
-#ifdef JP
+#if 1 /* #ifdef JP */
                strncpy(td->lf.lfFaceName, td->font_want, LF_FACESIZE);
-               td->lf.lfCharSet = SHIFTJIS_CHARSET;
+               td->lf.lfCharSet = DEFAULT_CHARSET;
                td->lf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
                /* Activate the chosen font */
                term_force_font(td, NULL);
-               td->tile_wid = td->font_wid;
-               td->tile_hgt = td->font_hgt;
+               if(!td->tile_wid) td->tile_wid = td->font_wid;
+               if(!td->tile_hgt) td->tile_hgt = td->font_hgt;
 #else
                /* Access the standard font file */
                path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_FONT, td->font_want);
@@ -3044,12 +3432,7 @@ static void init_windows(void)
                                       td->size_wid, td->size_hgt,
                                       HWND_DESKTOP, NULL, hInstance, NULL);
                my_td = NULL;
-#ifdef JP
-               if (!td->w) quit("¥µ¥Ö¥¦¥£¥ó¥É¥¦¤ËºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿");
-#else
-               if (!td->w) quit("Failed to create sub-window");
-#endif
-
+               if (!td->w) quit(_("サブウィンドウに作成に失敗しました", "Failed to create sub-window"));
 
                if (td->visible)
                {
@@ -3089,18 +3472,16 @@ static void init_windows(void)
                               td->size_wid, td->size_hgt,
                               HWND_DESKTOP, NULL, hInstance, NULL);
        my_td = NULL;
-#ifdef JP
-       if (!td->w) quit("¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿");
-#else
-       if (!td->w) quit("Failed to create Angband window");
-#endif
-
+       if (!td->w) quit(_("メインウィンドウの作成に失敗しました", "Failed to create Angband window"));
 
        term_data_link(td);
        angband_term[0] = &td->t;
+       normsize.x = td->cols;
+       normsize.y = td->rows;
 
        /* Activate the main window */
-       SetActiveWindow(td->w);
+       if (win_maximized) ShowWindow(td->w, SW_SHOWMAXIMIZED);
+       else ShowWindow(td->w, SW_SHOW);
 
        /* Bring main window back to top */
        SetWindowPos(td->w, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
@@ -3314,8 +3695,12 @@ static void setup_menus(void)
                      (arg_graphics == GRAPHICS_ORIGINAL ? MF_CHECKED : MF_UNCHECKED));
        CheckMenuItem(hm, IDM_OPTIONS_NEW_GRAPHICS,
                      (arg_graphics == GRAPHICS_ADAM_BOLT ? MF_CHECKED : MF_UNCHECKED));
+       CheckMenuItem(hm, IDM_OPTIONS_NEW2_GRAPHICS,
+                     (arg_graphics == GRAPHICS_HENGBAND ? MF_CHECKED : MF_UNCHECKED));
        CheckMenuItem(hm, IDM_OPTIONS_BIGTILE,
                      (arg_bigtile ? MF_CHECKED : MF_UNCHECKED));
+       CheckMenuItem(hm, IDM_OPTIONS_MUSIC,
+                     (arg_music ? MF_CHECKED : MF_UNCHECKED));
        CheckMenuItem(hm, IDM_OPTIONS_SOUND,
                      (arg_sound ? MF_CHECKED : MF_UNCHECKED));
        CheckMenuItem(hm, IDM_OPTIONS_BG,
@@ -3399,21 +3784,11 @@ static void process_menus(WORD wCmd)
                {
                        if (!initialized)
                        {
-#ifdef JP
-                               plog("¤Þ¤À½é´ü²½Ãæ¤Ç¤¹...");
-#else
-                               plog("You cannot do that yet...");
-#endif
-
+                               plog(_("まだ初期化中です...", "You cannot do that yet..."));
                        }
                        else if (game_in_progress)
                        {
-#ifdef JP
-                               plog("¥×¥ì¥¤Ãæ¤Ï¿·¤·¤¤¥²¡¼¥à¤ò»Ï¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-                               plog("You can't start a new game while you're still playing!");
-#endif
-
+                               plog(_("プレイ中は新しいゲームを始めることができません!", "You can't start a new game while you're still playing!"));
                        }
                        else
                        {
@@ -3430,21 +3805,11 @@ static void process_menus(WORD wCmd)
                {
                        if (!initialized)
                        {
-#ifdef JP
-                               plog("¤Þ¤À½é´ü²½Ãæ¤Ç¤¹...");
-#else
-                               plog("You cannot do that yet...");
-#endif
-
+                               plog(_("まだ初期化中です...", "You cannot do that yet..."));
                        }
                        else if (game_in_progress)
                        {
-#ifdef JP
-                               plog("¥×¥ì¥¤Ãæ¤Ï¥²¡¼¥à¤ò¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-                               plog("You can't open a new game while you're still playing!");
-#endif
-
+                               plog(_("プレイ中はゲームをロードすることができません!", "You can't open a new game while you're still playing!"));
                        }
                        else
                        {
@@ -3479,12 +3844,7 @@ static void process_menus(WORD wCmd)
                                /* Paranoia */
                                if (!can_save)
                                {
-#ifdef JP
-                                       plog("º£¤Ï¥»¡¼¥Ö¤¹¤ë¤³¤È¤Ï½ÐÍè¤Þ¤»¤ó¡£");
-#else
-                                       plog("You may not do that right now.");
-#endif
-
+                                       plog(_("今はセーブすることは出来ません。", "You may not do that right now."));
                                        break;
                                }
 
@@ -3500,12 +3860,7 @@ static void process_menus(WORD wCmd)
                        }
                        else
                        {
-#ifdef JP
-                               plog("º£¡¢¥»¡¼¥Ö¤¹¤ë¤³¤È¤Ï½ÐÍè¤Þ¤»¤ó¡£");
-#else
-                               plog("You may not do that right now.");
-#endif
-
+                               plog(_("今、セーブすることは出来ません。", "You may not do that right now."));
                        }
                        break;
                }
@@ -3518,12 +3873,7 @@ static void process_menus(WORD wCmd)
                                /* Paranoia */
                                if (!can_save)
                                {
-#ifdef JP
-                                       plog("º£¤Ï½ªÎ»¤Ç¤­¤Þ¤»¤ó¡£");
-#else
-                                       plog("You may not do that right now.");
-#endif
-
+                                       plog(_("今は終了できません。", "You may not do that right now."));
                                        break;
                                }
 
@@ -3590,16 +3940,45 @@ static void process_menus(WORD wCmd)
                        break;
                }
 
-
-               case IDM_WINDOW_VIS_0:
+               /* Open game */
+               case IDM_FILE_MOVIE:
                {
-#ifdef JP
-                       plog("¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤ÏÈóɽ¼¨¤Ë¤Ç¤­¤Þ¤»¤ó¡ª");
-#else
-                       plog("You are not allowed to do that!");
-#endif
+                       if (!initialized)
+                       {
+                               plog(_("まだ初期化中です...", "You cannot do that yet..."));
+                       }
+                       else if (game_in_progress)
+                       {
+                               plog(_("プレイ中はムービーをロードすることができません!", "You can't open a movie while you're playing!"));
+                       }
+                       else
+                       {
+                               memset(&ofn, 0, sizeof(ofn));
+                               ofn.lStructSize = sizeof(ofn);
+                               ofn.hwndOwner = data[0].w;
+                               ofn.lpstrFilter = "Angband Movie Files (*.amv)\0*.amv\0";
+                               ofn.nFilterIndex = 1;
+                               ofn.lpstrFile = savefile;
+                               ofn.nMaxFile = 1024;
+                               ofn.lpstrInitialDir = ANGBAND_DIR_USER;
+                               ofn.Flags = OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
+
+                               if (GetOpenFileName(&ofn))
+                               {
+                                       /* Load 'savefile' */
+                                       prepare_browse_movie_aux(savefile);
+                                       play_game(FALSE);
+                                       quit(NULL);
+                                       return;
+                               }
+                       }
+                       break;
+               }
 
 
+               case IDM_WINDOW_VIS_0:
+               {
+                       plog(_("メインウィンドウは非表示にできません!", "You are not allowed to do that!"));
                        break;
                }
 
@@ -3881,6 +4260,30 @@ static void process_menus(WORD wCmd)
                        break;
                }
 
+               case IDM_OPTIONS_NEW2_GRAPHICS:
+               {
+                       /* Paranoia */
+                       if (!inkey_flag)
+                       {
+                               plog("You may not do that right now.");
+                               break;
+                       }
+
+                       /* Toggle "arg_graphics" */
+                       if (arg_graphics != GRAPHICS_HENGBAND)
+                       {
+                               arg_graphics = GRAPHICS_HENGBAND;
+
+                               /* React to changes */
+                               Term_xtra_win_react();
+
+                               /* Hack -- Force redraw */
+                               Term_key_push(KTRL('R'));
+                       }
+
+                       break;
+               }
+
                case IDM_OPTIONS_BIGTILE:
                {
                        term_data *td = &data[0];
@@ -3907,6 +4310,27 @@ static void process_menus(WORD wCmd)
                        break;
                }
 
+               case IDM_OPTIONS_MUSIC:
+               {
+                       /* Paranoia */
+                       if (!inkey_flag)
+                       {
+                               plog("You may not do that right now.");
+                               break;
+                       }
+
+                       /* Toggle "arg_sound" */
+                       arg_music = !arg_music;
+
+                       /* React to changes */
+                       Term_xtra_win_react();
+
+                       /* Hack -- Force redraw */
+                       Term_key_push(KTRL('R'));
+
+                       break;
+               }
+
                case IDM_OPTIONS_SOUND:
                {
                        /* Paranoia */
@@ -3971,11 +4395,7 @@ static void process_menus(WORD wCmd)
                                ofn.lpstrFile = bg_bitmap_file;
                                ofn.nMaxFile = 1023;
                                ofn.lpstrInitialDir = NULL;
-#ifdef JP
-                               ofn.lpstrTitle = "ÊÉ»æ¤òÁª¤ó¤Ç¤Í¡£";
-#else
-                               ofn.lpstrTitle = "Choose wall paper.";
-#endif
+                               ofn.lpstrTitle = _("壁紙を選んでね。", "Choose wall paper.");
                                ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
 
                                if (GetOpenFileName(&ofn))
@@ -4006,11 +4426,7 @@ static void process_menus(WORD wCmd)
                        ofn.nMaxFile = 1023;
                        ofn.lpstrDefExt = "html";
                        ofn.lpstrInitialDir = NULL;
-#ifdef JP
-                       ofn.lpstrTitle = "HTML¤Ç¥¹¥¯¥ê¡¼¥ó¥À¥ó¥×¤òÊݸ";
-#else
-                       ofn.lpstrTitle = "Save screen dump as HTML.";
-#endif
+                       ofn.lpstrTitle = _("HTMLでスクリーンダンプを保存", "Save screen dump as HTML.");
                        ofn.Flags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
 
                        if (GetSaveFileName(&ofn))
@@ -4046,12 +4462,7 @@ static void process_menus(WORD wCmd)
                                }
                                else
                                {
-#ifdef JP
-                                       plog("¥¦¥£¥ó¥É¥¦¤òºîÀ®½ÐÍè¤Þ¤»¤ó");
-#else
-                                       plog("Failed to create saver window");
-#endif
-
+                                       plog(_("ウィンドウを作成出来ません", "Failed to create saver window"));
                                }
                        }
                        break;
@@ -4077,8 +4488,8 @@ static void process_menus(WORD wCmd)
                        else
                        {
 #ifdef JP
-                               plog_fmt("¥Ø¥ë¥×¥Õ¥¡¥¤¥ë[%s]¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£", tmp);
-                               plog("Âå¤ï¤ê¤Ë¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£");
+                               plog_fmt("ヘルプファイル[%s]が見付かりません。", tmp);
+                               plog("代わりにオンラインヘルプを使用してください。");
 #else
                                plog_fmt("Cannot find help file: %s", tmp);
                                plog("Use the online help files instead.");
@@ -4098,8 +4509,8 @@ static void process_menus(WORD wCmd)
                        else
                        {
 #ifdef JP
-                               plog_fmt("¥Ø¥ë¥×¥Õ¥¡¥¤¥ë[%s]¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£", tmp);
-                               plog("Âå¤ï¤ê¤Ë¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£");
+                               plog_fmt("ヘルプファイル[%s]が見付かりません。", tmp);
+                               plog("代わりにオンラインヘルプを使用してください。");
 #else
                                plog_fmt("Cannot find help file: %s", tmp);
                                plog("Use the online help files instead.");
@@ -4240,6 +4651,9 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
                /* XXX XXX XXX */
                case WM_CREATE:
                {
+#ifdef USE_MUSIC
+                       mop.dwCallback=(DWORD)hWnd;
+#endif
                        return 0;
                }
 
@@ -4277,6 +4691,18 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
                        return 0;
                }
 
+#ifdef USE_MUSIC
+               case MM_MCINOTIFY:
+               {
+                       if(wParam == MCI_NOTIFY_SUCCESSFUL)
+                       {
+                               mciSendCommand(mop.wDeviceID, MCI_SEEK, MCI_SEEK_TO_START, 0);
+                               mciSendCommand(mop.wDeviceID, MCI_PLAY, MCI_NOTIFY, (DWORD)&mop);
+                       }
+                       return 0;
+               }
+#endif
+
                case WM_SYSKEYDOWN:
                case WM_KEYDOWN:
                {
@@ -4292,6 +4718,124 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
                        return 0;
                }
 
+               case WM_LBUTTONDOWN:
+               {
+                       mousex = MIN(LOWORD(lParam) / td->tile_wid, td->cols - 1);
+                       mousey = MIN(HIWORD(lParam) / td->tile_hgt, td->rows - 1);
+                       mouse_down = TRUE;
+                       oldx = mousex;
+                       oldy = mousey;
+                       return 0;
+               }
+
+               case WM_LBUTTONUP:
+               {
+                       HGLOBAL hGlobal;
+                       LPSTR lpStr;
+                       int i, j, sz;
+                       int dx = abs(oldx - mousex) + 1;
+                       int dy = abs(oldy - mousey) + 1;
+                       int ox = (oldx > mousex) ? mousex : oldx;
+                       int oy = (oldy > mousey) ? mousey : oldy;
+
+                       mouse_down = FALSE;
+                       paint_rect = FALSE;
+
+#ifdef JP
+                       sz = (dx + 3) * dy;
+#else
+                       sz = (dx + 2) * dy;
+#endif
+                       hGlobal = GlobalAlloc(GHND, sz + 1);
+                       if (hGlobal == NULL) return 0;
+                       lpStr = (LPSTR)GlobalLock(hGlobal);
+
+                       for (i = 0; i < dy; i++)
+                       {
+#ifdef JP
+                               char *s;
+                               char **scr = data[0].t.scr->c;
+
+                               C_MAKE(s, (dx + 1), char);
+                               strncpy(s, &scr[oy + i][ox], dx);
+
+                               if (ox > 0)
+                               {
+                                       if (iskanji(scr[oy + i][ox - 1])) s[0] = ' ';
+                               }
+
+                               if (ox + dx < data[0].cols)
+                               {
+                                       if (iskanji(scr[oy + i][ox + dx - 1])) s[dx - 1] = ' ';
+                               }
+
+                               for (j = 0; j < dx; j++)
+                               {
+                                       if (s[j] == 127) s[j] = '#';
+                                       *lpStr++ = s[j];
+                               }
+#else
+                               for (j = 0; j < dx; j++)
+                               {
+                                       *lpStr++ = data[0].t.scr->c[oy + i][ox + j];
+                               }
+#endif
+                               if (dy > 1)
+                               {
+                                       *lpStr++ = '\r';
+                                       *lpStr++ = '\n';
+                               }
+                       }
+
+                       GlobalUnlock(hGlobal);
+                       if (OpenClipboard(hWnd) == 0)
+                       {
+                               GlobalFree(hGlobal);
+                               return 0;
+                       }
+                       EmptyClipboard();
+                       SetClipboardData(CF_TEXT, hGlobal);
+                       CloseClipboard();
+
+                       Term_redraw();
+
+                       return 0;
+               }
+
+               case WM_MOUSEMOVE:
+               {
+                       if (mouse_down)
+                       {
+                               int dx, dy;
+                               int cx = MIN(LOWORD(lParam) / td->tile_wid, td->cols - 1);
+                               int cy = MIN(HIWORD(lParam) / td->tile_hgt, td->rows - 1);
+                               int ox, oy;
+
+                               if (paint_rect)
+                               {
+                                       dx = abs(oldx - mousex) + 1;
+                                       dy = abs(oldy - mousey) + 1;
+                                       ox = (oldx > mousex) ? mousex : oldx;
+                                       oy = (oldy > mousey) ? mousey : oldy;
+                                       Term_inversed_area(hWnd, ox, oy, dx, dy);
+                               }
+                               else
+                               {
+                                       paint_rect = TRUE;
+                               }
+
+                               dx = abs(cx - mousex) + 1;
+                               dy = abs(cy - mousey) + 1;
+                               ox = (cx > mousex) ? mousex : cx;
+                               oy = (cy > mousey) ? mousey : cy;
+                               Term_inversed_area(hWnd, ox, oy, dx, dy);
+
+                               oldx = cx;
+                               oldy = cy;
+                       }
+                       return 0;
+               }
+
                case WM_INITMENU:
                {
                        setup_menus();
@@ -4304,11 +4848,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
                        {
                                if (!can_save)
                                {
-#ifdef JP
-                                       plog("º£¤Ï½ªÎ»¤Ç¤­¤Þ¤»¤ó¡£");
-#else
-                                       plog("You may not do that right now.");
-#endif
+                                       plog(_("今は終了できません。", "You may not do that right now."));
                                        return 0;
                                }
 
@@ -4332,6 +4872,33 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
                        return 0;
                }
 
+               case WM_QUERYENDSESSION:
+               {
+                       if (game_in_progress && character_generated)
+                       {
+                               /* Hack -- Forget messages */
+                               msg_flag = FALSE;
+
+                               /* Mega-Hack -- Delay death */
+                               if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
+                               do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
+
+                               /* Hardcode panic save */
+                               p_ptr->panic_save = 1;
+
+                               /* Forbid suspend */
+                               signals_ignore_tstp();
+
+                               /* Indicate panic save */
+                               (void)strcpy(p_ptr->died_from, _("(緊急セーブ)", "(panic save)"));
+
+                               /* Panic save */
+                               (void)save_player();
+                       }
+                       quit(NULL);
+                       return 0;
+               }
+
                case WM_QUIT:
                {
                        quit(NULL);
@@ -4384,6 +4951,12 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
                                                td->cols = cols;
                                                td->rows = rows;
 
+                                               if (!IsZoomed(td->w) && !IsIconic(td->w))
+                                               {
+                                                       normsize.x = td->cols;
+                                                       normsize.y = td->rows;
+                                               }
+
                                                /* Activate */
                                                Term_activate(&td->t);
 
@@ -4457,6 +5030,8 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
 
                case WM_ACTIVATEAPP:
                {
+                       if (IsIconic(td->w)) break;
+
                        for (i = 1; i < MAX_TERM_DATA; i++)
                        {
                                if(data[i].visible)
@@ -4769,7 +5344,7 @@ static void hack_plog(cptr str)
        if (str)
        {
 #ifdef JP
-               MessageBox(NULL, str, "·Ù¹ð¡ª",
+               MessageBox(NULL, str, "警告!",
                           MB_ICONEXCLAMATION | MB_OK);
 #else
                MessageBox(NULL, str, "Warning",
@@ -4789,7 +5364,7 @@ static void hack_quit(cptr str)
        if (str)
        {
 #ifdef JP
-               MessageBox(NULL, str, "¥¨¥é¡¼¡ª",
+               MessageBox(NULL, str, "エラー!",
                           MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
 #else
                MessageBox(NULL, str, "Error",
@@ -4822,7 +5397,7 @@ static void hook_plog(cptr str)
        if (str)
        {
 #ifdef JP
-               MessageBox(data[0].w, str, "·Ù¹ð¡ª",
+               MessageBox(data[0].w, str, "警告!",
                           MB_ICONEXCLAMATION | MB_OK);
 #else
                MessageBox(data[0].w, str, "Warning",
@@ -4845,7 +5420,7 @@ static void hook_quit(cptr str)
        if (str)
        {
 #ifdef JP
-               MessageBox(data[0].w, str, "¥¨¥é¡¼¡ª",
+               MessageBox(data[0].w, str, "エラー!",
                           MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
 #else
                MessageBox(data[0].w, str, "Error",
@@ -4875,10 +5450,8 @@ static void hook_quit(cptr str)
        if (infGraph.hPalette) DeleteObject(infGraph.hPalette);
        if (infGraph.hBitmap) DeleteObject(infGraph.hBitmap);
 
-#ifdef USE_TRANSPARENCY
        if (infMask.hPalette) DeleteObject(infMask.hPalette);
        if (infMask.hBitmap) DeleteObject(infMask.hBitmap);
-#endif /* USE_TRANSPARENCY */
 
 #endif /* USE_GRAPHICS */
 
@@ -4972,18 +5545,13 @@ static void init_stuff(void)
        validate_dir(ANGBAND_DIR_XTRA, TRUE);
 
        /* Build the filename */
-#ifdef JP
-       path_build(path, sizeof(path), ANGBAND_DIR_FILE, "news_j.txt");
-#else
-       path_build(path, sizeof(path), ANGBAND_DIR_FILE, "news.txt");
-#endif
-
+       path_build(path, sizeof(path), ANGBAND_DIR_FILE, _("news_j.txt", "news.txt"));
 
        /* Hack -- Validate the "news.txt" file */
        validate_file(path);
 
 
-#ifndef JP
+#if 0 /* #ifndef JP */
        /* Build the "font" path */
        path_build(path, sizeof(path), ANGBAND_DIR_XTRA, "font");
 
@@ -5051,6 +5619,19 @@ static void init_stuff(void)
        /* validate_dir(ANGBAND_DIR_XTRA_HELP); */
 }
 
+bool is_already_running()
+{
+       bool result = FALSE;
+       HANDLE hMutex;
+
+       hMutex = CreateMutex(NULL, TRUE, VERSION_NAME);
+       if (GetLastError() == ERROR_ALREADY_EXISTS)
+       {
+               result = TRUE;
+       }
+       return result;
+}
+
 
 int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
                       LPSTR lpCmdLine, int nCmdShow)
@@ -5061,11 +5642,24 @@ int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
        HDC hdc;
        MSG msg;
 
+       setlocale( LC_ALL, "ja_JP" );
+
        /* Unused */
        (void)nCmdShow;
 
        /* Save globally */
        hInstance = hInst;
+       
+       
+       /* Prevent multiple run */
+       if (is_already_running())
+       {
+               MessageBox(NULL,
+                               _("変愚蛮怒はすでに起動しています。", "Hengband is already running."), 
+                               _("エラー!", "Error") ,
+                               MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
+               return FALSE;
+       }
 
        /* Initialize */
        if (hPrevInst == NULL)
@@ -5179,13 +5773,15 @@ int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
                }
        }
 
+       /* Catch nasty signals */
+       signals_init();
 
        /* Initialize */
+       Term_activate(term_screen);\r
        init_angband();
 
        /* We are now initialized */
        initialized = TRUE;
-
 #ifdef CHUUKEI
        if(lpCmdLine[0] == '-'){
          switch(lpCmdLine[1])
@@ -5214,6 +5810,15 @@ int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
              quit(NULL);
              return 0;
            }
+         case 'X':
+         case 'x':
+           {
+             if (!lpCmdLine[2]) break;
+             prepare_browse_movie(&lpCmdLine[2]);
+             play_game(FALSE);
+             quit(NULL);
+             return 0;
+           }
          }
        }
 #endif
@@ -5227,11 +5832,7 @@ int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
 #endif
 
        /* Prompt the user */
-#ifdef JP
-       prt("[¥Õ¥¡¥¤¥ë] ¥á¥Ë¥å¡¼¤Î [¿·µ¬] ¤Þ¤¿¤Ï [³«¤¯] ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£", 23, 8);
-#else
-       prt("[Choose 'New' or 'Open' from the 'File' menu]", 23, 17);
-#endif
+       prt(_("[ファイル] メニューの [新規] または [開く] を選択してください。", "[Choose 'New' or 'Open' from the 'File' menu]"), 23, _(8, 17));
 
        Term_fresh();