X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Fcursesdsp.c;h=f4c00ec5f93c3672d6fd3bec97dc5f8c3d9aa69a;hb=db669bbcd569f6ee2a8b0dafc307e8d3e52d0708;hp=692ffa8df23a84dc2f4b81e8624bec0e4752c760;hpb=1aca00e04580e7b3effefa535edb469876ecce74;p=gnushogi.git
diff --git a/gnushogi/cursesdsp.c b/gnushogi/cursesdsp.c
index 692ffa8..f4c00ec 100644
--- a/gnushogi/cursesdsp.c
+++ b/gnushogi/cursesdsp.c
@@ -14,19 +14,20 @@
*
* This file is part of GNU SHOGI.
*
- * GNU Shogi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 1, or (at your option)
- * any later version.
+ * GNU Shogi is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 3 of the License,
+ * or (at your option) any later version.
*
- * GNU Shogi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Shogi is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with GNU Shogi; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with GNU Shogi; see the file COPYING. If not, see
+ * .
+ * ----------------------------------------------------------------------
*/
@@ -47,8 +48,8 @@ int mycnt1, mycnt2;
#define TAB (58)
-#define VIR_C(s) ((flag.reverse) ? (8 - column(s)) : column(s))
-#define VIR_R(s) ((flag.reverse) ? (8 - row(s)) : row(s))
+#define VIR_C(s) ((flag.reverse) ? (NO_COLS - 1 - column(s)) : column(s))
+#define VIR_R(s) ((flag.reverse) ? (NO_ROWS - 1 - row(s)) : row(s))
unsigned short MV[MAXDEPTH];
int MSCORE;
@@ -164,7 +165,7 @@ Curses_ShowPatternCount(short side, short n)
{
if (flag.post)
{
- gotoXY(TAB + 10 + 3 * side, 20);
+ gotoXY(TAB + 10 + 3 * side, 20); /* CHECKME */
if (n >= 0)
printw("%3d", n);
@@ -177,9 +178,9 @@ Curses_ShowPatternCount(short side, short n)
void
ShowPlayers(void)
{
- gotoXY(5, ((flag.reverse) ? 23 : 2));
+ gotoXY(5, ((flag.reverse) ? (5 + 2*NO_ROWS) : 2));
printw("%s", (computer == white) ? CP[218] : CP[74]);
- gotoXY(5, ((flag.reverse) ? 2 : 23));
+ gotoXY(5, ((flag.reverse) ? 2 : (5 + 2*NO_ROWS)));
printw("%s", (computer == black) ? CP[218] : CP[74]);
}
@@ -500,8 +501,8 @@ Curses_EditBoard(void)
}
else
{
- c = '9' - s[1];
- r = 'i' - s[2];
+ c = COL_NAME(s[1]);
+ r = ROW_NAME(s[2]);
}
if ((c >= 0) && (c < NO_COLS) && (r >= 0) && (r < NO_ROWS))
@@ -600,7 +601,7 @@ Curses_SearchStartStuff(short side)
signal(SIGINT, Curses_TerminateSearch);
signal(SIGQUIT, Curses_TerminateSearch);
- for (i = 4; i < 14; i++)
+ for (i = 4; i < 14; i++) /* CHECKME */
{
gotoXY(TAB, i);
ClearEoln();
@@ -747,7 +748,7 @@ DrawPiece(short sq)
y = pxx[(int)piece];
}
- gotoXY(8 + 5 * VIR_C(sq), 4 + 2 * (8 - VIR_R(sq)));
+ gotoXY(8 + 5 * VIR_C(sq), 4 + 2 * ((NO_ROWS - 1) - VIR_R(sq)));
printw("%c%c%c%c", l, p, y, r);
}
@@ -763,7 +764,7 @@ Curses_ShowPostnValue(short sq)
{
short score;
- gotoXY(4 + 5 * VIR_C(sq), 5 + 2 * (7 - VIR_R(sq)));
+ gotoXY(4 + 5 * VIR_C(sq), 5 + 2 * (7 - VIR_R(sq))); /* CHECKME */
score = ScorePosition(color[sq]);
if (color[sq] != neutral)
@@ -809,6 +810,7 @@ void
Curses_UpdateDisplay(short f, short t, short redraw, short isspec)
{
short i, sq, z;
+ int j;
if (redraw)
{
@@ -818,31 +820,38 @@ Curses_UpdateDisplay(short f, short t, short redraw, short isspec)
i = 2;
gotoXY(3, ++i);
- printw(" +----+----+----+----+----+----+----+----+----+");
+ printw(" +");
+ for (j=0; j