Changeset 6876

Timestamp:

May 10, 2010, 3:18:14 PM (14 years ago)

Author:

smerkli

Message:

Scrolling chat now works, discovered delete-button bug, fixing it now.

Location:

code/branches/chat2

Files:

• data/gui/layouts/ChatBox-inputonly.layout (modified) (1 diff)
• data/gui/layouts/ChatBox.layout (modified) (2 diffs)
• data/gui/schemes/OrxonoxGUIScheme.scheme (modified) (1 diff)
• src/orxonox/ChatInputHandler.cc (modified) (5 diffs)
• src/orxonox/ChatInputHandler.h (modified) (2 diffs)

code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout

@@ -8 +8 @@
         <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox-inputonly/input" >
             <Property Name="Text" Value="" />
+            <Property Name="Font" Value="Monofur-10" />
             <Property Name="AlwaysOnTop" Value="True" />
-            <Property Name="MaxTextLength" Value="1073741823" />
+            <Property Name="MaxTextLength" Value="12981298" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0,5},{0.98,0},{0,30}}" />

code/branches/chat2/data/gui/layouts/ChatBox.layout

@@ -13 +13 @@
             <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />
             <Window Type="MenuWidgets/Listbox" Name="orxonox/ChatBox/history" >
+                <Property Name="Font" Value="Monofur-10" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.078,0},{0.98,0},{1,-30}}" />
@@ -18 +19 @@
             <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox/input" >
                 <Property Name="Text" Value="" />
+                <Property Name="Font" Value="Monofur-10" />
                 <Property Name="MaxTextLength" Value="1073741823" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

code/branches/chat2/data/gui/schemes/OrxonoxGUIScheme.scheme

@@ -6 +6 @@
     <Font Name="BlueHighway-10" Filename="bluehighway-10.font" />
     <Font Name="BlueHighway-8"  Filename="bluehighway-8.font"  />
+    <Font Name="Monofur-10"     Filename="Monofur-10.font" />
 </GUIScheme>

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

@@ -44 +44 @@
   /* singleton */
   ManageScopedSingleton( ChatInputHandler, ScopeID::Graphics, false );
+
+  /* add commands to console */
   SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
     true );
@@ -49 +51 @@
     "startchat_small", true );
 
-
   /* constructor */
   ChatInputHandler::ChatInputHandler()
@@ -58 +59 @@
     /* create necessary objects */
     this->inpbuf = new InputBuffer();
+    this->disp_offset = 0;
     assert( this->inpbuf != NULL );
 
@@ -133 +135 @@
     InputManager::getInstance().leaveState("chatinput");
 
-    /* MARK add un-spawning of chat widget stuff here. */
+    /* un-spawning of chat widget stuff */
     GUIManager::getInstance().hideGUI( "ChatBox" );
     GUIManager::getInstance().hideGUI( "ChatBox-inputonly" );
   }
 
+  void ChatInputHandler::sub_adjust_dispoffset( int maxlen, int cursorpos, int inplen )
+  {
+    /* already start offsetting 5 characters before end */
+    if( cursorpos+5 > maxlen )
+    { 
+      /* always stay 5 characters ahead of end, looks better */
+      ((disp_offset = cursorpos-maxlen+5) >= 0) ? 1 : disp_offset = 0;
+
+      /* enforce visibility of cursor */
+      (disp_offset > cursorpos ) ? disp_offset = 0 : 1;
+    }
+     
+    /* make sure we don't die at substr */
+    if( inplen <= disp_offset ) disp_offset = 0;
+  }
+
   /* callbacks for InputBuffer */
   void ChatInputHandler::inputChanged()
@@ -143 +161 @@
     /* update the cursor and the window */
     std::string raw = this->inpbuf->get();
+    int cursorpos = this->inpbuf->getCursorPosition();
     
     /* get string before cursor */
-    std::string left = raw.substr( 0, this->inpbuf->getCursorPosition() );
+    std::string left = raw.substr( 0, cursorpos );
 
     /* see if there's a string after the cursor */
     std::string right = "";
     if( raw.length() >= left.length()+1 )
-      right = raw.substr( this->inpbuf->getCursorPosition() );
+      right = raw.substr( cursorpos );
       
     /* set the text */
-    this->input->setProperty( "Text", left + "|" + right );
-    this->inputonly->setProperty( "Text", left + "|" + right );
+    std::string assembled = "$ " + left + "|" + right;
+
+    /* adjust curser position - magic number 5 for font width */
+    sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6), 
+      cursorpos, assembled.length() );
+    this->input->setProperty( "Text", assembled.substr( disp_offset ) );
+
+    /* reset display offset */
+    disp_offset = 0;
+
+    /* adjust curser position - magic number 5 for font width */
+    sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6), 
+      cursorpos, assembled.length() );
+    this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
+
+    /* reset display offset */
+    disp_offset = 0;
   }
 

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

@@ -62 +62 @@
        */
       InputBuffer *inpbuf;
+      int disp_offset, width;
 
       /** input state */
@@ -68 +69 @@
       /** setup input buffer, the constructor calls this */
       void configureInputBuffer();
+
+      /** adjust display offset depending on cursor position */
+      void sub_adjust_dispoffset( int maxlen, int cursorpos, int inplen );
 
       /* singleton pointer */