X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=694ebfbfc43d2214842b5e14b1e722afb990b41a;hb=c1c88f66166ed26d0bd346570c37f006e3c8364b;hp=d1fffc05296d930f39dce3187492191ac231d134;hpb=5efc409a3640bcc8b2b4d5310a7e09c1e22afeba;p=plomrogue
diff --git a/src/client/io.c b/src/client/io.c
index d1fffc0..694ebfb 100644
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -8,7 +8,7 @@
#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, UINT32_MAX */
#include /* FILE, sprintf(), fseek(), fflush() */
@@ -211,12 +211,12 @@ static void test_and_poll_server()
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;
@@ -315,11 +315,12 @@ extern void send(char * msg)
extern char * io_loop()
{
- world.halfdelay = 1; /* Ensure server is polled only 10 times */
- halfdelay(world.halfdelay); /* a second during user inactivity. */
+ uint16_t delay = 1; /* Greater delay: less redundant server files reading.*/
uint8_t change_in_client = 0;
while (1)
{
+ timeout(delay);
+ delay = delay < 1000 ? delay * 2 : delay;
test_and_poll_server();
if (world.winch)
{
@@ -329,16 +330,21 @@ extern char * io_loop()
}
if (change_in_client || read_worldstate() || read_queue())
{
+ delay = 1; /* Keep client alert even if it's not getch()'d. */
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);
+ 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();
}
change_in_client = 0;
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)
{