moving stuff around
このコミットが含まれているのは:
woosh
コミット
430f5a31c6
441
uttt.c
441
uttt.c
|
|
@ -21,14 +21,12 @@ struct ut_state
|
|||
char boards[3][3];
|
||||
int playBoard;
|
||||
char player;
|
||||
char host_player;
|
||||
};
|
||||
const struct ut_state ut_initial = {
|
||||
.boards = {0},
|
||||
.tiles = {0},
|
||||
.playBoard = -1,
|
||||
.player = 'X',
|
||||
.host_player = '\0',
|
||||
};
|
||||
|
||||
struct ut_socket_buffer {
|
||||
|
|
@ -51,6 +49,7 @@ const char *arg_local = "--local";
|
|||
const char *arg_host = "--host";
|
||||
const char *arg_join = "--join";
|
||||
|
||||
|
||||
char ut_turn(char player)
|
||||
{
|
||||
switch(player)
|
||||
|
|
@ -61,14 +60,6 @@ char ut_turn(char player)
|
|||
}
|
||||
}
|
||||
|
||||
int ut_random_player(char *player) {
|
||||
int random = open("/dev/urandom", O_RDONLY);
|
||||
if (read(random, player, 1) < 0) {return errno;}
|
||||
*player = *player % 2 == 0 ? 'X' : 'O';
|
||||
*player = 'X'; // testing
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define T(r, c) (tiles[offset + stride * r + c])
|
||||
char ut_winner(const char *tiles, int offset, int stride) {
|
||||
|
||||
|
|
@ -135,6 +126,53 @@ int ut_move(struct ut_state *new_state, const struct ut_state *old_state, int ro
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int curs_line; // set this to 21 and reset it on erase TODO - use this as an offset rather
|
||||
void ut_cursprint(const char *str, int n)
|
||||
{
|
||||
mvaddnstr(info_line, 0, str, n);
|
||||
int y, x;
|
||||
getyx(stdscr, y, x);
|
||||
info_line = y;
|
||||
}
|
||||
int ut_cursprintf(const char *restrict format, ...)
|
||||
{
|
||||
char line[MAX_LINE];
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
int n = vsnprintf(line, MAX_LINE, format, ap);
|
||||
va_end(ap);
|
||||
if(n < 0 || n > MAX_LINE - 1) {return -1;}
|
||||
ut_cursprint(line, n);
|
||||
return n;
|
||||
}
|
||||
|
||||
int ut_writefill(int fd, const char *x, size_t l)
|
||||
{
|
||||
while(l > 0)
|
||||
{
|
||||
int r = write(fd, x, l);
|
||||
if(r < 0)
|
||||
{
|
||||
if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return 1;}
|
||||
}
|
||||
x += r; l -= r;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#define MAX_LINE 128
|
||||
int ut_dprintf(int fd, const char *restrict format, ...)
|
||||
{
|
||||
char line[MAX_LINE];
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
int n = vsnprintf(line, MAX_LINE, format, ap);
|
||||
va_end(ap);
|
||||
if(n < 0 || n > MAX_LINE - 1) {return -1;}
|
||||
if(ut_writefill(fd, line, n)) {return -1;}
|
||||
return n;
|
||||
}
|
||||
// TODO highlight last placed
|
||||
void ut_drawBoard(void (*mvch)(void*, int, int, char), void *arg, const char *tiles, int offset, int stride, int iy, int ix, char winner, bool highlight)
|
||||
{
|
||||
|
|
@ -220,6 +258,168 @@ void ut_sockdraw(const struct ut_state *state, int fd)
|
|||
}
|
||||
|
||||
|
||||
|
||||
int ut_readfill(int fd, char *x, size_t l)
|
||||
{
|
||||
while(l > 0)
|
||||
{
|
||||
int r = read(fd, x, l);
|
||||
if(r < 0)
|
||||
{
|
||||
if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return 1;}
|
||||
}
|
||||
else if(r == 0) {return 2;}
|
||||
x += r; l -= r;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ut_socket_buffer_size(struct ut_socket_buffer *sockbuf) {
|
||||
int size = sockbuf->stop - sockbuf->start;
|
||||
if (size < 0) {size += sockbuf->len;}
|
||||
return size;
|
||||
}
|
||||
|
||||
/* Copies up to (and including) first '\n' in socket buffer, otherwise whole buffer */
|
||||
int ut_readline_buffer(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
int size = ut_socket_buffer_size(sockbuf);
|
||||
printf("sockbuf size: %d\n", size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
if (i > len) {return -2;}
|
||||
line[i] = sockbuf->buf[(sockbuf->start + i) % sockbuf->len];
|
||||
if (line[i] == '\n') {
|
||||
sockbuf->start = (sockbuf->start + i + 1) % sockbuf->len;
|
||||
printf("new start: %d\n", sockbuf->start);
|
||||
return i + 1;
|
||||
}
|
||||
}
|
||||
sockbuf->start = (sockbuf->start + size) % sockbuf->len;
|
||||
printf("new start from size: %d\n", sockbuf->start);
|
||||
return size;
|
||||
}
|
||||
|
||||
int ut_readline_socket(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
while (len > 0) {
|
||||
int r = read(sockbuf->fd, line, len);
|
||||
line[r] = 0;
|
||||
printf("read %d from fd %d\n", r, sockbuf->fd);
|
||||
printf(">>socket data: '%s'\n", line);
|
||||
if (r < 0) {
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return -1;}
|
||||
}
|
||||
else if (r == 0) {return -1;}
|
||||
for (int i = 0; i < r; i++) {
|
||||
if (line[i] == '\n') {
|
||||
int size = ut_socket_buffer_size(sockbuf);
|
||||
if (r - (i + 1) >= sockbuf->len - size) {return -2;}
|
||||
for (int j = 0; j < r - (i + 1); j++) {
|
||||
sockbuf->buf[(sockbuf->stop + j) % sockbuf->len] = line[i + 1 + j];
|
||||
}
|
||||
sockbuf->stop = (sockbuf->stop + r - (i + 1)) % sockbuf->len;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
line += r;
|
||||
len -= r;
|
||||
}
|
||||
}
|
||||
|
||||
int ut_readline(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
int nb = ut_readline_buffer(sockbuf, line, len);
|
||||
if (nb < 0) {return nb;}
|
||||
line[nb] = 0;
|
||||
printf("got partial line from buffer %d bytes: '%s'\n", nb, line);
|
||||
if (nb >= 1 && line[nb - 1] == '\n') {return nb - 1;}
|
||||
int ns = ut_readline_socket(sockbuf, line + nb, len - nb);
|
||||
if (ns < 0) {return ns;}
|
||||
line[nb+ns] = 0;
|
||||
printf("got end of line from socket %d bytes: '%s'\n", ns, line+nb);
|
||||
return nb + ns;
|
||||
}
|
||||
|
||||
/*void ut_show(const struct ut_state *state, int fd, bool as_comment) {
|
||||
#define tiles state->tiles
|
||||
ut_dprintf(fd, "%sTurn: %c\n%sPlay board: %d\n", as_comment ? "| " : "", (int)state->player, as_comment ? "| " : "", state->playBoard);
|
||||
int play_board_row = -1;
|
||||
int play_board_col = -1;
|
||||
if (state->playBoard != -1) {
|
||||
play_board_row = state->playBoard / 3;
|
||||
play_board_col = state->playBoard % 3;
|
||||
}
|
||||
ut_dprintf(fd, "%s 012 345 678\n", as_comment ? "| " : "");
|
||||
for(int y = 0; y < 9; y++)
|
||||
{
|
||||
if (y == 3 || y == 6) {
|
||||
ut_dprintf(fd, "%s ---+---+---\n", as_comment ? "| " : "");
|
||||
}
|
||||
ut_dprintf(fd, "%s%d ", as_comment ? "| " : "", y);
|
||||
for(int x = 0; x < 9; x++)
|
||||
{
|
||||
if (x == 3 || x == 6) {
|
||||
ut_writefill(fd, "|", 1);
|
||||
}
|
||||
ut_writefill(fd, tiles[y][x] ? &tiles[y][x] : " ", 1);
|
||||
}
|
||||
if (y / 3 == play_board_row || play_board_row == -1) {
|
||||
ut_writefill(fd, "<", 1);
|
||||
}
|
||||
ut_writefill(fd, "\n", 1);
|
||||
}
|
||||
if (play_board_col == -1) {
|
||||
ut_dprintf(fd, "%s ^^^ ^^^ ^^^", as_comment ? "| " : "");
|
||||
} else {
|
||||
ut_dprintf(fd, "%s ", as_comment ? "| " : "");
|
||||
for (int i = 0; i < play_board_col; i++) {
|
||||
ut_dprintf(fd, " ");
|
||||
}
|
||||
ut_dprintf(fd, "^^^");
|
||||
}
|
||||
ut_writefill(fd, "\n", 1);
|
||||
#undef tiles
|
||||
}*/
|
||||
|
||||
/*void ut_show_boards(const struct ut_state *state) {
|
||||
for (int j = 0; j < 3; j++) {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
putchar(state->boards[j][i] ? state->boards[j][i] : ' ');
|
||||
}
|
||||
putchar('\n');
|
||||
}
|
||||
}*/
|
||||
|
||||
/*bool getpos(const struct ut_state *state, int *x, int *y) {
|
||||
while (true) {
|
||||
printf("Place token %c at position x,y: ", state->player);
|
||||
char line[5] = {0};
|
||||
if (fgets(line, 5, stdin) == NULL)
|
||||
return false;
|
||||
// line was too short
|
||||
if (line[3] == '\0')
|
||||
continue;
|
||||
// line was too long
|
||||
if (line[3] != '\n') {
|
||||
// consume rest of line
|
||||
while (true) {
|
||||
int garbage = getchar();
|
||||
if (garbage == EOF)
|
||||
return false;
|
||||
if (garbage == '\n')
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
int sscanf_result = sscanf(line, "%d,%d", x, y);
|
||||
if (sscanf_result == EOF)
|
||||
return false;
|
||||
if (sscanf_result != 2)
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}*/
|
||||
|
||||
int ut_click(const struct ut_state *state, int *r, int *c)
|
||||
{
|
||||
#define P(r, c, d) ((state->playBoard == -1 || state->playBoard == 3 * (r / 3) + (c / 3)) && \
|
||||
|
|
@ -312,216 +512,6 @@ int ut_click(const struct ut_state *state, int *r, int *c)
|
|||
#undef P
|
||||
}
|
||||
|
||||
int curs_line; // set this to 21 and reset it on erase TODO - use this as an offset rather
|
||||
void ut_cursprint(const char *str, int n)
|
||||
{
|
||||
mvaddnstr(info_line, 0, str, n);
|
||||
// info_line++; // depends on str not containing newlines
|
||||
int y, x;
|
||||
getyx(stdscr, y, x);
|
||||
info_line = y + 1;
|
||||
}
|
||||
|
||||
int ut_readfill(int fd, char *x, size_t l)
|
||||
{
|
||||
while(l > 0)
|
||||
{
|
||||
int r = read(fd, x, l);
|
||||
if(r < 0)
|
||||
{
|
||||
if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return 1;}
|
||||
}
|
||||
else if(r == 0) {return 2;}
|
||||
x += r; l -= r;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
int ut_writefill(int fd, const char *x, size_t l)
|
||||
{
|
||||
while(l > 0)
|
||||
{
|
||||
int r = write(fd, x, l);
|
||||
if(r < 0)
|
||||
{
|
||||
if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return 1;}
|
||||
}
|
||||
x += r; l -= r;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ut_socket_buffer_size(struct ut_socket_buffer *sockbuf) {
|
||||
int size = sockbuf->stop - sockbuf->start;
|
||||
if (size < 0) {size += sockbuf->len;}
|
||||
return size;
|
||||
}
|
||||
|
||||
/* Copies up to (and including) first '\n' in socket buffer, otherwise whole buffer */
|
||||
int ut_readline_buffer(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
int size = ut_socket_buffer_size(sockbuf);
|
||||
printf("sockbuf size: %d\n", size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
if (i > len) {return -2;}
|
||||
line[i] = sockbuf->buf[(sockbuf->start + i) % sockbuf->len];
|
||||
if (line[i] == '\n') {
|
||||
sockbuf->start = (sockbuf->start + i + 1) % sockbuf->len;
|
||||
printf("new start: %d\n", sockbuf->start);
|
||||
return i + 1;
|
||||
}
|
||||
}
|
||||
sockbuf->start = (sockbuf->start + size) % sockbuf->len;
|
||||
printf("new start from size: %d\n", sockbuf->start);
|
||||
return size;
|
||||
}
|
||||
|
||||
int ut_readline_socket(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
while (len > 0) {
|
||||
int r = read(sockbuf->fd, line, len);
|
||||
line[r] = 0;
|
||||
printf("read %d from fd %d\n", r, sockbuf->fd);
|
||||
printf(">>socket data: '%s'\n", line);
|
||||
if (r < 0) {
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return -1;}
|
||||
}
|
||||
else if (r == 0) {return -1;}
|
||||
for (int i = 0; i < r; i++) {
|
||||
if (line[i] == '\n') {
|
||||
int size = ut_socket_buffer_size(sockbuf);
|
||||
if (r - (i + 1) >= sockbuf->len - size) {return -2;}
|
||||
for (int j = 0; j < r - (i + 1); j++) {
|
||||
sockbuf->buf[(sockbuf->stop + j) % sockbuf->len] = line[i + 1 + j];
|
||||
}
|
||||
sockbuf->stop = (sockbuf->stop + r - (i + 1)) % sockbuf->len;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
line += r;
|
||||
len -= r;
|
||||
}
|
||||
}
|
||||
|
||||
int ut_readline(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
int nb = ut_readline_buffer(sockbuf, line, len);
|
||||
if (nb < 0) {return nb;}
|
||||
line[nb] = 0;
|
||||
printf("got partial line from buffer %d bytes: '%s'\n", nb, line);
|
||||
if (nb >= 1 && line[nb - 1] == '\n') {return nb - 1;}
|
||||
int ns = ut_readline_socket(sockbuf, line + nb, len - nb);
|
||||
if (ns < 0) {return ns;}
|
||||
line[nb+ns] = 0;
|
||||
printf("got end of line from socket %d bytes: '%s'\n", ns, line+nb);
|
||||
return nb + ns;
|
||||
}
|
||||
|
||||
#define MAX_LINE 128
|
||||
|
||||
int ut_dprintf(int fd, const char *restrict format, ...)
|
||||
{
|
||||
char line[MAX_LINE];
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
int n = vsnprintf(line, MAX_LINE, format, ap);
|
||||
va_end(ap);
|
||||
if(n < 0 || n > MAX_LINE - 1) {return -1;}
|
||||
if(ut_writefill(fd, line, n)) {return -1;}
|
||||
return n;
|
||||
}
|
||||
int ut_cursprintf(const char *restrict format, ...)
|
||||
{
|
||||
char line[MAX_LINE];
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
int n = vsnprintf(line, MAX_LINE, format, ap);
|
||||
va_end(ap);
|
||||
if(n < 0 || n > MAX_LINE - 1) {return -1;}
|
||||
ut_cursprint(line, n);
|
||||
return n;
|
||||
}
|
||||
|
||||
void ut_show(const struct ut_state *state, int fd, bool as_comment) {
|
||||
#define tiles state->tiles
|
||||
ut_dprintf(fd, "%sTurn: %c\n%sPlay board: %d\n", as_comment ? "| " : "", (int)state->player, as_comment ? "| " : "", state->playBoard);
|
||||
int play_board_row = -1;
|
||||
int play_board_col = -1;
|
||||
if (state->playBoard != -1) {
|
||||
play_board_row = state->playBoard / 3;
|
||||
play_board_col = state->playBoard % 3;
|
||||
}
|
||||
ut_dprintf(fd, "%s 012 345 678\n", as_comment ? "| " : "");
|
||||
for(int y = 0; y < 9; y++)
|
||||
{
|
||||
if (y == 3 || y == 6) {
|
||||
ut_dprintf(fd, "%s ---+---+---\n", as_comment ? "| " : "");
|
||||
}
|
||||
ut_dprintf(fd, "%s%d ", as_comment ? "| " : "", y);
|
||||
for(int x = 0; x < 9; x++)
|
||||
{
|
||||
if (x == 3 || x == 6) {
|
||||
ut_writefill(fd, "|", 1);
|
||||
}
|
||||
ut_writefill(fd, tiles[y][x] ? &tiles[y][x] : " ", 1);
|
||||
}
|
||||
if (y / 3 == play_board_row || play_board_row == -1) {
|
||||
ut_writefill(fd, "<", 1);
|
||||
}
|
||||
ut_writefill(fd, "\n", 1);
|
||||
}
|
||||
if (play_board_col == -1) {
|
||||
ut_dprintf(fd, "%s ^^^ ^^^ ^^^", as_comment ? "| " : "");
|
||||
} else {
|
||||
ut_dprintf(fd, "%s ", as_comment ? "| " : "");
|
||||
for (int i = 0; i < play_board_col; i++) {
|
||||
ut_dprintf(fd, " ");
|
||||
}
|
||||
ut_dprintf(fd, "^^^");
|
||||
}
|
||||
ut_writefill(fd, "\n", 1);
|
||||
#undef tiles
|
||||
}
|
||||
|
||||
void ut_show_boards(const struct ut_state *state) {
|
||||
for (int j = 0; j < 3; j++) {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
putchar(state->boards[j][i] ? state->boards[j][i] : ' ');
|
||||
}
|
||||
putchar('\n');
|
||||
}
|
||||
}
|
||||
|
||||
bool getpos(const struct ut_state *state, int *x, int *y) {
|
||||
while (true) {
|
||||
printf("Place token %c at position x,y: ", state->player);
|
||||
char line[5] = {0};
|
||||
if (fgets(line, 5, stdin) == NULL)
|
||||
return false;
|
||||
// line was too short
|
||||
if (line[3] == '\0')
|
||||
continue;
|
||||
// line was too long
|
||||
if (line[3] != '\n') {
|
||||
// consume rest of line
|
||||
while (true) {
|
||||
int garbage = getchar();
|
||||
if (garbage == EOF)
|
||||
return false;
|
||||
if (garbage == '\n')
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
int sscanf_result = sscanf(line, "%d,%d", x, y);
|
||||
if (sscanf_result == EOF)
|
||||
return false;
|
||||
if (sscanf_result != 2)
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int getpos_net(const struct ut_state *state, struct ut_socket_buffer *sockbuf, int *x, int *y) { // TODO
|
||||
const int MAX_LINE_LEN = 128;
|
||||
char byte;
|
||||
|
|
@ -675,6 +665,15 @@ int ut_network_game(struct ut_state *state, struct ut_socket_buffer *sockbuf, ch
|
|||
return 0;
|
||||
}
|
||||
|
||||
char ut_random_player(void) {
|
||||
char player;
|
||||
int random = open("/dev/urandom", O_RDONLY);
|
||||
if (read(random, &player, 1) < 0) {return -1;}
|
||||
player = (player % 2 == 0) ? 'X' : 'O';
|
||||
player = 'X'; // testing
|
||||
return player;
|
||||
}
|
||||
|
||||
int ut_host_game(struct ut_state *state) {
|
||||
int sock = socket(AF_INET, SOCK_STREAM, 0);
|
||||
if (sock == -1) {
|
||||
|
|
@ -707,7 +706,7 @@ int ut_host_game(struct ut_state *state) {
|
|||
}
|
||||
|
||||
// decide X or O
|
||||
if (ut_random_player(&state->host_player) != 0) {return 1;}
|
||||
if ((state->host_player = ut_random_player()) < 0) {return 1;}
|
||||
|
||||
// tell partner X or O
|
||||
ut_dprintf(conn, "%c\n", ut_turn(state->host_player)); // TODO
|
||||
|
|
|
|||
読み込み中…
新しいイシューから参照