Changeset 6885 for code/branches

Timestamp:

May 10, 2010, 4:24:18 PM (15 years ago)

Author:

smerkli

Message:

Strage delete-button bug persists.

Location:

code/branches/chat2/src/orxonox

Files:

• ChatInputHandler.cc (modified) (3 diffs)
• ChatInputHandler.h (modified) (3 diffs)

code/branches/chat2/src/orxonox/ChatInputHandler.cc

@@ -117 +117 @@
   { ChatInputHandler::getInstance().activate( false ); }
 
+
+
+
   void ChatInputHandler::activate( bool full )
   {
@@ -142 +145 @@
   }
 
-  void ChatInputHandler::sub_adjust_dispoffset( int maxlen, int cursorpos, int inplen )
+
+  void ChatInputHandler::incomingChat(const std::string& message, 
+    unsigned int senderID)
+  {
+    /* --> a) look up the actual name of the sender */
+    std::string text;
+
+    if (senderID != CLIENTID_UNKNOWN)
+    {
+       std::string name = "unknown";
+       PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
+       if (player)
+         name = player->getName();
+
+         text = name + ": " + message;
+    }
+    else
+      text = message;
+
+    /* e) create item and add to history */
+    CEGUI::ListboxTextItem *toadd = new CEGUI::ListboxTextItem( text );
+    this->lb_history->addItem( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
+    this->lb_history->ensureItemIsVisible( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
+
+    /* f) make sure the history handles it */
+    this->lb_history->handleUpdatedItemData();
+  } 
+
+
+  void ChatInputHandler::sub_adjust_dispoffset( int maxlen, 
+    int cursorpos, 
+    int inplen )
   {
     /* already start offsetting 5 characters before end */
@@ -213 +247 @@
     Host::Chat( msgtosend );
 
-    /* d) stop listening to input  */
+    /* d) stop listening to input - only if this is not fullchat */
     if( !this->fullchat )
       this->deactivate();
 
-    /* e) create item and add to history */
-    CEGUI::ListboxTextItem *toadd = new CEGUI::ListboxTextItem( msgtosend );
-    this->lb_history->addItem( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
-    this->lb_history->ensureItemIsVisible( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
-
-    /* f) make sure the history handles it */
-    this->lb_history->handleUpdatedItemData();
   }
 

code/branches/chat2/src/orxonox/ChatInputHandler.h

@@ -47 +47 @@
 #include "core/input/InputState.h"
 
+#include <network/ChatListener.h>
+#include <PlayerManager.h>
+#include <infos/PlayerInfo.h>
+
 #include "../libraries/network/Host.h"
 #include <util/Singleton.h>
@@ -55 +59 @@
   /* class to handle chat using an InputBuffer */
   class _OrxonoxExport ChatInputHandler : public Singleton<ChatInputHandler>,
-    public OrxonoxClass
+    public ChatListener
   {
     private:
@@ -89 +93 @@
       static void activate_static();
       static void activate_small_static();
+
+      void incomingChat( const std::string& message, 
+        unsigned int senderID );
+
       void activate( bool full );
       void deactivate();