#define _POSIX_C_SOURCE 1 /* PIPE_BUF */
#include "io.h"
#include <limits.h> /* PIPE_BUF */
-#include <ncurses.h> /* halfdelay(), getch() */
+#include <ncurses.h> /* timeout(), getch() */
#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
#include <stdio.h> /* FILE, sprintf(), fseek(), fflush() */
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;
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)
{
}
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');
if (0 == win_map->view) /* So the map window's winconfig views */
{ /* don't get confused by the centering. */
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)
{
*/
#include "keybindings.h"
-#include <ncurses.h> /* keycode defines, cbreak(), halfdelay(), getch() */
+#include <ncurses.h> /* keycode defines, cbreak(), getch(), timeout() */
#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
#include <stdio.h> /* FILE, sprintf() */
kbdb->edit = 1;
draw_all_wins();
cbreak();
+ timeout(-1);
int keycode = getch();
- halfdelay(world.halfdelay);
+ timeout(0);
if (keycode < 1000)
{
kbdb->kbs[kbdb->select].keycode = keycode;
struct yx_uint8 player_pos; /* coordinates of player on map */
struct yx_uint8 look_pos; /* coordinates of look cursor */
uint16_t turn; /* world/game turn */
- uint8_t halfdelay; /* how long to wait for getch() input in io_loop() */
uint8_t player_inventory_select; /* index of selected item in inventory */
uint8_t player_lifepoints; /* how alive the player is */
uint8_t winch; /* if set, SIGWINCH was registered; trigger reset_windows()*/