#include "z-virt.h"
/* Special flags in the attr data */
-#define AF_BIGTILE 0xf0
+#define AF_BIGTILE2 0xf0
+#define AF_TILE1 0x80
#ifdef JP
#define AF_KANJI1 0x10
/* Verify the hook */
if (!Term->xtra_hook) return (-1);
-#ifdef CHUUKEI
- if( n == TERM_XTRA_CLEAR || n == TERM_XTRA_FRESH || n == TERM_XTRA_SHAPE )
- send_xtra_to_chuukei_server(n);
-#endif
/* Call the hook */
return ((*Term->xtra_hook)(n, v));
}
*/
static errr Term_curs_hack(int x, int y)
{
- /* Compiler silliness */
- if (x || y) return (-2);
+ /* Unused */
+ (void)x;
+ (void)y;
/* Oops */
return (-1);
}
/*
+ * Hack -- fake hook for "Term_bigcurs()" (see above)
+ */
+static errr Term_bigcurs_hack(int x, int y)
+{
+ return (*Term->curs_hook)(x, y);
+}
+
+/*
* Hack -- fake hook for "Term_wipe()" (see above)
*/
static errr Term_wipe_hack(int x, int y, int n)
{
- /* Compiler silliness */
- if (x || y || n) return (-2);
+ /* Unused */
+ (void)x;
+ (void)y;
+ (void)n;
/* Oops */
return (-1);
/*
* Hack -- fake hook for "Term_text()" (see above)
*/
-#ifdef JP
static errr Term_text_hack(int x, int y, int n, byte a, cptr cp)
-#else
-static errr Term_text_hack(int x, int y, int n, byte a, const char *cp)
-#endif
-
{
- /* Compiler silliness */
- if (x || y || n || a || cp) return (-2);
+ /* Unused */
+ (void)x;
+ (void)y;
+ (void)n;
+ (void)a;
+ (void)cp;
/* Oops */
return (-1);
/*
* Hack -- fake hook for "Term_pict()" (see above)
*/
-static errr Term_pict_hack(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp)
+static errr Term_pict_hack(int x, int y, int n, const byte *ap, cptr cp, const byte *tap, cptr tcp)
{
- /* Compiler silliness */
- if (x || y || n || ap || cp || tap || tcp) return (-2);
+ /* Unused */
+ (void)x;
+ (void)y;
+ (void)n;
+ (void)ap;
+ (void)cp;
+ (void)tap;
+ (void)tcp;
/* Oops */
return (-1);
if (x < Term->x1[y]) Term->x1[y] = x;
if (x > Term->x2[y]) Term->x2[y] = x;
- if ((scrn->a[y][x] & AF_BIGTILE) == AF_BIGTILE)
+#ifdef JP
+ if (((scrn->a[y][x] & AF_BIGTILE2) == AF_BIGTILE2) ||
+ (scrn->a[y][x] & AF_KANJI2))
+#else
+ if ((scrn->a[y][x] & AF_BIGTILE2) == AF_BIGTILE2)
+#endif
if ((x - 1) < Term->x1[y]) Term->x1[y]--;
}
return;
}
- /* A tile become a Bigtile */
- if ((a & 0x80) && (c & 0x80))
+ /* A tile becomes a Bigtile */
+ if ((a & AF_TILE1) && (c & 0x80))
{
/* Mark it as a Bigtile */
- a2 = AF_BIGTILE;
+ a2 = AF_BIGTILE2;
c2 = -1;
/* Ignore non-tile background */
- if (!((ta & 0x80) && (tc & 0x80)))
+ if (!((ta & AF_TILE1) && (tc & 0x80)))
{
ta = 0;
tc = 0;
* ½Å¤Ê¤Ã¤¿Ê¸»ú¤Îº¸Éôʬ¤ò¾Ãµî¡£
* ɽ¼¨³«»Ï°ÌÃÖ¤¬º¸Ã¼¤Ç¤Ê¤¤¤È²¾Äê¡£
*/
- if ((scr_aa[x] & AF_KANJI2) && (scr_aa[x] & AF_BIGTILE) != AF_BIGTILE)
+ if ((scr_aa[x] & AF_KANJI2) && (scr_aa[x] & AF_BIGTILE2) != AF_BIGTILE2)
{
scr_cc[x - 1] = ' ';
scr_aa[x - 1] &= AF_KANJIC;
/* Æüìʸ»ú¤È¤·¤ÆMSB¤¬Î©¤Ã¤Æ¤¤¤ë²ÄǽÀ¤¬¤¢¤ë */
/* ¤½¤Î¾ì¹çattr¤ÎMSB¤âΩ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤³¤ì¤Ç¼±Ê̤¹¤ë */
/* check */
- if (!(a & 0x80) && iskanji(*s))
+ if (!(a & AF_TILE1) && iskanji(*s))
{
char nc1 = *s++;
char nc2 = *s;
int w, h;
Term_get_size(&w, &h);
- if (x != w && (scr_aa[x] & AF_BIGTILE) != AF_BIGTILE && (scr_aa[x] & AF_KANJI2))
+ if (x != w && !(scr_aa[x] & AF_TILE1) && (scr_aa[x] & AF_KANJI2))
{
scr_cc[x] = ' ';
scr_aa[x] &= AF_KANJIC;
/* Æüìʸ»ú¤È¤·¤ÆMSB¤¬Î©¤Ã¤Æ¤¤¤ë²ÄǽÀ¤¬¤¢¤ë */
/* ¤½¤Î¾ì¹çattr¤ÎMSB¤âΩ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤³¤ì¤Ç¼±Ê̤¹¤ë */
/* check */
- kanji = (iskanji(nc) && !(na & 0x80));
+ kanji = (iskanji(nc) && !(na & AF_TILE1));
#endif
ota = old_taa[x];
/* ¤½¤Î¾ì¹çattr¤ÎMSB¤âΩ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤³¤ì¤Ç¼±Ê̤¹¤ë */
/* check */
/* kanji = (iskanji(nc)); */
- kanji = (iskanji(nc) && !(na & 0x80));
+ kanji = (iskanji(nc) && !(na & AF_TILE1));
#endif
ota = old_taa[x];
/* Draw pending chars (normal) */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Draw pending chars (black) */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
old_tcc[x] = ntc;
/* 2nd byte of bigtile */
- if ((na & AF_BIGTILE) == AF_BIGTILE) continue;
+ if ((na & AF_BIGTILE2) == AF_BIGTILE2) continue;
/* Handle high-bit attr/chars */
- if ((na & 0x80) && (nc & 0x80))
+ if ((na & AF_TILE1) && (nc & 0x80))
{
/* Flush */
if (fn)
/* Draw pending chars (normal) */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Draw pending chars (black) */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
/* Draw the pending chars */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Hack -- Erase "leading" spaces */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
/* Draw pending chars (normal) */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Draw pending chars (black) */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
}
int kanji = 0;
for (x = 0; x < x1; x++)
- if (!(old_aa[x] & 0x80) && iskanji(old_cc[x]))
+ if (!(old_aa[x] & AF_TILE1) && iskanji(old_cc[x]))
{
if (x == x1 - 1)
{
/* Æüìʸ»ú¤È¤·¤ÆMSB¤¬Î©¤Ã¤Æ¤¤¤ë²ÄǽÀ¤¬¤¢¤ë */
/* ¤½¤Î¾ì¹çattr¤ÎMSB¤âΩ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤³¤ì¤Ç¼±Ê̤¹¤ë */
/* check */
- kanji = (iskanji(nc) && !(na & 0x80));
+ kanji = (iskanji(nc) && !(na & AF_TILE1));
#endif
/* Handle unchanged grids */
#ifdef JP
/* Draw pending chars (normal) */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Draw pending chars (black) */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
/* Draw the pending chars */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Hack -- Erase "leading" spaces */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
/* Draw pending chars (normal) */
if (fa || always_text)
{
-#ifdef CHUUKEI
- send_text_to_chuukei_server(fx, y, fn, fa, &scr_cc[fx]);
-#endif
(void)((*Term->text_hook)(fx, y, fn, fa, &scr_cc[fx]));
}
/* Draw pending chars (black) */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(fx, y, fn);
-#endif
(void)((*Term->wipe_hook)(fx, y, fn));
}
}
}
- /* Paranoia -- use "fake" hooks to prevent core dumps */
- if (!Term->curs_hook) Term->curs_hook = Term_curs_hack;
- if (!Term->bigcurs_hook) Term->bigcurs_hook = Term->curs_hook;
- if (!Term->wipe_hook) Term->wipe_hook = Term_wipe_hack;
- if (!Term->text_hook) Term->text_hook = Term_text_hack;
- if (!Term->pict_hook) Term->pict_hook = Term_pict_hack;
-
-
/* Handle "total erase" */
if (Term->total_erase)
{
char otc = old_tcc[tx];
#ifdef JP
- if (tx + 1 < Term->wid && !(old_aa[tx] & 0x80)
+ if (tx + 1 < Term->wid && !(old_aa[tx] & AF_TILE1)
&& iskanji(old_cc[tx]))
csize = 2;
#endif
}
/* Hack -- use "Term_pict()" sometimes */
- else if (Term->higher_pict && (old_aa[tx] & 0x80) && (old_cc[tx] & 0x80))
+ else if (Term->higher_pict && (old_aa[tx] & AF_TILE1) && (old_cc[tx] & 0x80))
{
(void)((*Term->pict_hook)(tx, ty, 1, &old_aa[tx], &old_cc[tx], &ota, &otc));
}
-
- /* Hack -- restore the actual character */
- else if (old_aa[tx] || Term->always_text)
- {
-
-#ifdef CHUUKEI
- send_text_to_chuukei_server(tx, ty, csize, (old_aa[tx] & 0xf), &old_cc[tx]);
-#endif
- (void)((*Term->text_hook)(tx, ty, csize, (unsigned char) (old_aa[tx] & 0xf), &old_cc[tx]));
+
+ /*
+ * Hack -- restore the actual character
+ * ¸µ¤Îʸ»ú¤ÎÉÁ²èÈϰϤ¬¥«¡¼¥½¥ë¤è¤ê¾®¤µ¤¤¤È¡¢
+ * ¾å½ñ¤¤µ¤ì¤Ê¤«¤Ã¤¿Éôʬ¤¬¥´¥ß¤È¤·¤Æ»Ä¤ë¡£
+ * wipe_hook ¤Ç¥«¡¼¥½¥ë¤ò¾Ãµî¤·¤Æ text_hook ¤Ç½ñ¤Ä¾¤¹¡£
+ */
+ else if (old_aa[tx] || Term->always_text)
+ {
+ (void)((*Term->wipe_hook)(tx, ty, 1));
+ (void)((*Term->text_hook)(tx, ty, csize, (unsigned char) (old_aa[tx] & 0xf), &old_cc[tx]));
}
/* Hack -- erase the grid */
else
{
-#ifdef CHUUKEI
- send_wipe_to_chuukei_server(tx, ty, 1);
-#endif
(void)((*Term->wipe_hook)(tx, ty, 1));
}
}
/* Draw the cursor */
if (!scr->cu && scr->cv)
{
-#ifdef CHUUKEI
- send_curs_to_chuukei_server(scr->cx, scr->cy);
-#endif
-
#ifdef JP
if ((scr->cx + 1 < w) &&
- ((old->a[scr->cy][scr->cx + 1] & AF_BIGTILE) == AF_BIGTILE ||
- (!(old->a[scr->cy][scr->cx] & 0x80) &&
+ ((old->a[scr->cy][scr->cx + 1] & AF_BIGTILE2) == AF_BIGTILE2 ||
+ (!(old->a[scr->cy][scr->cx] & AF_TILE1) &&
iskanji(old->c[scr->cy][scr->cx]))))
#else
- if ((scr->cx + 1 < w) && (old->a[scr->cy][scr->cx + 1] & AF_BIGTILE) == AF_BIGTILE)
+ if ((scr->cx + 1 < w) && (old->a[scr->cy][scr->cx + 1] & AF_BIGTILE2) == AF_BIGTILE2)
#endif
{
/* Double width cursor for the Bigtile mode */
/* The cursor is useless, hide it */
if (scr->cu)
{
-#ifdef CHUUKEI
- send_curs_to_chuukei_server(w - 1, scr->cy);
-#endif
/* Paranoia -- Put the cursor NEAR where it belongs */
(void)((*Term->curs_hook)(w - 1, scr->cy));
/* The cursor is invisible, hide it */
else if (!scr->cv)
{
-#ifdef CHUUKEI
- send_curs_to_chuukei_server(scr->cx, scr->cy);
-#endif
/* Paranoia -- Put the cursor where it belongs */
(void)((*Term->curs_hook)(scr->cx, scr->cy));
/* The cursor is visible, display it correctly */
else
{
-#ifdef CHUUKEI
- send_curs_to_chuukei_server(scr->cx, scr->cy);
-#endif
/* Put the cursor where it belongs */
(void)((*Term->curs_hook)(scr->cx, scr->cy));
/*
+ * Bigtile version of Term_addch().
+ *
+ * If use_bigtile is FALSE, simply call Term_addch() .
+ *
+ * Otherwise, queue a pair of attr/char for display at the current
+ * cursor location, and advance the cursor to the right by two.
+ */
+errr Term_add_bigch(byte a, char c)
+{
+ if (!use_bigtile) return Term_addch(a, c);
+
+ /* Handle "unusable" cursor */
+ if (Term->scr->cu) return (-1);
+
+ /* Paranoia -- no illegal chars */
+ if (!c) return (-2);
+
+ /* Queue the given character for display */
+ Term_queue_bigchar(Term->scr->cx, Term->scr->cy, a, c, 0, 0);
+
+ /* Advance the cursor */
+ Term->scr->cx += 2;
+
+ /* Success */
+ if (Term->scr->cx < Term->wid) return (0);
+
+ /* Note "Useless" cursor */
+ Term->scr->cu = 1;
+
+ /* Note "Useless" cursor */
+ return (1);
+}
+
+
+/*
* At the current location, using an attr, add a string
*
* We also take a length "n", using negative values to imply
* Á´³Ñʸ»ú¤Î±¦È¾Ê¬¤«¤éʸ»ú¤òɽ¼¨¤¹¤ë¾ì¹ç¡¢
* ½Å¤Ê¤Ã¤¿Ê¸»ú¤Îº¸Éôʬ¤ò¾Ãµî¡£
*/
- if (n > 0 && (((scr_aa[x] & AF_KANJI2) && (scr_aa[x] & AF_BIGTILE) != AF_BIGTILE)
- || (scr_aa[x] & AF_BIGTILE) == AF_BIGTILE))
+ if (n > 0 && (((scr_aa[x] & AF_KANJI2) && !(scr_aa[x] & AF_TILE1))
+ || (scr_aa[x] & AF_BIGTILE2) == AF_BIGTILE2))
#else
- if (n > 0 && (scr_aa[x] & AF_BIGTILE) == AF_BIGTILE)
+ if (n > 0 && (scr_aa[x] & AF_BIGTILE2) == AF_BIGTILE2)
#endif
{
x--;
t->char_blank = ' ';
+ /* Prepare "fake" hooks to prevent core dumps */
+ t->curs_hook = Term_curs_hack;
+ t->bigcurs_hook = Term_bigcurs_hack;
+ t->wipe_hook = Term_wipe_hack;
+ t->text_hook = Term_text_hack;
+ t->pict_hook = Term_pict_hack;
+
+
/* Success */
return (0);
}
OSDN Git Service
