Index: lib/libncurses/test/blue.c =================================================================== RCS file: /cvsroot/dslinux/dslinux/lib/libncurses/test/blue.c,v retrieving revision 1.1 diff -u -r1.1 blue.c --- lib/libncurses/test/blue.c 2 Oct 2005 21:32:54 -0000 1.1 +++ lib/libncurses/test/blue.c 23 Sep 2006 12:31:04 -0000 @@ -175,7 +175,6 @@ addch(ranks[value % SUIT_LENGTH][1] | COLOR_PAIR(BLUE_ON_WHITE)); addch(suits[value / SUIT_LENGTH]); } - (void) addch(' '); } static void @@ -195,7 +194,7 @@ move(PROMPTROW + 2, 0); refresh(); -#define P(x) (void)printw("%s\n", x) +#define P(x) (void)printw("%s ", x) P(" This 52-card solitaire starts with the entire deck shuffled and dealt"); P("out in four rows. The aces are then moved to the left end of the layout,"); P("making 4 initial free spaces. You may move to a space only the card that"); @@ -230,10 +229,10 @@ grid[dst] = grid[src]; grid[src] = NOCARD; - move(BASEROW + (dst / GRID_WIDTH) * 2 + 2, (dst % GRID_WIDTH) * 5 + 1); + move(BASEROW + (dst / GRID_WIDTH) * 2 + 2, (dst % GRID_WIDTH) * 4 + 1); printcard(grid[dst]); - move(BASEROW + (src / GRID_WIDTH) * 2 + 2, (src % GRID_WIDTH) * 5 + 1); + move(BASEROW + (src / GRID_WIDTH) * 2 + 2, (src % GRID_WIDTH) * 4 + 1); printcard(grid[src]); refresh(); @@ -268,8 +267,8 @@ for (i = 0; i < 4; i++) { if (selection[i] != NOCARD) { move(BASEROW + (selection[i] / GRID_WIDTH) * 2 + 3, - (selection[i] % GRID_WIDTH) * 5); - (void) printw(" %c ", *lp++ = 'a' + i); + (selection[i] % GRID_WIDTH) * 4); + (void) printw(" %c ", *lp++ = 'a' + i); } }; *lp = '\0'; @@ -301,8 +300,8 @@ for (j = 0; j < 4; j++) if (selection[j] != NOCARD) { move(BASEROW + (selection[j] / GRID_WIDTH) * 2 + 3, - (selection[j] % GRID_WIDTH) * 5); - (void) printw(" "); + (selection[j] % GRID_WIDTH) * 4); + (void) printw(" "); } if (c == 'r')