Pull in some additional fixes from Dustin's work on telnet. There is still some more stuff to

go through but this fixes a couple of issues.  I also changed the gender options to other instead of neuter.

Author: sirdude

lib/cmds/player/mxp.c

@@ -0,0 +1,129 @@
+inherit M_COMMAND;
+
+string parse_error;
+
+string *usage(void) {
+   string mode, *lines;
+
+   if (this_player()->query_mxp() == 1) {
+      mode = "on";
+   } else {
+      mode = "off";
+   }
+
+   lines = ({ "Usage: ansi[-h] [on|off]" });
+   lines += ({ "" });
+   lines += ({ "Used to turn on or off mxp support and show the settings." });
+   lines += ({ "" });
+   lines += ({ "Options:" });
+   lines += ({ "\t-h\tHelp, this usage message." });
+   lines += ({ "\ton\tTurn on MXP support." });
+   lines += ({ "\toff\tTurn off MXP support." });
+   lines += ({ "Examples:" });
+   lines += ({ "\tmxp on" });
+
+   lines += get_alsos();
+
+   lines += ({ "" });
+   lines += ({ "You currently have mxp mode: " + mode });
+
+   return lines;
+}
+
+setup_alsos() {
+   add_also("player", "alias");
+   add_also("player", "clear");
+   add_also("player", "describe");
+   add_also("player", "ignore");
+   add_also("player", "passwd");
+   add_also("player", "ansi");
+
+   add_also("admin", "coloradm");
+}
+
+#define GRAMMAR "whitespace=/[ ]+/\n" + \
+                "TAG=/[A-Z_][A-Z0-9_]*/ \n" + \
+                "TAG=/NIL/\n" + \
+                "args: tags ? collect_map\n" + \
+                "assign: tag '=' values ? wrap_assign\n" + \
+                "tags: assign\n" + \
+                "tags: tags assign\n" + \
+                "tags: tags ',' assign\n" + \
+                "tags: tags 'and' assign\n" + \
+                "tag: TAG ? valid_tag_name\n" + \
+                "values: value_list\n" + \
+                "value_list: value\n" + \
+                "value_list: value_list '+' value\n" + \
+                "value: TAG ? valid_value\n"
+
+/*
+ * If the arg[0] is a base symbol, it can't be used
+ * as a custom tag.
+ */
+mixed *valid_tag_name(mixed * arg) {
+   if (ANSI_D->query_custom_symbol(arg[0])) {
+      return arg;
+   } else {
+      parse_error = "Invalid tag: " + arg[0];
+      return nil;
+   }
+}
+
+mixed *valid_value(mixed * arg) {
+   if ((arg[0] == "NIL") || ANSI_D->query_any_symbol(arg[0])) {
+      return arg;
+   } else {
+      parse_error = "Invalid value: " + arg[0];
+      return nil;
+   }
+}
+
+mixed *wrap_assign(mixed * arg) {
+   return ( { ([arg[0]:(arg[2..] - ( { "+" } ))]) } );
+}
+
+mixed *collect_map(mixed * arg) {
+   int i, sz;
+   mapping result;
+
+   result = ([]);
+
+   for (i = 0, sz = sizeof(arg); i < sz; i++) {
+      if (mappingp(arg[i])) {
+         result += arg[i];
+      }
+   }
+   return ( { result } );
+}
+
+static void main(string str) {
+   mixed *args;
+   string error;
+   int i, pos;
+
+   if (!alsos) {
+      setup_alsos();
+   }
+
+   if (empty_str(str)) {
+      this_player()->more(usage());
+      return;
+   }
+
+   if (sscanf(str, "-%s", str)) {
+      this_player()->more(usage());
+      return;
+   }
+
+   if ((str == "on") || (str == "On") || (str == "1")) {
+      this_player()->set_mxp(1);
+      out("%^MXP_LSM%^<!-- Elements to support the Automapper --><!ELEMENT RName FLAG=\"RoomName\"><!ELEMENT RDesc FLAG=\'RoomDesc\'><!ELEMENT RExits  FLAG=\'RoomExit\'><!-- The next element is used to define a room exit link that sends the exit direction to the MUD if the user clicks on it --><!ELEMENT Ex \'<SEND>\'><!ELEMENT Announce \'<FONT COLOR=Cyan>\' OPEN><!ELEMENT Gossip \'<FONT COLOR=Green>\' OPEN><!-- the next elements deal with the MUD prompt --><!ELEMENT Prompt FLAG=\"Prompt\"><!ELEMENT Hp FLAG=\"Set hp\"><!ELEMENT MaxHp FLAG=\"Set maxhp\"><!ELEMENT Mana FLAG=\"Set mana\"><!ELEMENT MaxMana FLAG=\"Set maxmana\"><!ELEMENT End FLAG=\"Set end\"><!ELEMENT MaxEnd FLAG=\"Set maxend\"><!ELEMENT RoomX FLAG=\"Set room_x\"><!ELEMENT RoomY FLAG=\"Set room_y\"><!ELEMENT RoomZ FLAG=\"Set room_Z\"><!EL Itm \'<send \"look &text;|drop &text;|wear &text;|wield &text;|drink &text;|unwield &text;|remove &text;\">\'><!EL Click \'<send \"&text;\">\'><!EL ClickP \'<send \"&text;\" PROMPT>\'>%^MXP_LLM%^Turning on MXP...\n");
+
+      return;
+   } else if ((str == "off") || (str == "Off") || (str == "0")) {
+      this_player()->set_mxp(0);
+      out("Turning off MXP.\n");
+      return;
+   }
+}
+

lib/std/include/telnet.h

@@ -11,3 +11,4 @@
 #define TELOPT_LINEMODE         "\x22"
 #define  LM_MODE                "\x01"
 #define  MODE_EDIT              "\x01"
+#define TELOPT_MXP              "\x5b"

lib/sys/cmds/wiz/gender.c

@@ -3,7 +3,7 @@ inherit M_COMMAND;
 string *usage(void) {
    string *lines;
 
-   lines = ({ "Usage: gender [-h] [male|female|neuter]" });
+   lines = ({ "Usage: gender [-h] [male|female|other]" });
    lines += ({ " " });
    lines += ({ "Allows you to set your gender.  If no argument is given " });
    lines += ({ "display your current gender." });
@@ -45,11 +45,11 @@ static void main(string str) {
       this_player()->set_gender("male");
       write("You are now male.\n");
       this_player()->save_me();
-   } else if (lowercase(str) == "neuter") {
-      this_player()->set_gender("neuter");
-      write("You are now neuter.\n");
+   } else if ((lowercase(str) == "other") || (lowercase(str) == "neuter")) {
+      this_player()->set_gender("other");
+      write("You are now other.\n");
       this_player()->save_me();
    } else {
-      write("Please use \"male\", \"female\" or \"neuter\" as an argument.\n");
+      write("Please use \"male\", \"female\" or \"other\" as an argument.\n");
    }
 }

lib/sys/obj/player.c

@@ -58,6 +58,7 @@ int verbose_errors;     /* 1 for longer error codes */
 int display_caught;     /* 1 to show caught runtime errors */
 static mixed menu_data;		/* temp storage for menu system */
 int muzzle;			/* if 0 we are allowed to shout. */
+int mxp;
 
 string query_name(void);
 
@@ -156,6 +157,14 @@ void set_ansi(int state) {
    save_me();
 }
 
+int query_mxp(void) {
+   return mxp | user->mxp_support();
+}
+
+void set_mxp(int state) {
+   mxp = state;
+}
+
 void create(void) {
    con::create();
    bod::create();
@@ -218,6 +227,7 @@ void login_player(void) {
    string race;
 
    restore_privs();
+   set_mxp(0);
 
    /* If we're a wiz, show the wizlog since last login */
    if (query_user_type(living_name) > 0) {
@@ -655,15 +665,27 @@ void write_prompt(void) {
       result = replace_string(result, "%a", "(none)");
       }
 
-   result = replace_string(result, "%h", "" + this_player()->query_hp());
-   result = replace_string(result, "%H", "" + this_player()->query_max_hp());
-   result = replace_string(result, "%b", "" + this_player()->query_mana());
-   result = replace_string(result, "%B", "" + 
-      this_player()->query_max_mana());
-   result = replace_string(result, "%e", "" + this_player()->query_end());
-   result = replace_string(result, "%E", "" + 
-      this_player()->query_max_end());
-   out(result + "%^RESET%^ ");
+   if (query_mxp() == 1) {
+      result = replace_string(result, "%h", "<Hp>" + this_player()->query_hp() + "</Hp>");
+      result = replace_string(result, "%H", "<MaxHp>" + this_player()->query_max_hp() + "</MaxHp>");
+      result = replace_string(result, "%b", "<Mana>" + this_player()->query_mana()+ "</Mana>");
+      result = replace_string(result, "%B", "<MaxMana>" + 
+         this_player()->query_max_mana() + "</MaxMana>");
+      result = replace_string(result, "%e", "<End>" + this_player()->query_end()) + "</End>";
+      result = replace_string(result, "%E", "<MaxEnd>" + 
+         this_player()->query_max_end() + "</MaxEnd>");
+      out("%^MXP_LSM%^<Prompt>" + result + "</Prompt>%^MXP_LLM%^%^RESET%^");
+   } else {
+      result = replace_string(result, "%h", "" + this_player()->query_hp());
+      result = replace_string(result, "%H", "" + this_player()->query_max_hp());
+      result = replace_string(result, "%b", "" + this_player()->query_mana());
+      result = replace_string(result, "%B", "" + 
+         this_player()->query_max_mana());
+      result = replace_string(result, "%e", "" + this_player()->query_end());
+      result = replace_string(result, "%E", "" + 
+         this_player()->query_max_end());
+      out(result + "%^RESET%^ ");
+   }
 }
 
 /* More a set of lines */
@@ -772,9 +794,10 @@ void more_prompt(string arg) {
 }
 
 static void do_look_obj(object obj) {
-   int i, flag;
+   int i, flag, mxp;
    object *objs;
 
+   mxp = query_mxp();
    this_environment()->event("body_look_at", this_player(), obj);
    this_environment()->tell_room(this_player(), this_player()->query_Name() +
       " looks at the " + obj->query_id() + ".\n");
@@ -787,10 +810,22 @@ static void do_look_obj(object obj) {
    } else if (obj->is_container()) {
       flag = 0;
       objs = obj->query_inventory();
+      if (mxp == 1) {
+         out("%^MXP_LSM%^");
+      }
       write(" \nIt contains:\n");
 
       for (i = 0; i < sizeof(objs); i++) {
-         write("  " + objs[i]->query_short() + "\n");
+         if (mxp == 1) {
+            write("  <send \"get " + objs[i]->query_id() + " from " + obj->query_id() + "\">" +
+               objs[i]->query_short() + "</send>\n");
+         } else {
+            write("  " + objs[i]->query_short() + "\n");
+         }
+      }
+
+      if (mxp == 1) {
+        out("%^MXP_LLM%^");
       }
    }
 }

lib/sys/obj/user.c

@@ -2,6 +2,7 @@
 #include <limits.h>
 #include <status.h>
 #include <ports.h>
+#include <telnet.h>
 
 inherit "/sys/lib/runas";
 inherit telnet "/sys/lib/telnet";
@@ -15,6 +16,7 @@ static int logged_in;
 static int data_version;
 static int timeout_handle;
 private static int auto_admin, auto_wiz;
+private int mxp;
 object query_player(void);
 
 void create(void) {
@@ -30,6 +32,28 @@ void create(void) {
    run_as("nobody");
 }
 
+static void telnet_do(int option) {
+    if (option == TELOPT_MXP[0]) {
+        telnet::send(IAC + SB + TELOPT_MXP + IAC + SE);
+        mxp = TRUE;
+    } else {
+        ::telnet_do(option);    /* pass on other options to lower layer */
+    }
+}
+
+static void telnet_dont(int option) {
+    if (option == TELOPT_MXP[0]) {
+        telnet::send(IAC + WONT + TELOPT_MXP);
+        mxp = FALSE;
+    } else {
+        ::telnet_dont(option);  /* pass on other options to lower layer */
+    }
+}
+
+int mxp_support(void) {
+    return mxp;
+}
+
 void _open(mixed * tls) {
    if (SITEBAN_D->is_banned(query_ip_number(this_object()))) {
       /* site is banned */
@@ -40,15 +64,17 @@ void _open(mixed * tls) {
       destruct_object(this_object());
    }
    telnet::open();
+   telnet::send(IAC + WILL + TELOPT_MXP);
+   mxp = FALSE;
    send_message("Welcome to " + MUD_NAME + ".\n");
    send_message("Running " + LIB_NAME + " " + LIB_VERSION + " on " +
       status()[ST_VERSION] + ".\n");
-   send_message("\n");
+   send_message("\x1b[7z\n");
    send_message(TELNET_D->query_banner());
    send_message("\nEnter your name (or 'who', 'guest', 'quit'): ");
    send_message(1);
 
-   timeout_handle = call_out("login_timeout", 600);
+   timeout_handle = call_out("login_timeout", 120);
    player = clone_object(PLAYER_OB);
    player->set_user(this_object());
    player->initialize_cmd_path();
@@ -474,7 +500,7 @@ void input_name(string str) {
       user_name = usr;
 
       /* Skip ahead for the guest user, no need for password and other stuff */
-      send_message("Please enter your gender (male/female/neuter) : ");
+      send_message("Please enter your gender (male/female/other) : ");
       player->input_to_object(this_object(), "input_get_gender");
       return;
    } 
@@ -682,13 +708,13 @@ void input_get_email(string str) {
 void input_get_website(string str) {
    player->set_website(str);
 
-   send_message("\nEnter your gender (male/female/neuter) : ");
+   send_message("\nEnter your gender (male/female/other) : ");
    player->input_to_object(this_object(), "input_get_gender");
 }
 
 void input_get_gender(string str) {
    if (!str || str == "") {
-      send_message("Please enter your gender (male/female/neuter) : ");
+      send_message("Please enter your gender (male/female/other) : ");
       player->input_to_object(this_object(), "input_get_gender");
       return;
    }
@@ -698,16 +724,16 @@ void input_get_gender(string str) {
       player->set_gender("male");
    } else if (str == "f" || str == "female") {
       player->set_gender("female");
-   } else if (str == "n" || str == "neuter") {
-      player->set_gender("neuter");
+   } else if (str == "n" || str == "other") {
+      player->set_gender("other");
    } else if (str == "quit") {
       write("Goodbye!!!\n");
       destruct_object(player);
       destruct_object(this_object());
       return;
    } else {
-      send_message("Please use 'male', 'female' or 'neuter'.\n");
-      send_message("Please enter your gender (male/female/neuter) : ");
+      send_message("Please use 'male', 'female' or 'other'.\n");
+      send_message("Please enter your gender (male/female/other) : ");
       player->input_to_object(this_object(), "input_get_gender");
       return;
    }