Changeset 7858 in orxonox.OLD for trunk/src

Timestamp:

May 25, 2006, 3:59:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed auto-repeat

Location:

trunk/src/lib

Files:

• gui/qt_gui/gui_audio.cc (modified) (3 diffs)
• shell/shell_input.cc (modified) (2 diffs)
• shell/shell_input.h (modified) (1 diff)

trunk/src/lib/gui/qt_gui/gui_audio.cc

@@ -40 +40 @@
   */
   GuiAudio::GuiAudio(OrxGui::Gui* gui)
-  : Element(CONFIG_SECTION_AUDIO, gui), QGroupBox()
+      : Element(CONFIG_SECTION_AUDIO, gui), QGroupBox()
   {
     QGridLayout* layout = new QGridLayout(this);
@@ -54 +54 @@
       layout->addWidget(soundCard, 1, 1, 1, 2);
       soundCard->addItem("Not supportet yet");
-
 
 
@@ -74 +73 @@
       connect(musicVolume, SIGNAL(valueChanged(int)), musicNumber, SLOT(display(int)));
       layout->addWidget(musicNumber, 2, 1);
-
 
 

trunk/src/lib/shell/shell_input.cc

@@ -334 +334 @@
         this->addCharacter(event.x);
         this->pressedKey = event.x;
+        this->pressedEvent = event.type;
       }
       this->delayed = this->repeatDelay;
@@ -339 +340 @@
     else // if(!event.bPressed)
     {
-      if (this->pressedKey == event.x || this->pressedKey == event.type)
-      {
+      if (this->pressedEvent == event.type)
+      {
+        this->pressedEvent = 0;
         this->pressedKey = 0;
         this->delayed = 0.0;

trunk/src/lib/shell/shell_input.h

@@ -68 +68 @@
     float                             delayed;          //!< how much of the delay is remaining.
     Uint16                            pressedKey;       //!< the pressed key that will be repeated.
+    Uint16                            pressedEvent;     //!< The Event, that lead to the pressing of the Key.
 
     static std::list<std::string>     history;          //!< The history of given commands.