Changeset 5474 in orxonox.OLD for trunk/src/lib/event/key_mapper.cc

Timestamp:

Nov 3, 2005, 2:13:48 PM (18 years ago)

Author:

patrick

Message:

orxonox/lib/event: fixed the mouse button bug

File:

• trunk/src/lib/event/key_mapper.cc (modified) (4 diffs)

trunk/src/lib/event/key_mapper.cc

@@ -133 +133 @@
   {
     PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+    // map the name to an sdl index
     index = nameToIndex (iniParser->getCurrentValue());
-    this->mapKeys(iniParser->getCurrentName(), index[1]);
+    // map the index to a internal name
+    this->mapKeys(iniParser->getCurrentName(), index);
     iniParser->nextVar();
   }
@@ -151 +153 @@
     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
     index = nameToIndex (iniParser->getCurrentValue());
-    this->mapKeys(iniParser->getCurrentName(), index[1]);
+    this->mapKeys(iniParser->getCurrentName(), index);
     iniParser->nextVar();
   }
@@ -165 +167 @@
   coord[1] = -1;
   int c;
-  if( (c = keynameToSDLK (name)) != -1)
-    {
+  if( (c = keynameToSDLK (name)) != -1) {
       coord[1] = c;
       coord[0] = 0;
     }
-  if( (c = buttonnameToSDLB (name)) != -1)
-    {
+  if( (c = buttonnameToSDLB (name)) != -1) {
       coord[1] = c;
       coord[0] = 1;
@@ -184 +184 @@
  * @param id of the key
 */
-void KeyMapper::mapKeys(const char* name, int keyID)
-{
-  for(int i = 0; map[i].pValue != NULL; ++i )
+void KeyMapper::mapKeys(const char* name, int* index)
+{
+  for( int i = 0; map[i].pValue != NULL; ++i )
     {
       if( !strcmp (name, map[i].pName))
       {
-        *map[i].pValue = keyID;
-        PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(keyID), keyID);
-        break;
+        if( index[0] == 0)
+        {
+          *map[i].pValue = index[1];
+          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(index[1]), index[1]);
+          break;
+        }
+        else { 
+          *map[i].pValue = index[1];
+          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLBToButtonname(index[1]), index[1]);
+          break;
+        }
       }
     }