Changeset 5786 in orxonox.OLD for trunk/src/lib/event

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src/lib/event

Files:

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

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.
 };