Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added RAW and NOMARKUP protocol options to all protocols, settable with @option. Resolves #978.

Browse source
This commit is contained in:
Griatch 2016-05-24 22:52:20 +02:00
parent 79786b7173
commit f12c754225
6 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/default/player.py
View file

@ -509,8 +509,10 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
"ENCODING": validate_encoding, "ENCODING": validate_encoding,
"MCCP": validate_bool, "MCCP": validate_bool,
"MXP": validate_bool, "MXP": validate_bool,
"OOB": validate_bool, "NOMARKUP": validate_bool,
"NOPKEEPALIVE": validate_bool, "NOPKEEPALIVE": validate_bool,
"OOB": validate_bool,
"RAW": validate_bool,
"SCREENHEIGHT": validate_size, "SCREENHEIGHT": validate_size,
"SCREENWIDTH": validate_size, "SCREENWIDTH": validate_size,
"SCREENREADER": validate_bool, "SCREENREADER": validate_bool,

4
evennia/server/portal/ssh.py
View file

@ -256,8 +256,8 @@ class SshProtocol(Manhole, session.Session):
flags = self.protocol_flags flags = self.protocol_flags
xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True) xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True)
useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True) useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True)
raw = options.get("raw", False) raw = options.get("raw", flags.get("RAW", False))
nomarkup = options.get("nomarkup", not (xterm256 or useansi)) nomarkup = options.get("nomarkup", flags.get("NOMARKUP", not (xterm256 or useansi)))
#echo = options.get("echo", None) #echo = options.get("echo", None)
screenreader = options.get("screenreader", flags.get("SCREENREADER", False)) screenreader = options.get("screenreader", flags.get("SCREENREADER", False))

4
evennia/server/portal/telnet.py
View file

@ -321,8 +321,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
flags = self.protocol_flags flags = self.protocol_flags
xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True) xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True)
useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True) useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True)
raw = options.get("raw", False) raw = options.get("raw", flags.get("RAW", False))
nomarkup = options.get("nomarkup", not (xterm256 or useansi)) nomarkup = options.get("nomarkup", flags.get("NOMARKUP", not (xterm256 or useansi)))
echo = options.get("echo", None) echo = options.get("echo", None)
mxp = options.get("mxp", flags.get("MXP", False)) mxp = options.get("mxp", flags.get("MXP", False))
screenreader = options.get("screenreader", flags.get("SCREENREADER", False)) screenreader = options.get("screenreader", flags.get("SCREENREADER", False))

4
evennia/server/portal/webclient.py
View file

@ -161,8 +161,8 @@ class WebSocketClient(Protocol, Session):
text = to_str(text, force_string=True) text = to_str(text, force_string=True)
options = kwargs.pop("options", {}) options = kwargs.pop("options", {})
raw = options.get("raw", False) raw = options.get("raw", flags.get("RAW", False))
nomarkup = options.get("nomarkup", False) nomarkup = options.get("nomarkup", flags.get("NOMARKUP", False))
screenreader = options.get("screenreader", flags.get("SCREENREADER", False)) screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
prompt = options.get("send_prompt", False) prompt = options.get("send_prompt", False)

4
evennia/server/portal/webclient_ajax.py
View file

@ -347,8 +347,8 @@ class WebClientSession(session.Session):
text = utils.to_str(text, force_string=True) text = utils.to_str(text, force_string=True)
options = kwargs.pop("options", {}) options = kwargs.pop("options", {})
raw = options.get("raw", False) raw = options.get("raw", flags.get("RAW", False))
nomarkup = options.get("nomarkup", False) nomarkup = options.get("nomarkup", flags.get("NOMARKUP", False))
screenreader = options.get("screenreader", flags.get("SCREENREADER", False)) screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
prompt = options.get("send_prompt", False) prompt = options.get("send_prompt", False)

4
evennia/server/session.py
View file

@ -82,7 +82,9 @@ class Session(object):
self.protocol_flags = {"ENCODING": "utf-8", self.protocol_flags = {"ENCODING": "utf-8",
"SCREENREADER":False, "SCREENREADER":False,
"INPUTDEBUG": False} "INPUTDEBUG": False,
"RAW": False,
"NOMARKUP": False}
self.server_data = {} self.server_data = {}
# map of input data to session methods # map of input data to session methods