OSDN Git Service

無駄なobject_is_weapon_armour_ammo()呼び出しの削除.
[hengband/hengband.git] / src / report.c
index 476688c..055ef50 100644 (file)
 #include <signal.h>
 #endif
 
+/*
+ * internet resource value
+ */
+#define HTTP_PROXY ""                   /* Default proxy url */
+#define HTTP_PROXY_PORT 0               /* Default proxy port */
+#define HTTP_TIMEOUT    20              /* Timeout length (second) */
+#define SCORE_SERVER "www.kmc.gr.jp"    /* Default score server url */
+#define SCORE_PORT 80                   /* Default score server port */
+
 #ifdef JP
 #define SCORE_PATH "http://www.kmc.gr.jp/~habu/local/hengscore/score.cgi"
 #else
@@ -33,7 +42,9 @@
 #endif
 
 /* for debug */
-/*#define SCORE_PATH "http://www.kmc.gr.jp/~habu/local/scoretest/score.cgi" */
+#if 0
+#define SCORE_PATH "http://www.kmc.gr.jp/~habu/local/scoretest/score.cgi"
+#endif
 
 /*
  * simple buffer library
@@ -50,28 +61,19 @@ typedef struct {
 #ifndef HAVE_VASPRINTF
 #define vasprintf      Vasprintf
 
-#if defined(HAVE_VSNPRINTF)
 static int Vasprintf(char **buf, const char *fmt, va_list ap)
 {
        int ret;
 
-       *buf = malloc(BUFSIZE);
-
-       ret = vsnprintf(*buf, BUFSIZE, fmt, ap);
+       *buf = malloc(1024);
 
-       return ret;
-}
+#if defined(HAVE_VSNPRINTF)
+       ret = vsnprintf(*buf, 1024, fmt, ap);
 #else
-static int Vasprintf(char **buf, const char *fmt, va_list ap)
-{
-       int ret;
-       *buf = malloc(BUFSIZE * 4);
-
        ret = vsprintf(*buf, fmt, ap);
-
+#endif
        return ret;
 }
-#endif
 
 #endif /* ifndef HAVE_VASPRINTF */ 
 
@@ -92,13 +94,11 @@ static BUF* buf_new(void)
        return p;
 }
 
-#if 0
 static void buf_delete(BUF *b)
 {
        free(b->data);
        free(b);
 }
-#endif
 
 static int buf_append(BUF *buf, const char *data, size_t size)
 {
@@ -132,6 +132,26 @@ static int buf_sprintf(BUF *buf, const char *fmt, ...)
 
        if(!tmpbuf) return -1;
 
+#if ('\r' == 0x0a && '\n' == 0x0d)
+       {
+               /*
+                * Originally '\r'= CR (= 0x0d) and '\n'= LF (= 0x0a)
+                * But for MPW (Macintosh Programers Workbench), these
+                * are reversed so that '\r'=LF and '\n'=CR unless the
+                * -noMapCR option is not defined.
+                *
+                * We need to swap back these here since the score
+                * dump text should be written using LF as the end of
+                * line.
+                */
+               char *ptr;
+               for (ptr = tmpbuf; *ptr; ptr++)
+               {
+                       if (0x0d == *ptr) *ptr = 0x0a;
+               }
+       }
+#endif
+
        ret = buf_append(buf, tmpbuf, strlen(tmpbuf));
 
        free(tmpbuf);
@@ -170,7 +190,7 @@ static int buf_search(BUF *buf, const char *str)
 {
        char *ret;
 
-       ret = strstr(buf->data, str);
+       ret = my_strstr(buf->data, str);
 
        if (!ret) return -1;
 
@@ -193,19 +213,19 @@ static BUF * buf_subbuf(BUF *buf, int pos1, size_t sz)
 }
 #endif
 
-static void http_post(int sd, char *url, BUF *buf)
+static void http_post(int sd, cptr url, BUF *buf)
 {
        BUF *output;
 
        output = buf_new();
-       buf_sprintf(output, "POST %s HTTP/1.0\r\n", url);
-       buf_sprintf(output, "User-Agent: Hengband %d.%d.%d\r\n",
+       buf_sprintf(output, "POST %s HTTP/1.0\n", url);
+       buf_sprintf(output, "User-Agent: Hengband %d.%d.%d\n",
                    FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
 
-       buf_sprintf(output, "Content-Length: %d\r\n", buf->size);
-       buf_sprintf(output, "Content-Encoding: binary\r\n");
-       buf_sprintf(output, "Content-Type: application/octet-stream\r\n");
-       buf_sprintf(output, "\r\n");
+       buf_sprintf(output, "Content-Length: %d\n", buf->size);
+       buf_sprintf(output, "Content-Encoding: binary\n");
+       buf_sprintf(output, "Content-Type: application/octet-stream\n");
+       buf_sprintf(output, "\n");
        buf_append(output, buf->data, buf->size);
 
        soc_write(sd, output->data, output->size);
@@ -215,8 +235,6 @@ static void http_post(int sd, char *url, BUF *buf)
 /* ¥­¥ã¥é¥¯¥¿¥À¥ó¥×¤òºî¤Ã¤Æ BUF¤ËÊݸ */
 static errr make_dump(BUF* dumpbuf)
 {
-       errr make_character_dump(FILE *fff);
-
        char            buf[1024];
        FILE *fff;
        char file_name[1024];
@@ -245,9 +263,12 @@ static errr make_dump(BUF* dumpbuf)
 
        while (fgets(buf, 1024, fff))
        {
-               (void)buf_append(dumpbuf, buf, strlen(buf));
+               (void)buf_sprintf(dumpbuf, "%s", buf);
        }
 
+       /* Close the file */
+       my_fclose(fff);
+
        /* Remove the file */
        fd_kill(file_name);
 
@@ -255,6 +276,135 @@ static errr make_dump(BUF* dumpbuf)
        return (0);
 }
 
+/*
+ * Make screen dump to buffer
+ */
+cptr make_screen_dump(void)
+{
+       BUF *screen_buf;
+       int y, x, i;
+       cptr ret;
+
+       byte a = 0, old_a = 0;
+       char c = ' ';
+
+       static cptr html_head[] = {
+               "<html>\n<body text=\"#ffffff\" bgcolor=\"#000000\">\n",
+               "<pre>",
+               0,
+       };
+       static cptr html_foot[] = {
+               "</pre>\n",
+               "</body>\n</html>\n",
+               0,
+       };
+
+       bool old_use_graphics = use_graphics;
+
+       int wid, hgt;
+
+       Term_get_size(&wid, &hgt);
+
+       /* Alloc buffer */
+       screen_buf = buf_new();
+       if (screen_buf == NULL) return (NULL);
+
+       if (old_use_graphics)
+       {
+               /* Clear -more- prompt first */
+               msg_print(NULL);
+
+               use_graphics = FALSE;
+               reset_visuals();
+
+               /* Redraw everything */
+               p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
+
+               /* Hack -- update */
+               handle_stuff();
+       }
+
+       for (i = 0; html_head[i]; i++)
+               buf_sprintf(screen_buf, html_head[i]);
+
+       /* Dump the screen */
+       for (y = 0; y < hgt; y++)
+       {
+               /* Start the row */
+               if (y != 0)
+                       buf_sprintf(screen_buf, "\n");
+
+               /* Dump each row */
+               for (x = 0; x < wid - 1; x++)
+               {
+                       int rv, gv, bv;
+                       cptr cc = NULL;
+                       /* Get the attr/char */
+                       (void)(Term_what(x, y, &a, &c));
+
+                       switch (c)
+                       {
+                       case '&': cc = "&amp;"; break;
+                       case '<': cc = "&lt;"; break;
+                       case '>': cc = "&gt;"; break;
+#ifdef WINDOWS
+                       case 0x1f: c = '.'; break;
+                       case 0x7f: c = (a == 0x09) ? '%' : '#'; break;
+#endif
+                       }
+
+                       a = a & 0x0F;
+                       if ((y == 0 && x == 0) || a != old_a) {
+                               rv = angband_color_table[a][1];
+                               gv = angband_color_table[a][2];
+                               bv = angband_color_table[a][3];
+                               buf_sprintf(screen_buf, "%s<font color=\"#%02x%02x%02x\">", 
+                                           ((y == 0 && x == 0) ? "" : "</font>"), rv, gv, bv);
+                               old_a = a;
+                       }
+                       if (cc)
+                               buf_sprintf(screen_buf, "%s", cc);
+                       else
+                               buf_sprintf(screen_buf, "%c", c);
+               }
+       }
+       buf_sprintf(screen_buf, "</font>");
+
+       for (i = 0; html_foot[i]; i++)
+               buf_sprintf(screen_buf, html_foot[i]);
+
+       /* Screen dump size is too big ? */
+       if (screen_buf->size + 1> SCREEN_BUF_SIZE)
+       {
+               ret = NULL;
+       }
+       else
+       {
+               /* Terminate string */
+               buf_append(screen_buf, "", 1);
+
+               ret = string_make(screen_buf->data);
+       }
+
+       /* Free buffer */
+       buf_delete(screen_buf);
+
+       if (old_use_graphics)
+       {
+               use_graphics = TRUE;
+               reset_visuals();
+
+               /* Redraw everything */
+               p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
+
+               /* Hack -- update */
+               handle_stuff();
+       }
+
+       return ret;
+}
+
+
 errr report_score(void)
 {
 #ifdef MACINTOSH
@@ -301,11 +451,17 @@ errr report_score(void)
        buf_sprintf(score, "seikaku: %s\n", seikakutmp);
        buf_sprintf(score, "realm1: %s\n", realm_names[p_ptr->realm1]);
        buf_sprintf(score, "realm2: %s\n", realm_names[p_ptr->realm2]);
-       buf_sprintf(score, "killer: %s\n", died_from);
+       buf_sprintf(score, "killer: %s\n", p_ptr->died_from);
        buf_sprintf(score, "-----charcter dump-----\n");
 
        make_dump(score);
 
+       if (screen_dump)
+       {
+               buf_sprintf(score, "-----screen shot-----\n");
+               buf_append(score, screen_dump, strlen(screen_dump));
+       }
+       
 #ifdef WINDOWS
        if (WSAStartup(wVersionRequested, &wsaData))
        {
@@ -339,7 +495,13 @@ errr report_score(void)
 #endif
                Term_fresh();
                
-               sd = connect_scoreserver();
+               /* ¥×¥í¥­¥·¤òÀßÄꤹ¤ë */
+               set_proxy(HTTP_PROXY, HTTP_PROXY_PORT);
+
+               /* Connect to the score server */
+               sd = connect_server(HTTP_TIMEOUT, SCORE_SERVER, SCORE_PORT);
+
+
                if (!(sd < 0)) break;
 #ifdef JP
                sprintf(buff, "¥¹¥³¥¢¡¦¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£(%s)", soc_err());
@@ -350,9 +512,9 @@ errr report_score(void)
                (void)inkey();
                
 #ifdef JP
-               if (!get_check("¤â¤¦°ìÅÙÀܳ¤ò»î¤ß¤Þ¤¹¤«? "))
+               if (!get_check_strict("¤â¤¦°ìÅÙÀܳ¤ò»î¤ß¤Þ¤¹¤«? ", CHECK_NO_HISTORY))
 #else
-               if (!get_check("Try again? "))
+               if (!get_check_strict("Try again? ", CHECK_NO_HISTORY))
 #endif
                {
                        err = 1;