Changeset 5097 in orxonox.OLD

Timestamp:

Aug 22, 2005, 12:12:02 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: delay now is defined, as it should be, and as all OS's do it

Location:

trunk/src/util

Files:

• shell.cc (modified) (4 diffs)
• shell.h (modified) (2 diffs)

trunk/src/util/shell.cc

@@ -47 +47 @@
   this->setBufferDisplaySize(10);
   this->setAbsCoor2D(3, GraphicsEngine::getInstance()->getResolutionY());
-  this->repeatDelay = .15;
   this->delayed = 0;
+  this->setRepeatDelay(.3, .05);
   this->pressedKey = SDLK_FIRST;
 
@@ -311 +311 @@
   return false;
 }
+
+/**
+ * sets the Repeate-delay and rate
+ * @param repeatDelay the Delay it takes, to repeate a key
+ * @param repeatRate the rate to repeate a pressed key
+ */
+void Shell::setRepeatDelay(float repeatDelay, float repeatRate)
+{
+  this->repeatDelay = repeatDelay;
+  this->repeatRate = repeatRate;
+
+}
+
 
 #include "key_names.h"
@@ -346 +359 @@
     else if (event.type == SDLK_RETURN)
       this->executeCommand();
-    else if (event.type < 127)
+    else if (likely(event.type < 127))
     {
       this->delayed = this->repeatDelay;
@@ -371 +384 @@
   else if (this->pressedKey != SDLK_FIRST )
   {
-    this->delayed = this->repeatDelay;
+    this->delayed = this->repeatRate;
     if (this->pressedKey == SDLK_BACKSPACE)
       this->removeCharacters(1);

trunk/src/util/shell.h

@@ -54 +54 @@
     bool executeCommand();
 
+    void setRepeatDelay(float repeatDelay, float repeatRate);
 
     // EventListener
@@ -77 +78 @@
     Text*                  inputLineText;          //!< The inputLine of the Shell
     char*                  inputLine;              //!< the Char-Array of the Buffer
-    float                  repeatDelay;            //!< The Repeat-Delay.
+    float                  repeatRate;             //!< The Repeat-Delay.
+    float                  repeatDelay;            //!< The delay of the first Character of a given Character.
     float                  delayed;                //!< how much of the delay is remaining.
     int                    pressedKey;             //!< the pressed key that will be repeated.