Changeset 5786 in orxonox.OLD

Timestamp:

Nov 26, 2005, 9:56:11 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: key-repeat in the Shell is smoother now

Location:

trunk/src/lib

Files:

• event/Makefile.am (modified) (1 diff)
• event/event.cc (deleted)
• event/event.h (modified) (1 diff)
• event/event_handler.cc (modified) (3 diffs)
• event/event_handler.h (modified) (2 diffs)
• shell/shell.cc (modified) (2 diffs)
• shell/shell_input.cc (modified) (3 diffs)
• shell/shell_input.h (modified) (1 diff)

trunk/src/lib/event/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXevent.a 
 
-libORXevent_a_SOURCES = event.cc \
-                        event_handler.cc \
+libORXevent_a_SOURCES = event_handler.cc \
                         event_listener.cc \
                         key_mapper.cc \

trunk/src/lib/event/event.h

@@ -27 +27 @@
 
 //! An abstract event class
-class Event {
-
- public:
-  Event();
-
-  int      offset;                      //!< offset in the event type array
+struct Event {
   int      type;                        //!< the type field
   bool     bPressed;                    //!< is true, if the button/mouse was pressed, false if released

trunk/src/lib/event/event_handler.cc

@@ -46 +46 @@
   /* now initialize them all to zero */
   this->flush(ES_ALL);
+  this->withUNICODE(false);
 
   this->state = ES_GAME;
   this->keyMapper = NULL;
   this->stateStack = NULL;
+
 }
 
@@ -247 +249 @@
 
 
+void EventHandler::withUNICODE(bool enableUNICODE)
+{
+  SDL_EnableUNICODE(enableUNICODE);
+  this->bUNICODE = enableUNICODE;
+}
+
+
 /**
  *  core function of event handler: receives all events from SDL
@@ -264 +273 @@
           ev.bPressed = true;
           ev.type = event.key.keysym.sym;
+          if (unlikely(this->bUNICODE))
+              ev.x = event.key.keysym.unicode;
           break;
         case SDL_KEYUP:
           ev.bPressed = false;
           ev.type = event.key.keysym.sym;
+          if (unlikely(this->bUNICODE))
+            ev.x = event.key.keysym.unicode;
           break;
         case SDL_MOUSEMOTION:

trunk/src/lib/event/event_handler.h

@@ -41 +41 @@
   inline bool isSubscribed(elState state, int eventType) { return(listeners[state][eventType] == NULL)?false:true; };
 
+
+  void withUNICODE(bool enableUNICODE);
+
   void process();
 
@@ -58 +61 @@
   KeyMapper*                 keyMapper;                       //!< reference to the key mapper.
 
+  bool                       bUNICODE;                        //!< If unicode should be enabled.
 };
 

trunk/src/lib/shell/shell.cc

@@ -129 +129 @@
 
   EventHandler::getInstance()->pushState(ES_SHELL);
+  EventHandler::getInstance()->withUNICODE(true);
+
   this->setRelCoorSoft2D(0, 0, 1, 5);
 
@@ -149 +151 @@
   this->bActive = false;
 
+  EventHandler::getInstance()->withUNICODE(false);
   EventHandler::getInstance()->popState();
 

trunk/src/lib/shell/shell_input.cc

@@ -317 +317 @@
   {
     this->delayed = this->repeatRate;
-    if (this->pressedKey == SDLK_BACKSPACE)
-      this->removeCharacters(1);
-    else if (pressedKey < 127)
-      this->addCharacter(this->pressedKey);
+    switch (this->pressedKey )
+    {
+      case SDLK_BACKSPACE:
+        this->removeCharacters(1);
+        break;
+      case SDLK_UP:
+        this->historyMoveUp();
+        break;
+      case SDLK_DOWN:
+        this->historyMoveDown();
+        break;
+      default:
+      {
+        if (likely(pressedKey < 127))
+          this->addCharacter(this->pressedKey);
+      }
+    }
   }
 }
@@ -336 +349 @@
       this->help();
     else if (event.type == SDLK_F2)
+    {
       ;//this->debug();
+    }
     else if (event.type == SDLK_UP)
+    {
       this->historyMoveUp();
+      this->pressedKey = event.type;
+    }
     else if (event.type == SDLK_DOWN)
+    {
       this->historyMoveDown();
+      this->pressedKey = event.type;
+    }
     else if (event.type == SDLK_TAB)
       this->completion->autoComplete();
@@ -350 +371 @@
     }
     else if (event.type == SDLK_RETURN)
+    {
       this->executeCommand();
+      this->pressedKey = event.type;
+    }
     // any other keyboard key
     else if (likely(event.type < 127))
     {
-      Uint8 *keystate = SDL_GetKeyState(NULL);
-      this->delayed = this->repeatDelay;
-      if (unlikely( keystate[SDLK_LSHIFT] || keystate[SDLK_RSHIFT] ))
-      {
-        this->pressedKey = event.type-32;
-        this->addCharacter(event.type-32);
-      }
-      else
-      {
-        this->pressedKey = event.type;
-        this->addCharacter(event.type);
-      }
-    }
+      this->addCharacter(event.x);
+      this->pressedKey = event.x;
+    }
+    this->delayed = this->repeatDelay;
   }
   else // if(!event.bPressed)
   {
-    if (this->pressedKey == event.type || (this->pressedKey == event.type - 32))
-    {
-      this->pressedKey = SDLK_FIRST;
+    if (this->pressedKey == event.x)
+    {
+      this->pressedKey = 0;
       this->delayed = 0.0;
     }

trunk/src/lib/shell/shell_input.h

@@ -60 +60 @@
    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.
+   Uint16                      pressedKey;             //!< the pressed key that will be repeated.
 
    std::list<char*>            history;                //!< The history of given commands.