summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/cio.cc
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2011-10-06 23:05:31 +0200
committerFlorian Diebold <flodiebold@gmail.com>2011-10-15 23:18:00 +0200
commit50c127e8ad514a2817be501f8bd2acbeb1bce4e4 (patch)
tree073e5b5af7dbe680202740922a66fcdd537c1b08 /crawl-ref/source/cio.cc
parentcde49cf01ee4d1acf2a4c36050fbeb8c228d1606 (diff)
downloadcrawl-ref-50c127e8ad514a2817be501f8bd2acbeb1bce4e4.tar.gz
crawl-ref-50c127e8ad514a2817be501f8bd2acbeb1bce4e4.zip
Make Webtiles output happen in parallel to the console display, and make the server record ttyrecs.
Crawl compiled with WEBTILES=y should now be playable normally (i.e. indistinguishable from one compiled without WEBTILES) when run from a terminal. (This is not yet completely the case.) The Webtiles data is written on a Unix-domain datagram socket; the Crawl parameter -webtiles-socket determines a path on which the Crawl process receives control messages. The Webtiles server then runs Crawl in a pseudo-terminal and records its console output into a ttyrec file. The goal of all this is of course to be able to watch Webtiles games from ssh, and later the reverse.
Diffstat (limited to 'crawl-ref/source/cio.cc')
-rw-r--r--crawl-ref/source/cio.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc
index 8606113fe7..c5aff06e01 100644
--- a/crawl-ref/source/cio.cc
+++ b/crawl-ref/source/cio.cc
@@ -21,7 +21,7 @@ extern int unixcurses_get_vi_key(int keyin);
static keycode_type _numpad2vi(keycode_type key)
{
-#if defined(UNIX) && !defined(USE_TILE)
+#if defined(UNIX) && !defined(USE_TILE_LOCAL)
key = unixcurses_get_vi_key(key);
#endif
switch (key)
@@ -30,7 +30,7 @@ static keycode_type _numpad2vi(keycode_type key)
case CK_DOWN: key = 'j'; break;
case CK_LEFT: key = 'h'; break;
case CK_RIGHT: key = 'l'; break;
-#if defined(UNIX) && !defined(USE_TILE)
+#if defined(UNIX) && !defined(USE_TILE_LOCAL)
case -1001: key = 'b'; break;
case -1002: key = 'j'; break;
case -1003: key = 'n'; break;
@@ -84,7 +84,7 @@ int unmangle_direction_keys(int keyin, KeymapContext keymap,
case '8': return 'k';
case '9': return 'u';
- #ifndef USE_TILE
+ #ifndef USE_TILE_LOCAL
default: return unixcurses_get_vi_key(keyin);
#endif
@@ -107,7 +107,7 @@ int unmangle_direction_keys(int keyin, KeymapContext keymap,
// cursoring over darkgrey or black causes problems.
void cursorxy(int x, int y)
{
-#if defined(USE_TILE)
+#if defined(USE_TILE_LOCAL)
coord_def ep(x, y);
coord_def gc = crawl_view.screen2grid(ep);
tiles.place_cursor(CURSOR_MOUSE, gc);