summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortroido <troido@hotmail.com>2018-04-15 14:14:46 +0200
committertroido <troido@hotmail.com>2018-04-15 14:14:46 +0200
commit3379696d9d79b4849b0615d45bc915bfe119e467 (patch)
treed25b4fa01a0020fb4e78e4791086d82262791d6d
parent1e390c939a11a2c610bda59e5204febfb27fc3a2 (diff)
chat scrolling works again
-rw-r--r--asciifarm/client/inputhandler.py6
-rw-r--r--asciifarm/keybindings/keybindings.json4
2 files changed, 7 insertions, 3 deletions
diff --git a/asciifarm/client/inputhandler.py b/asciifarm/client/inputhandler.py
index 79209bd..7fb18ad 100644
--- a/asciifarm/client/inputhandler.py
+++ b/asciifarm/client/inputhandler.py
@@ -24,7 +24,8 @@ class InputHandler:
"select": self.select,
"inputwithselected": self.actWithSelected,
"eval": self.eval,
- "exec": self.exec
+ "exec": self.exec,
+ "scrollchat": self.scrollChat
}
def execute(self, action):
@@ -89,4 +90,7 @@ class InputHandler:
text = " ".join(texts)
exec(text, {"self": self, "client": self.client, "connection": self.connection, "display": self.display})
+ def scrollChat(self, lines):
+ self.display.scrollBack(lines)
+
diff --git a/asciifarm/keybindings/keybindings.json b/asciifarm/keybindings/keybindings.json
index 20759bd..7e58dd2 100644
--- a/asciifarm/keybindings/keybindings.json
+++ b/asciifarm/keybindings/keybindings.json
@@ -39,8 +39,8 @@
"A": ["input", ["attack", "west"]],
"t": ["runinput"],
"NEWLINE": ["runinput"],
-"KEY_PPAGE": "(self.display.scrollBack 1]",
-"KEY_NPAGE": "(self.display.scrollBack -1]"
+"KEY_PPAGE": ["scrollchat", 1],
+"KEY_NPAGE": ["scrollchat", -1]
},
"help": "Controls:\n wasd or arrows:\n Move around\n e: Grab\n q: Drop\n E: Use/Equip\n r: Interact\n f: Attack\n t: Chat\n z: Unequip\n xcv: scroll\n ctrl-c: close client"
}