X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=54b65c2b438ce73e97da7f0819678f75bd60523e;hb=3fb2cb493ae564f8b14ddb4143b6c1f5bf16f16a;hp=b3724b5ffaf566cc51322d023961f2a945c2aa7a;hpb=4e4313a0162999f961db391a2dcf943128040e56;p=plomrogue diff --git a/src/client/io.c b/src/client/io.c index b3724b5..54b65c2 100644 --- a/src/client/io.c +++ b/src/client/io.c @@ -8,9 +8,9 @@ #define _POSIX_C_SOURCE 1 /* PIPE_BUF */ #include "io.h" #include /* PIPE_BUF */ -#include /* halfdelay(), getch() */ +#include /* timeout(), getch() */ #include /* NULL */ -#include /* uint8_t, uint16_t, uint32_t */ +#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */ #include /* FILE, sprintf(), fseek(), fflush() */ #include /* strcmp(), strlen(), memcpy() */ #include /* free(), atoi() */ @@ -21,11 +21,16 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "../common/rexit.h" /* exit_trouble(), exit_err() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(), - * try_fgetc(), textfile_width(), try_fputc() + * try_fgetc(), textfile_width(), try_fputc(), + * read_file_into_queue(), + * get_message_from_queue(), */ +#include "../common/yx_uint8.h" /* yx_uint8 */ #include "control.h" /* try_key() */ -#include "map.h" /* map_center() */ -#include "windows.h" /* reset_windows_on_winch(), draw_all_wins() */ +#include "map.h" /* query_mapcell() */ +#include "windows.h" /* Win, reset_windows_on_winch(), draw_all_wins(), + * get_win_by_id() + */ #include "world.h" /* world global */ @@ -41,18 +46,12 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file); */ static void read_map_cells(FILE * file, char ** map); -/* Repeatedly use try_fgets() with given arguments to read the remaining lines - * of "file" into the world.log string. - */ -static void read_log(char * read_buf, uint32_t linemax, FILE * file); - /* Return value seen by atoi() in next line of "file" when passed to try_fgets() * with the given arguments. */ -static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, - FILE * file); +static int32_t read_value_from_line(char* read_buf,int32_t linemax,FILE* file); -/* If the server's worldstate file has changed since the last read_world(), +/* If the server's worldstate file has changed since the last read_worldstate(), * return a pointer to its file descriptor; else, return NULL. * * Two tests are performed to check for a file change. The file's last data @@ -69,24 +68,22 @@ static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, static FILE * changed_worldstate_file(char * path); /* Attempt to read the server's worldstate file as representation of the game - * world in a hard-coded serialization format. Returns 1 on success and 0 if the + * world in a hard-coded serialization format. Returns 1 on success, or 0 if the * out file wasn't read for supposedly not having changed since a last - * read_world() call. - * - * map_center() is triggered by either, the first successful read_world() (thus - * on client start), or on turn 1 (thus on world start). + * read_worldstate() call. */ -static uint8_t read_world(); +static uint8_t read_worldstate(); -/* If "last_server_answer_time" is too old, send a PING to the server; or, if a - * previous PING has not sparked any answer after a while, abort the client. +/* Poll server for queue input. If no new input, send ping, or, if ping already + * sent but unanswered for some time, abort. */ -static void test_ping_pong(time_t last_server_answer_time); +static void test_and_poll_server(); -/* Update "last_server_answer_time" if new stuff has been written to the - * server's out file. - */ -static void test_server_activity(time_t * last_server_answer_time); +/* If "string", append \n-prefixed "append", else write "append" as "string". */ +static void nl_append_string(char * append, char ** string); + +/* Read messages from queue, act on them. */ +static uint8_t read_queue(); @@ -144,31 +141,7 @@ static void read_map_cells(FILE * file, char ** map) -static void read_log(char * read_buf, uint32_t linemax, FILE * file) -{ - free(world.log); - world.log = NULL; - while (try_fgets(read_buf, linemax + 1, file, __func__)) - { - int old_size = 0; - if (world.log) - { - old_size = strlen(world.log); - } - int new_size = strlen(read_buf); - char * new_log = try_malloc(old_size + new_size + 1, __func__); - memcpy(new_log, world.log, old_size); - int test = sprintf(new_log + old_size, "%s", read_buf); - exit_trouble(test < 0, __func__, "sprintf"); - free(world.log); - world.log = new_log; - } -} - - - -static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, - FILE * file) +static int32_t read_value_from_line(char * read_buf,int32_t linemax,FILE * file) { try_fgets(read_buf, linemax + 1, file, __func__); return atoi(read_buf); @@ -199,11 +172,10 @@ static FILE * changed_worldstate_file(char * path) -static uint8_t read_world() +static uint8_t read_worldstate() { char * path = "server/worldstate"; char * quit_msg = "No worldstate file found to read. Server may be down."; - static uint8_t first_read = 1; exit_err(access(path, F_OK), quit_msg); FILE * file = changed_worldstate_file(path); if (!file) @@ -212,20 +184,17 @@ static uint8_t read_world() } uint32_t linemax = textfile_width(file); char * read_buf = try_malloc(linemax + 1, __func__); - world.turn = read_value_from_line(read_buf, linemax, file); - world.player_lifepoints = read_value_from_line(read_buf, linemax, file); + world.turn = (uint16_t) read_value_from_line(read_buf, linemax, file); + world.player_lifepoints = (uint16_t) read_value_from_line(read_buf, linemax, + file); + world.player_satiation = (int16_t) read_value_from_line(read_buf, linemax, + file); read_inventory(read_buf, linemax, file); - world.player_pos.y = read_value_from_line(read_buf, linemax, file); - world.player_pos.x = read_value_from_line(read_buf, linemax, file); - if (1 == world.turn || first_read) - { - map_center(); - first_read = 0; - } - world.map.length = read_value_from_line(read_buf, linemax, file); + world.player_pos.y = (uint8_t) read_value_from_line(read_buf,linemax,file); + world.player_pos.x = (uint8_t) read_value_from_line(read_buf,linemax,file); + world.map.length = (uint16_t) read_value_from_line(read_buf, linemax, file); read_map_cells(file, &world.map.cells); read_map_cells(file, &world.mem_map); - read_log(read_buf, linemax, file); free(read_buf); try_fclose(file, __func__); return 1; @@ -233,39 +202,104 @@ static uint8_t read_world() -static void test_ping_pong(time_t last_server_answer_time) +static void test_and_poll_server() { + static time_t last_server_answer_time = 0; + static time_t last_pong_time = 0; static uint8_t ping_sent = 0; + if (read_file_into_queue(world.file_server_out, &world.queue)) + { + last_server_answer_time = time(0); + return; + } time_t now = time(0); - if (ping_sent && last_server_answer_time > now - 3) /* Re-set if last */ + if (ping_sent && last_server_answer_time > now - 5) /* Re-set if last */ { /* ping was answered */ ping_sent = 0; /* with server */ return; /* activity. */ } - if (!ping_sent && last_server_answer_time < now - 3) + if (!ping_sent && last_server_answer_time < now - 5) { send("PING"); ping_sent = 1; + last_pong_time = now; return; } - exit_err(last_server_answer_time < now - 6, "Server not answering."); + exit_err(ping_sent && last_pong_time < now - 5, "Server not answering."); } -static void test_server_activity(time_t * last_server_answer_time) +static void nl_append_string(char * append, char ** string) { - int test = try_fgetc(world.file_server_out, __func__); - if (EOF == test) + char * err = "too large sizes"; + exit_trouble(UINT32_MAX < strlen(append), __func__, err); + uint32_t new_size = strlen(append); + uint32_t old_size = 0; + uint8_t add_nl = 0; + if (*string) { - return; + exit_trouble(UINT32_MAX < new_size + strlen(*string), __func__, err); + old_size = strlen(*string); + add_nl = 1; } - do + char * new_string = try_malloc(old_size + add_nl + new_size + 1, __func__); + memcpy(new_string, *string, old_size); + char * pattern = add_nl ? "\n%s" : "%s"; + int test = sprintf(new_string + old_size, pattern, append); + exit_trouble(test < 0, __func__, "sprintf"); + free(*string); + *string = new_string; +} + + + +static uint8_t read_queue() +{ + static uint8_t things_here_parsing = 0; + uint8_t ret = 0; + char * msg; + while (NULL != (msg = get_message_from_queue(&world.queue))) { - ; + char * log_prefix = "LOG "; + if (!strcmp(msg, "THINGS_HERE START")) + { + ret = 1; + things_here_parsing = 1; + free(world.things_here); + world.things_here = NULL; + } + else if (!strcmp(msg, "THINGS_HERE END")) + { + things_here_parsing = 0; + if (!world.things_here) + { + nl_append_string("(none known)", &world.things_here); + } + } + else if (things_here_parsing) + { + ret = 1; + nl_append_string(msg, &world.things_here); + } + else if (!strncmp(msg, log_prefix, strlen(log_prefix))) + { + ret = 1; + nl_append_string(msg + strlen(log_prefix), &world.log); + } + else if (!strcmp(msg, "NEW_WORLD")) + { + ret = 1; + free(world.log); + world.log = NULL; + } + else if (!strcmp(msg, "WORLD_UPDATED")) + { + query_mapcell(); + } + free(msg); } - while (EOF != (test = try_fgetc(world.file_server_out, __func__))); - * last_server_answer_time = time(0); + return ret; } @@ -273,7 +307,7 @@ static void test_server_activity(time_t * last_server_answer_time) extern void send(char * msg) { uint32_t msg_size = strlen(msg) + 1; - char * err = "send() tries to send message larger than PIPE_BUF bytes."; + char * err = "send() tried to send message larger than PIPE_BUF bytes."; exit_err(msg_size > PIPE_BUF, err); try_fwrite(msg, strlen(msg), 1, world.file_server_in, __func__); try_fputc('\n', world.file_server_in, __func__); @@ -284,27 +318,28 @@ extern void send(char * msg) extern char * io_loop() { - world.halfdelay = 1; /* Ensures read_world() is only called 10 */ - halfdelay(world.halfdelay); /* times a second during user inactivity. */ + uint16_t delay = 1; /* Greater delay: less redundant server files reading.*/ uint8_t change_in_client = 0; - uint16_t last_focused_turn = world.turn; - time_t last_server_answer_time = time(0); while (1) { - test_server_activity(&last_server_answer_time); - test_ping_pong(last_server_answer_time); + timeout(delay); + delay = delay < 1000 ? delay * 2 : delay; + test_and_poll_server(); if (world.winch) { reset_windows_on_winch(); world.winch = 0; change_in_client++; } - if (change_in_client || read_world()) + if (change_in_client || read_worldstate() || read_queue()) { - if (world.turn != last_focused_turn && world.focus_each_turn) - { - last_focused_turn = world.turn; - map_center(); + delay = 1; /* Keep client alert even if it's not getch()'d. */ + struct Win * win_map = get_win_by_id('m'); + if (0 == win_map->view) /* So the map window's winconfig views */ + { /* don't get confused by the centering. */ + struct yx_uint8 pos=world.look?world.look_pos:world.player_pos; + win_map->center.y = pos.y; + win_map->center.x = pos.x * 2 + (pos.y % 2); } draw_all_wins(); } @@ -312,6 +347,7 @@ extern char * io_loop() int key = getch(); if (ERR != key) { + delay = 1; /* Alert client if it's getch()'d. */ change_in_client = try_key((uint16_t) key); if (2 == change_in_client) {