X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fmisc.py;h=ba29a907ea0996a7ea8ff217122b89bee5eb0467;hp=ec331a4b8dffdf7467de2e2b16bbc0da88417591;hb=29041014a531835bf9b6a80ca9d7ed414a929432;hpb=eecae7d240916774df48fc6fcf340fed86e3bb74

diff --git a/mudpy/misc.py b/mudpy/misc.py
index ec331a4..ba29a90 100644
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -1,6 +1,6 @@
 """Miscellaneous functions for the mudpy engine."""
 
-# Copyright (c) 2004-2019 mudpy authors. Permission to use, copy,
+# Copyright (c) 2004-2020 mudpy authors. Permission to use, copy,
 # modify, and distribute this software is granted under terms
 # provided in the LICENSE file distributed with this software.
 
@@ -501,8 +501,10 @@ class User:
         self.output_queue = []
         self.partial_input = b""
         self.password_tries = 0
+        self.rows = 23
         self.state = "telopt_negotiation"
         self.telopts = {}
+        self.ttype = None
         self.universe = universe
 
     def quit(self):
@@ -805,6 +807,13 @@ class User:
         else:
             self.check_idle()
 
+        # ask the client for their current terminal type (RFC 1091); it's None
+        # if it's not been initialized, the empty string if it has but the
+        # output was indeterminate, "UNKNOWN" if the client specified it has no
+        # terminal types to supply
+        if self.ttype is None:
+            mudpy.telnet.request_ttype(self)
+
         # if output is paused, decrement the counter
         if self.state == "telopt_negotiation":
             if self.negotiation_pause:
@@ -850,7 +859,7 @@ class User:
         # check for some input
         try:
             raw_input = self.connection.recv(1024)
-        except (BlockingIOError, OSError):
+        except OSError:
             raw_input = b""
 
         # we got something
@@ -1075,7 +1084,7 @@ def get_loglines(level, start, stop):
     # don't proceed if there are no lines
     if filtered_count:
 
-        # can't start before the begining or at the end
+        # can't start before the beginning or at the end
         if start > filtered_count:
             start = filtered_count
         if start < 1:
@@ -1128,7 +1137,7 @@ def wrap_ansi_text(text, width):
     # characters, printable or otherwise
     abs_pos = 0
 
-    # the current text position relative to the begining of the line,
+    # the current text position relative to the beginning of the line,
     # ignoring color escape sequences
     rel_pos = 0
 
@@ -1143,7 +1152,7 @@ def wrap_ansi_text(text, width):
     # normalize any potentially composited unicode before we count it
     text = unicodedata.normalize("NFKC", text)
 
-    # iterate over each character from the begining of the text
+    # iterate over each character from the beginning of the text
     for each_character in text:
 
         # the current character is the escape character
@@ -1185,7 +1194,7 @@ def wrap_ansi_text(text, width):
             # characters but the space it replaced was only one
             abs_pos += 1
 
-            # now we're at the begining of a new line, plus the
+            # now we're at the beginning of a new line, plus the
             # number of characters wrapped from the previous line
             rel_pos -= last_rel_whitespace
             last_rel_whitespace = 0
@@ -1918,33 +1927,14 @@ def handler_active(user):
         command = find_command(command_name)
 
         # if it's allowed, do it
-        ran = False
+        result = None
         if actor.can_run(command):
-            # dereference the relative object path for the requested function
-            # TODO(fungi) use call_hook_function() here instead
-            action = mudpy
             action_fname = command.get("action", command.key)
-            for component in action_fname.split("."):
-                try:
-                    action = getattr(action, component)
-                    ran = True
-                except AttributeError:
-                    log('Could not find action function "%s" for command "%s"'
-                        % (action_fname, command_name))
-                    action = None
-                    break
-            if action:
-                try:
-                    action(actor, parameters)
-                except Exception:
-                    log('Command string "%s" from user %s raised an '
-                        'exception...\n%s' % (
-                            input_data, actor.owner.account.get("name"),
-                            traceback.format_exc()))
-                    mudpy.command.error(actor, input_data)
+            if action_fname:
+                result = call_hook_function(action_fname, (actor, parameters))
 
         # if the command was not run, give an error
-        if not ran:
+        if not result:
             mudpy.command.error(actor, input_data)
 
     # if no input, just idle back with a prompt