Changeset 8743 in orxonox.OLD for trunk/src/lib

Timestamp:

Jun 23, 2006, 3:17:15 PM (19 years ago)

Author:

bensch

Message:

gui: event-handler now supports retrieving key-states

Location:

trunk/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• event/event_handler.h (modified) (2 diffs)
• gui/gl/glgui_handler.cc (modified) (2 diffs)

trunk/src/lib/event/event_handler.cc

@@ -49 +49 @@
   this->state = ES_GAME;
   this->eventsGrabbed = false;
+
+  this->keyState = SDL_GetKeyState(NULL);
 }
 

trunk/src/lib/event/event_handler.h

@@ -42 +42 @@
   bool isSubscribed(elState state, int eventType);
 
+  /** @param key the key to check @returns true if key is pressed */
+  bool isPressed(SDLKey key) const { return this->keyState[key]; };
 
   void withUNICODE(elState state, bool enableUNICODE);
@@ -76 +78 @@
   bool                         bUNICODE[ES_NUMBER];             //!< If unicode should be enabled.
   bool                         eventsGrabbed;                   //!< If the events should be grabbed
+
+  Uint8*                       keyState;
 };
 

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -238 +238 @@
       case SDLK_TAB:
         if (event.bPressed)
-          this->selectNext();
+        {
+          if (EventHandler::getInstance()->isPressed(SDLK_LSHIFT) || EventHandler::getInstance()->isPressed(SDLK_RSHIFT))
+            this->selectPrevious();
+          else
+            this->selectNext();
+        }
         break;
     }
@@ -277 +282 @@
   void GLGuiHandler::checkFocus()
   {
-   // CHECK THE COLLISIONS.
+    // CHECK THE COLLISIONS.
     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);