X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=d1fffc05296d930f39dce3187492191ac231d134;hb=5efc409a3640bcc8b2b4d5310a7e09c1e22afeba;hp=299df7fae354f564dd1f3d8df060d84cf829345b;hpb=2b2a1e0169b3a863fd87b679d789a4e2b789eb67;p=plomrogue diff --git a/src/client/io.c b/src/client/io.c index 299df7f..d1fffc0 100644 --- a/src/client/io.c +++ b/src/client/io.c @@ -10,7 +10,7 @@ #include /* PIPE_BUF */ #include /* halfdelay(), 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() */ @@ -25,9 +25,12 @@ * 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 */ @@ -69,24 +72,19 @@ static FILE * changed_worldstate_file(char * path); * 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_worldstate() call. - * - * map_center() is triggered by either, the first successful read_worldstate() - * (thus on client start), or on turn 1 (thus on world start). */ 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 ping_pong_test(time_t last_server_answer_time); +static void test_and_poll_server(); -/* Read server's out file into queue, update "last_server_answer_time" if new - * stuff is found there. - */ -static void try_growing_queue(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 server out file for messages, act on them (i.e. derive log messages). */ -static uint8_t read_outfile(); +/* Read messages from queue, act on them. */ +static uint8_t read_queue(); @@ -180,7 +178,6 @@ 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) @@ -194,11 +191,6 @@ static uint8_t read_worldstate() 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); read_map_cells(file, &world.map.cells); read_map_cells(file, &world.mem_map); @@ -209,9 +201,15 @@ static uint8_t read_worldstate() -static void ping_pong_test(time_t last_server_answer_time) +static void test_and_poll_server() { + static time_t last_server_answer_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 */ { /* ping was answered */ @@ -229,40 +227,72 @@ static void ping_pong_test(time_t last_server_answer_time) -static void try_growing_queue(time_t * last_server_answer_time) +static void nl_append_string(char * append, char ** string) { - if (read_file_into_queue(world.file_server_out, &world.queue, - &world.queue_size)) + 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) { - * last_server_answer_time = time(0); + exit_trouble(UINT32_MAX < new_size + strlen(*string), __func__, err); + old_size = strlen(*string); + add_nl = 1; } + 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_outfile() +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,&world.queue_size))) + while (NULL != (msg = get_message_from_queue(&world.queue))) { char * log_prefix = "LOG "; - if (!strncmp(msg, log_prefix, strlen(log_prefix))) + if (!strcmp(msg, "THINGS_HERE START")) { ret = 1; - char * log_msg = msg + strlen(log_prefix); - int old_size = 0; - if (world.log) + 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) { - old_size = strlen(world.log); + nl_append_string("(none known)", &world.things_here); } - int new_size = strlen(log_msg); - char * new_log = try_malloc(old_size + 1 + new_size + 1, __func__); - memcpy(new_log, world.log, old_size); - int test = sprintf(new_log + old_size, "\n%s", log_msg); - exit_trouble(test < 0, __func__, "sprintf"); + } + 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 = new_log; + world.log = NULL; + } + else if (!strcmp(msg, "WORLD_UPDATED")) + { + query_mapcell(); } free(msg); } @@ -285,28 +315,24 @@ extern void send(char * msg) extern char * io_loop() { - world.halfdelay = 1; /* Ensures read_worldstate() is only called */ - halfdelay(world.halfdelay); /* 10 times a second during user inactivity. */ + world.halfdelay = 1; /* Ensure server is polled only 10 times */ + halfdelay(world.halfdelay); /* a second during user inactivity. */ uint8_t change_in_client = 0; - uint16_t last_focused_turn = world.turn; - time_t last_server_answer_time = time(0); while (1) { - try_growing_queue(&last_server_answer_time); - ping_pong_test(last_server_answer_time); + test_and_poll_server(); if (world.winch) { reset_windows_on_winch(); world.winch = 0; change_in_client++; } - if (change_in_client || read_worldstate() || read_outfile()) + 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(); - } + struct Win * win_map = get_win_by_id('m'); + 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(); } change_in_client = 0;