#include <limits.h> /* PIPE_BUF */
#include <ncurses.h> /* halfdelay(), getch() */
#include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
#include <stdio.h> /* FILE, sprintf(), fseek(), fflush() */
#include <string.h> /* strcmp(), strlen(), memcpy() */
#include <stdlib.h> /* free(), atoi() */
*/
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();
-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 */
-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))
+ 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)))
{
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);
}
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)
+ if (world.turn != last_focused_turn && world.autofocus)
{
last_focused_turn = world.turn;
map_center();
projects / plomrogue / blobdiff