--- deliantra/server/socket/lowlevel.C	2007/10/01 01:09:10	1.60
+++ deliantra/server/socket/lowlevel.C	2009/02/21 06:25:46	1.70
@@ -1,10 +1,10 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 using namespace std;
@@ -64,7 +64,7 @@
         return;
     }
 
-  if (socket_ev.poll () & PE_W)
+  if (socket_ev.poll () & EV_WRITE)
     return;
 
   last_send = NOW;
@@ -101,7 +101,7 @@
       else if (errno == EAGAIN)
         {
           // delay till ready
-          socket_ev.poll (socket_ev.poll () | PE_W);
+          socket_ev.poll (socket_ev.poll () | EV_WRITE);
           socket_ev.start ();
           return;
         }
@@ -113,7 +113,7 @@
         }
     }
 
-  socket_ev.poll (socket_ev.poll () & ~PE_W);
+  socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
 }
 
 /******************************************************************************
@@ -182,13 +182,10 @@
   {"addme",       SC(AddMeCmd)     0 },
   {"askface",     SC(AskFaceCmd)   0 },
   {"requestinfo", SC(RequestInfo)  0 },
-  {"setfacemode", SC(SetFaceMode)  0 },
   {"setsound",    SC(SetSound)     0 },
   {"setup",       SC(SetUp)        0 },
   {"version",     SC(VersionCmd)   0 },
-  {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
   {"toggleextendedtext",  SC(ToggleExtendedText)  0 },   /*Added: tchize */
-  {"asksmooth",   SC(AskSmooth)    0 },     /*Added: tchize (smoothing technologies) */
 };
 
 bool
@@ -218,10 +215,13 @@
       len  -= 6;
     }
 
-  if (len > 4 && !strncmp (data, "say " , 4))
-    return true;
-  if (len > 5 && !strncmp (data, "chat ", 5))
-    return true;
+  if (len >  4 && data [ 3] == ' ' && !strncmp (data, "say "              ,  4)) return true;
+  if (len >  5 && data [ 4] == ' ' && !strncmp (data, "chat "             ,  5)) return true;
+  if (len >  6 && data [ 5] == ' ' && !strncmp (data, "shout "            ,  6)) return true;
+  if (len >  8 && data [ 7] == ' ' && !strncmp (data, "suicide "          ,  8)) return true;
+  if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
+
+  if (len == 7 && !strcmp (data, "suicide")) return true;
 
   return false;
 }
@@ -294,14 +294,14 @@
   skip_packet (pkt_len);
 
   // input buffer has space again
-  socket_ev.poll (socket_ev.poll () | PE_R);
+  socket_ev.poll (socket_ev.poll () | EV_READ);
 
   return true;
 }
 
 // callback called when socket is either readable or writable
 void
-client::socket_cb (iow &w, int got)
+client::socket_cb (iow &w, int revents)
 {
   //TODO remove when we have better socket cleanup logic
   if (destroyed ())
@@ -310,15 +310,15 @@
       return;
     }
 
-  if (got & PE_W)
+  if (revents & EV_WRITE)
     {
       write_outputbuffer ();
 
       if (!outputbuffer.len)
-        socket_ev.poll (socket_ev.poll () & ~PE_W);
+        socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
     }
 
-  if (got & PE_R)
+  if (revents & EV_READ)
     {
       //TODO: rate-limit tcp connection in better ways, important
 
@@ -327,7 +327,7 @@
       if (!amount)
         {
           // input buffer full
-          socket_ev.poll (socket_ev.poll () & ~PE_R);
+          socket_ev.poll (socket_ev.poll () & ~EV_READ);
           return;
         }
 
@@ -475,13 +475,6 @@
   send_packet (sl);
 }
 
-// returns true when the message needs special (read: perl) treatment
-static bool
-msg_is_special (const char *msg)
-{   
-  return msg [strcspn (msg, "<[&\n")];
-}
-
 void
 client::send_msg (int color, const char *type, const char *msg)
 {
@@ -493,14 +486,12 @@
 
   int len = strlen (msg);
 
-  if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))
+  if (!(color & NDI_VERBATIM)
+      && (msg_is_special (msg)
+          || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
     cfperl_send_msg (this, color, type, msg);
-  else if (can_msg)
-    send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
-  else if (color < 0)
-    return; // client cannot handle this
   else
-    send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
+    send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
 }
 
 void