terminal-chess: comparison src/main.c

-:e9c3d3e89465
+:7ad6c62f6bdc
 uint16_t white = remaining_movetime(gamestate, WHITE);
 uint16_t black = remaining_movetime(gamestate, BLACK);
 char clkstr[16];
 bool always_hours = gamestate->info.time >= 3600;
 print_clk(white, clkstr, always_hours);
-mvprintw(boardy+4, boardx-1, "White time: %s", clkstr);
+mvaddstr(boardy+4, boardx-1, "White time: ");
+addstr(clkstr);
 print_clk(black, clkstr, always_hours);
-mvprintw(boardy+5, boardx-1, "Black time: %s", clkstr);
+mvaddstr(boardy+5, boardx-1, "Black time: ");
+addstr(clkstr);
 if (white == 0) {
 move(inputy, 0);
-printw("Time is over - Black wins!");
+addstr("Time is over - Black wins!");
 clrtobot();
 refresh();
 return 1;
 }
 if (black == 0) {
 move(inputy, 0);
-printw("Time is over - White wins!");
+addstr("Time is over - White wins!");
 clrtobot();
 refresh();
 return 1;
 }
 }
 )
 );
 int cy = perspective == WHITE ? boardy-y : boardy-7+y;
 int cx = perspective == WHITE ? boardx+x*3 : boardx+21-x*3;
-mvprintw(cy, cx, " %s ", piecestr);
+mvaddch(cy, cx, ' ');
+addstr(piecestr);
+addch(' ');
 }
 }
 attrset(A_NORMAL);
 for (uint8_t i = 0 ; i < 8 ; i++) {
 }
 static void eval_move_failed_msg(int code) {
 switch (code) {
 case AMBIGUOUS_MOVE:
-printw("Ambiguous move - please specify the piece to move.");
+addstr("Ambiguous move - please specify the piece to move.");
 break;
 case PIECE_NOT_FOUND:
-printw("No piece can be moved this way.");
+addstr("No piece can be moved this way.");
 break;
 case NEED_PROMOTION:
-printw("You need to promote the pawn (append \"=Q\" e.g.)!");
+addstr("You need to promote the pawn (append \"=Q\" e.g.)!");
 break;
 case KING_IN_CHECK:
-printw("Your king is in check!");
+addstr("Your king is in check!");
 break;
 case PIECE_PINNED:
-printw("This piece is pinned!");
+addstr("This piece is pinned!");
 break;
 case INVALID_MOVE_SYNTAX:
-printw("Can't interpret move - please use algebraic notation.");
+addstr("Can't interpret move - please use algebraic notation.");
 break;
 case RULES_VIOLATED:
-printw("Move does not comply with chess rules.");
+addstr("Move does not comply with chess rules.");
 break;
 case KING_MOVES_INTO_CHECK:
-printw("Can't move the king into a check position.");
+addstr("Can't move the king into a check position.");
 break;
 case MISSING_CHECK:
-printw("Move does not indicate check.");
+addstr("Move does not indicate check.");
 break;
 case MISSING_CHECKMATE:
-printw("Move does not indicate checkmate.");
+addstr("Move does not indicate checkmate.");
 break;
 case INVALID_CHECK:
-printw("Move incorrectly indicates check.");
+addstr("Move incorrectly indicates check.");
 break;
 case INVALID_CHECKMATE:
-printw("Move incorrectly indicates checkmate.");
+addstr("Move incorrectly indicates checkmate.");
 break;
 default:
-printw("Unknown move parser error.");
+addstr("Unknown move parser error.");
 }
 }
 static void save_pgn(GameState *gamestate) {
 int y;
 move(y, 0);
 }
 bool export_comments = prompt_yesno("Export with comments");
-printw("\rFilename: ");
+addstr("\rFilename: ");
 clrtoeol();
 char filename[64];
 if (getnstr(filename, 64) == OK && filename[0] != '\0') {
 move(y, 0);
 FILE *file = fopen(filename, "w");
 if (file) {
 write_pgn(file, gamestate, export_comments);
 fclose(file);
-printw("File saved.");
+addstr("File saved.");
 } else {
 printw("Can't write to file (%s).", strerror(errno));
 }
 clrtoeol();
 }
 net_send_code(opponent, NETCODE_TIMEOVER);
 return 1;
 }
 move(inputy, 0);
-printw("Use chess notation to enter your move.\n");
+addstr("Use chess notation to enter your move.\n");
 if (resign_suggested) {
 if (remis_suggested) {
-printw("The opponent asks you to resign or accept remis. \n\n");
+addstr("The opponent asks you to resign or accept remis. \n\n");
 } else {
-printw("The opponent asks you to resign.                 \n\n");
+addstr("The opponent asks you to resign.                 \n\n");
 }
 } else if (remis_suggested) {
-printw("The opponent offers remis. Type remis to accept. \n\n");
+addstr("The opponent offers remis. Type remis to accept. \n\n");
 } else if (remis_rejected) {
-printw("Remis offer rejected.                            \n\n");
+addstr("Remis offer rejected.                            \n\n");
 } else if (remis_offered) {
-printw("Remis offer sent.                                \n\n");
+addstr("Remis offer sent.                                \n\n");
 } else {
-printw("Or use a command: remis, resign, savepgn         \n\n");
+addstr("Or use a command: remis, resign, savepgn         \n\n");
 }
-printw("Type your move: ");
+addstr("Type your move: ");
 clrtoeol();
 /* check if the opponent sent us something */
 code = net_recieve_code_async(opponent);
 switch (code) {
 return 1;
 case NETCODE_CONNLOST:
 gamestate->ragequit = true;
 return 1;
 case NETCODE_ERROR:
-printw("\rCannot perform asynchronous network IO");
+addstr("\rCannot perform asynchronous network IO");
 cbreak(); getch();
 exit(EXIT_FAILURE);
 case NETCODE_AGAIN:
 /* try again */
 break;
 default:
-printw("\nThe opponent sent an invalid network pacakge.");
+addstr("\nThe opponent sent an invalid network pacakge.");
 }
 /* read move */
 if (use_premove || asyncgetnstr(movestr, &bufpos, MOVESTR_BUFLEN)) {
 bool was_premove = use_premove;
 * we want to receive the "game end" code from the
 * other party.
 */
 return 0;
 } else if (code == NETCODE_CONNLOST) {
-printw("Your opponent left the game.");
+addstr("Your opponent left the game.");
 return 1;
 } else {
-printw("Invalid network response.");
+addstr("Invalid network response.");
 }
 } else {
 if (was_premove) {
-printw("\nThe prepared move could not be executed.");
+addstr("\nThe prepared move could not be executed.");
 } else {
 eval_move_failed_msg(eval_result);
 }
 }
 clrtoeol();
 bool resign_suggested = false;
 while (1) {
 timecontrol(gamestate);
 move(inputy, 0);
-printw("Waiting for opponent. Use chess notation to prepare a move.\n");
+addstr("Waiting for opponent. Use chess notation to prepare a move.\n");
 if (*gamestate->premove) {
 printw("Current pre-move: %s                             \n",
 gamestate->premove);
 } else if (remis_suggested && !resign_suggested) {
-printw("Suggested remis.                                 \n");
+addstr("Suggested remis.                                 \n");
 } else if (resign_suggested) {
 if (remis_suggested) {
-printw("Suggested to resign or at least to accept remis. \n");
+addstr("Suggested to resign or at least to accept remis. \n");
 } else {
-printw("Suggested to resign.                             \n");
+addstr("Suggested to resign.                             \n");
 }
 } else {
-printw("Or use a command: remis, resign, taunt, savepgn  \n");
+addstr("Or use a command: remis, resign, taunt, savepgn  \n");
 }
 if (remis_offered) {
-printw("Opponent offered remis. Type 'remis' to accept.\n");
+addstr("Opponent offered remis. Type 'remis' to accept.\n");
 } else {
-printw("\n");
+addch('\n');
 }
-printw("Prepare your next move: ");
+addstr("Prepare your next move: ");
 clrtoeol();
 refresh();
 /* allow the player to prepare a move */
 if (asyncgetnstr(movestr, &bufpos, MOVESTR_BUFLEN)) {
 net_send_data(opponent, NETCODE_DECLINE_MOVE, &code, 1);
 }
 break;
 }
 case NETCODE_ERROR:
-printw("\rCannot perform asynchronous network IO");
+addstr("\rCannot perform asynchronous network IO");
 cbreak(); getch();
 exit(EXIT_FAILURE);
 case NETCODE_AGAIN:
 /* try again */
 break;
 default:
-printw("\nInvalid network request.");
+addstr("\nInvalid network request.");
 }
 }
 }
 static void game_review(GameState *gamestate) {
 } else if (gamestate->threefold) {
 addstr("The game was drawn after threefold repetition.\n");
 } else if (gamestate->nomaterial) {
 addstr("The game is drawn due to insufficient material.\n");
 } else if (gamestate->checkmate) {
-printw("%s was checkmated.\n",
+addstr(gamestate->movecount % 2 == 0 ? "White" : "Black");
-gamestate->movecount % 2 == 0 ? "White" : "Black");
+addstr(" was checkmated.\n");
 } else if (gamestate->ragequit) {
-printw("Your opponent disconnected.\n");
+addstr("Your opponent disconnected.\n");
 }
 addstr("\nPress 'q' to quit, 's' to save the position as PGN, or\n"
 "arrow keys, home/end, page up/down to review the game.\n");
 flushinp();
 redraw = false;
 static void dump_gameinfo(GameState *gamestate) {
 GameInfo *gameinfo = &gamestate->info;
 int serverwhite = gameinfo->servercolor == WHITE;
 attron(A_UNDERLINE);
-printw("Game details\n");
+addstr("Game details\n");
 attroff(A_UNDERLINE);
 printw("  Server:     %s\n  Client:     %s\n",
 serverwhite?"White":"Black", serverwhite?"Black":"White"
 );
 if (gameinfo->timecontrol) {
 if (gameinfo->delay) {
 printw(" (with %us delay)", gameinfo->delay);
 }
 addch('\n');
 } else {
-printw("  No time limit\n");
+addstr("  No time limit\n");
 }
 addch('\n');
 for (unsigned i = 0 ; i < gamestate->movecount ; i++) {
 if (i % 2 == 0) {
 printw("%d. %s", 1+i/2, gamestate->moves[i].string);
 close(server_fd);
 }
 }
 static int server_open(Server *server) {
-printw("\nListening for client...\n");
+addstr("\nListening for client...\n");
 refresh();
 if (settings.usedomainsocket
 ? net_create_sock(server, settings.serverhost)
 : net_create_tcp(server, settings.port)) {
 addstr("Server creation failed");
 if (server_version != NETCODE_VERSION) {
 addstr("Server uses an incompatible software version.");
 return 1;
 }
-printw("Connection established!\n\n");
+addstr("Connection established!\n\n");
 refresh();
 return 0;
 }

Mercurial > hg > terminal-chess / file comparison

comparison: src/main.c

src/main.c