--- deliantra/Deliantra-Client/bin/pclient	2006/05/15 21:17:17	1.218
+++ deliantra/Deliantra-Client/bin/pclient	2006/05/17 01:03:10	1.221
@@ -1332,7 +1332,7 @@
 
    my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
 
-   $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
+   $text = CFClient::UI::Label::escape $text;
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
 
@@ -1369,18 +1369,88 @@
 sub conn::addme_success {
    my ($self) = @_;
 
+   $MAPWIDGET->clr_commands;
+
    for my $skill (values %{$self->{skill_info}}) {
       $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
       $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
    }
 
-   $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
-   $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
-   $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
-   $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
+   $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
+   $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
+   $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
+   $MAPWIDGET->add_command ("killpets", "Kill your pets");
+   $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
+   $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
+   $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
+
+   # TODO: add documentation on these
+   for (qw(
+      afk
+      apply
+      body
+      bowmode
+      brace
+      build
+      disarm
+      dm
+      dmhide
+      drop
+      dropall
+      examine
+      get
+      gsay
+      help
+      hiscore
+      inventory
+      invoke
+      killpets
+      listen
+      logs
+      mapinfo
+      maps
+      mark
+      motd
+      output-count
+      output-sync
+      party
+      peaceful
+      petmode
+      pickup
+      players
+      prepare
+      quests
+      rename
+      resistances
+      rotateshoottype
+      save
+      say
+      search
+      search-items
+      showpets
+      skills
+      sound
+      take
+      throw
+      time
+      title
+      usekeys
+      version
+      weather
+      whereabouts
+      whereami
+      who
+      wimpy
+   )) {
+      $MAPWIDGET->add_command ($_, "$_: no help available (yet)");
+   }
+
+   #TODO: add " and ' "aliases" etc.
 }
 
 sub conn::eof {
+   $MAPWIDGET->clr_commands;
+
    stop_game;
 }
 
@@ -1572,6 +1642,19 @@
       $FONT_PROP->make_default;
    }
 
+#   compare mono (ft) vs. rgba (cairo)
+#   ft - 1.8s, cairo 3s, even in alpha-only mode
+#   for my $rgba (0..1) {
+#      my $t1 = Time::HiRes::time;
+#      for (1..1000) {
+#         my $layout = CFClient::Layout->new ($rgba);
+#         $layout->set_text ("hallo" x 100);
+#         $layout->render;
+#      }
+#      my $t2 = Time::HiRes::time;
+#      warn $t2-$t1;
+#   }
+
    video_init;
    audio_init;
 }