[Pingus-CVS] rev 2325 - in trunk: . src/input src/input/axes src/input/buttons

[Ingo Ruhnke]

Author: grumbel
Date: 2004-05-09 20:16:15 +0200 (Sun, 09 May 2004)
New Revision: 2325

Removed:
   trunk/src/input/key_helper.cxx
   trunk/src/input/key_helper.hxx
Modified:
   trunk/NEWS
   trunk/src/input/Makefile.am
   trunk/src/input/axes/joystick_axis.cxx
   trunk/src/input/button_factory.cxx
   trunk/src/input/buttons/joystick_button.cxx
Log:
- some joystick fixes

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2004-05-09 17:52:08 UTC (rev 2324)
+++ trunk/NEWS  2004-05-09 18:16:15 UTC (rev 2325)
@@ -6,7 +6,7 @@
 
 0.6.1 (??/Sep/2003)
 ===================
-* scrool wheel support in the editor
+* scroll wheel support in the editor
 * file ending for level files changed from .xml to .plf
 * level preview render code
 * lots of spelling fixes

Modified: trunk/src/input/Makefile.am
===================================================================
--- trunk/src/input/Makefile.am 2004-05-09 17:52:08 UTC (rev 2324)
+++ trunk/src/input/Makefile.am 2004-05-09 18:16:15 UTC (rev 2325)
@@ -32,7 +32,6 @@
        controller.hxx controller.cxx \
        event.hxx \
        event_fwd.hxx \
-       key_helper.hxx key_helper.cxx \
        pointer.hxx \
        pointer_factory.hxx pointer_factory.cxx \
        scroller.hxx \

Modified: trunk/src/input/axes/joystick_axis.cxx
===================================================================
--- trunk/src/input/axes/joystick_axis.cxx      2004-05-09 17:52:08 UTC (rev 
2324)
+++ trunk/src/input/axes/joystick_axis.cxx      2004-05-09 18:16:15 UTC (rev 
2325)
@@ -19,6 +19,7 @@
 
 //#include <ClanLib/Display/input.h>
 #include <ClanLib/Display/input_device.h>
+#include <ClanLib/Display/joystick.h>
 //#include <ClanLib/Display/inputaxis.h>
 #include "joystick_axis.hxx"
 #include "../../pingus_error.hxx"
@@ -30,18 +31,16 @@
 JoystickAxis::JoystickAxis(int id_, int axis_, float angle_) 
   : id(id_), axis(axis_), pos(0), angle(angle_)
 {
-#ifdef CLANLIB_0_6
-  if (static_cast<unsigned int> (id) >= CL_Input::joysticks.size())
+  if (id >= CL_Joystick::get_device_count())
     PingusError::raise("JoystickAxis: Invalid joystick id");
 
-  if (axis > CL_Input::joysticks[id]->get_num_axes())
+  if (axis > CL_Joystick::get_device(id).get_axis_count())
     PingusError::raise("JoystickAxis: Invalid joystick axis id");
 
   if (angle < 0)
     angle = (static_cast<int>(angle) % 360) + 360;
   else if (angle > 360)
     angle = static_cast<int>(angle) % 360;
-#endif
 }
 
 const float&

Modified: trunk/src/input/button_factory.cxx
===================================================================
--- trunk/src/input/button_factory.cxx  2004-05-09 17:52:08 UTC (rev 2324)
+++ trunk/src/input/button_factory.cxx  2004-05-09 18:16:15 UTC (rev 2325)
@@ -18,13 +18,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include <ClanLib/Display/keyboard.h>
+#include <ClanLib/Display/input_device.h>
 #include "../xml_helper.hxx"
 #include "../pingus_error.hxx"
 #include "button_factory.hxx"
 #include "buttons/double_button.hxx"
 #include "buttons/joystick_button.hxx"
 #include "buttons/key_button.hxx"
-#include "key_helper.hxx"
 #include "buttons/mouse_button.hxx"
 #include "buttons/multiple_button.hxx"
 #include "buttons/triple_button.hxx"
@@ -94,7 +95,7 @@
   if (!XMLhelper::get_prop(cur, "key", key))
     PingusError::raise("KeyButton without key parameter");
 
-  return new KeyButton(KeyHelper::string_to_key(key));
+  return new KeyButton(CL_Keyboard::get_device().keyid_to_string(key));
 }
 
 Button* ButtonFactory::mouse_button (xmlNodePtr cur)

Modified: trunk/src/input/buttons/joystick_button.cxx
===================================================================
--- trunk/src/input/buttons/joystick_button.cxx 2004-05-09 17:52:08 UTC (rev 
2324)
+++ trunk/src/input/buttons/joystick_button.cxx 2004-05-09 18:16:15 UTC (rev 
2325)
@@ -45,11 +45,7 @@
 bool
 JoystickButton::is_pressed() const
 {
-#ifdef CLANLIB_0_6
-  return CL_Input::joysticks[id]->get_button(button)->is_pressed();
-#else
-  return false;
-#endif
+  return CL_Joystick::get_device(id).get_keycode(button);
 }
 
 } // namespace Buttons

Deleted: trunk/src/input/key_helper.cxx
===================================================================
--- trunk/src/input/key_helper.cxx      2004-05-09 17:52:08 UTC (rev 2324)
+++ trunk/src/input/key_helper.cxx      2004-05-09 18:16:15 UTC (rev 2325)
@@ -1,254 +0,0 @@
-//  $Id: key_helper.cxx,v 1.5 2003/10/20 19:28:55 grumbel Exp $
-//
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <iostream>
-#include <ClanLib/Display/keys.h>
-#include "key_helper.hxx"
-
-namespace Pingus {
-
-std::string
-Input::KeyHelper::key_to_string (int key)
-{
-#ifdef CLANLIB_0_6
-  switch (key)
-    {
-    case CL_KEY_0: return "0";
-    case CL_KEY_1: return "1";
-    case CL_KEY_2: return "2";
-    case CL_KEY_3: return "3";
-    case CL_KEY_4: return "4";
-    case CL_KEY_5: return "5";
-    case CL_KEY_6: return "6";
-    case CL_KEY_7: return "7";
-    case CL_KEY_8: return "8";
-    case CL_KEY_9: return "9";
-    case CL_KEY_A: return "A";
-    case CL_KEY_ALT: return "ALT";
-    case CL_KEY_ALTGR: return "ALTGR";
-    case CL_KEY_B: return "B";
-    case CL_KEY_BACKSPACE: return "BACKSPACE";
-    case CL_KEY_C: return "C";
-    case CL_KEY_CAPSLOCK: return "CAPSLOCK";
-    case CL_KEY_D: return "D";
-    case CL_KEY_DELETE: return "DELETE";
-    case CL_KEY_DOWN: return "DOWN";
-    case CL_KEY_E: return "E";
-    case CL_KEY_END: return "END";
-    case CL_KEY_ENTER: return "ENTER";
-    case CL_KEY_ESCAPE: return "ESCAPE";
-    case CL_KEY_F: return "F";
-    case CL_KEY_F1: return "F1";
-    case CL_KEY_F10: return "F10";
-    case CL_KEY_F11: return "F11";
-    case CL_KEY_F12: return "F12";
-    case CL_KEY_F2: return "F2";
-    case CL_KEY_F3: return "F3";
-    case CL_KEY_F4: return "F4";
-    case CL_KEY_F5: return "F5";
-    case CL_KEY_F6: return "F6";
-    case CL_KEY_F7: return "F7";
-    case CL_KEY_F8: return "F8";
-    case CL_KEY_F9: return "F9";
-    case CL_KEY_G: return "G";
-    case CL_KEY_H: return "H";
-    case CL_KEY_HOME: return "HOME";
-    case CL_KEY_I: return "I";
-    case CL_KEY_INSERT: return "INSERT";
-    case CL_KEY_J: return "J";
-    case CL_KEY_K: return "K";
-    case CL_KEY_KP_0: return "KP_0";
-    case CL_KEY_KP_1: return "KP_1";
-    case CL_KEY_KP_2: return "KP_2";
-    case CL_KEY_KP_3: return "KP_3";
-    case CL_KEY_KP_4: return "KP_4";
-    case CL_KEY_KP_5: return "KP_5";
-    case CL_KEY_KP_6: return "KP_6";
-    case CL_KEY_KP_7: return "KP_7";
-    case CL_KEY_KP_8: return "KP_8";
-    case CL_KEY_KP_9: return "KP_9";
-    case CL_KEY_KP_DECIMAL: return "KP_DECIMAL";
-    case CL_KEY_KP_DIV: return "KP_DIV";
-    case CL_KEY_KP_ENTER: return "KP_ENTER";
-    case CL_KEY_KP_MINUS: return "KP_MINUS";
-    case CL_KEY_KP_MULT: return "KP_MULT";
-    case CL_KEY_KP_PLUS: return "KP_PLUS";
-    case CL_KEY_L: return "L";
-    case CL_KEY_LCTRL: return "LCTRL";
-    case CL_KEY_LEFT: return "LEFT";
-    case CL_KEY_LSHIFT: return "LSHIFT";
-    case CL_KEY_M: return "M";
-    case CL_KEY_N: return "N";
-    case CL_KEY_NONE_OF_THE_ABOVE: return "NONE_OF_THE_ABOVE";
-    case CL_KEY_NUMLOCK: return "NUMLOCK";
-    case CL_KEY_O: return "O";
-    case CL_KEY_P: return "P";
-    case CL_KEY_PAGEDOWN: return "PAGEDOWN";
-    case CL_KEY_PAGEUP: return "PAGEUP";
-    case CL_KEY_PAUSE: return "PAUSE";
-    case CL_KEY_PRINT: return "PRINT";
-    case CL_KEY_Q: return "Q";
-    case CL_KEY_R: return "R";
-    case CL_KEY_RCTRL: return "RCTRL";
-    case CL_KEY_RIGHT: return "RIGHT";
-    case CL_KEY_RSHIFT: return "RSHIFT";
-    case CL_KEY_S: return "S";
-    case CL_KEY_SCRLOCK: return "SCRLOCK";
-    case CL_KEY_SPACE: return "SPACE";
-    case CL_KEY_T: return "T";
-    case CL_KEY_TAB: return "TAB";
-    case CL_KEY_U: return "U";
-    case CL_KEY_UP: return "UP";
-    case CL_KEY_V: return "V";
-    case CL_KEY_W: return "W";
-    case CL_KEY_X: return "X";
-    case CL_KEY_Y: return "Y";
-    case CL_KEY_Z: return "Z";
-    case CL_MOUSE_LEFTBUTTON: return "CL_MOUSE_LEFTBUTTON";
-    case CL_MOUSE_MIDDLEBUTTON: return "CL_MOUSE_MIDDLEBUTTON";
-    case CL_MOUSE_RIGHTBUTTON: return "CL_MOUSE_RIGHTBUTTON";
-    case CL_MOUSE_THUMBBUTTON: return "CL_MOUSE_THUMBBUTTON";
-    case CL_MOUSE_WHEELBUTTON: return "CL_MOUSE_WHEELBUTTON";
-    case CL_MOUSE_WHEELDOWN: return "CL_MOUSE_WHEELDOWN";
-    case CL_MOUSE_WHEELUP: return "CL_MOUSE_WHEELUP";
-    case CL_NO_KEY: return "CL_NO_KEY";
-    case CL_NUM_KEYS: return "CL_NUM_KEYS";
-    default:
-      return "Unhandled key";
-    }
-#endif
-  return "Unhandled key";
-}
-
-int
-Input::KeyHelper::string_to_key (const std::string& key)
-{
-#ifdef CLANLIB_0_6
-  if (key == "0") { return CL_KEY_0; }
-  else if (key == "1") { return CL_KEY_1; }
-  else if (key == "2") { return CL_KEY_2; }
-  else if (key == "3") { return CL_KEY_3; }
-  else if (key == "4") { return CL_KEY_4; }
-  else if (key == "5") { return CL_KEY_5; }
-  else if (key == "6") { return CL_KEY_6; }
-  else if (key == "7") { return CL_KEY_7; }
-  else if (key == "8") { return CL_KEY_8; }
-  else if (key == "9") { return CL_KEY_9; }
-  else if (key == "A") { return CL_KEY_A; }
-  else if (key == "ALT") { return CL_KEY_ALT; }
-  else if (key == "ALTGR") { return CL_KEY_ALTGR; }
-  else if (key == "B") { return CL_KEY_B; }
-  else if (key == "BACKSPACE") { return CL_KEY_BACKSPACE; }
-  else if (key == "C") { return CL_KEY_C; }
-  else if (key == "CAPSLOCK") { return CL_KEY_CAPSLOCK; }
-  else if (key == "D") { return CL_KEY_D; }
-  else if (key == "DELETE") { return CL_KEY_DELETE; }
-  else if (key == "DOWN") { return CL_KEY_DOWN; }
-  else if (key == "E") { return CL_KEY_E; }
-  else if (key == "END") { return CL_KEY_END; }
-  else if (key == "ENTER") { return CL_KEY_ENTER; }
-  else if (key == "ESCAPE") { return CL_KEY_ESCAPE; }
-  else if (key == "F") { return CL_KEY_F; }
-  else if (key == "F1") { return CL_KEY_F1; }
-  else if (key == "F10") { return CL_KEY_F10; }
-  else if (key == "F11") { return CL_KEY_F11; }
-  else if (key == "F12") { return CL_KEY_F12; }
-  else if (key == "F2") { return CL_KEY_F2; }
-  else if (key == "F3") { return CL_KEY_F3; }
-  else if (key == "F4") { return CL_KEY_F4; }
-  else if (key == "F5") { return CL_KEY_F5; }
-  else if (key == "F6") { return CL_KEY_F6; }
-  else if (key == "F7") { return CL_KEY_F7; }
-  else if (key == "F8") { return CL_KEY_F8; }
-  else if (key == "F9") { return CL_KEY_F9; }
-  else if (key == "G") { return CL_KEY_G; }
-  else if (key == "H") { return CL_KEY_H; }
-  else if (key == "HOME") { return CL_KEY_HOME; }
-  else if (key == "I") { return CL_KEY_I; }
-  else if (key == "INSERT") { return CL_KEY_INSERT; }
-  else if (key == "J") { return CL_KEY_J; }
-  else if (key == "K") { return CL_KEY_K; }
-  else if (key == "KP_0") { return CL_KEY_KP_0; }
-  else if (key == "KP_1") { return CL_KEY_KP_1; }
-  else if (key == "KP_2") { return CL_KEY_KP_2; }
-  else if (key == "KP_3") { return CL_KEY_KP_3; }
-  else if (key == "KP_4") { return CL_KEY_KP_4; }
-  else if (key == "KP_5") { return CL_KEY_KP_5; }
-  else if (key == "KP_6") { return CL_KEY_KP_6; }
-  else if (key == "KP_7") { return CL_KEY_KP_7; }
-  else if (key == "KP_8") { return CL_KEY_KP_8; }
-  else if (key == "KP_9") { return CL_KEY_KP_9; }
-  else if (key == "KP_DECIMAL") { return CL_KEY_KP_DECIMAL; }
-  else if (key == "KP_DIV") { return CL_KEY_KP_DIV; }
-  else if (key == "KP_ENTER") { return CL_KEY_KP_ENTER; }
-  else if (key == "KP_MINUS") { return CL_KEY_KP_MINUS; }
-  else if (key == "KP_MULT") { return CL_KEY_KP_MULT; }
-  else if (key == "KP_PLUS") { return CL_KEY_KP_PLUS; }
-  else if (key == "L") { return CL_KEY_L; }
-  else if (key == "LCTRL") { return CL_KEY_LCTRL; }
-  else if (key == "LEFT") { return CL_KEY_LEFT; }
-  else if (key == "LSHIFT") { return CL_KEY_LSHIFT; }
-  else if (key == "M") { return CL_KEY_M; }
-  else if (key == "N") { return CL_KEY_N; }
-  else if (key == "NONE_OF_THE_ABOVE") { return CL_KEY_NONE_OF_THE_ABOVE; }
-  else if (key == "NUMLOCK") { return CL_KEY_NUMLOCK; }
-  else if (key == "O") { return CL_KEY_O; }
-  else if (key == "P") { return CL_KEY_P; }
-  else if (key == "PAGEDOWN") { return CL_KEY_PAGEDOWN; }
-  else if (key == "PAGEUP") { return CL_KEY_PAGEUP; }
-  else if (key == "PAUSE") { return CL_KEY_PAUSE; }
-  else if (key == "PRINT") { return CL_KEY_PRINT; }
-  else if (key == "Q") { return CL_KEY_Q; }
-  else if (key == "R") { return CL_KEY_R; }
-  else if (key == "RCTRL") { return CL_KEY_RCTRL; }
-  else if (key == "RIGHT") { return CL_KEY_RIGHT; }
-  else if (key == "RSHIFT") { return CL_KEY_RSHIFT; }
-  else if (key == "S") { return CL_KEY_S; }
-  else if (key == "SCRLOCK") { return CL_KEY_SCRLOCK; }
-  else if (key == "SPACE") { return CL_KEY_SPACE; }
-  else if (key == "T") { return CL_KEY_T; }
-  else if (key == "TAB") { return CL_KEY_TAB; }
-  else if (key == "U") { return CL_KEY_U; }
-  else if (key == "UP") { return CL_KEY_UP; }
-  else if (key == "V") { return CL_KEY_V; }
-  else if (key == "W") { return CL_KEY_W; }
-  else if (key == "X") { return CL_KEY_X; }
-  else if (key == "Y") { return CL_KEY_Y; }
-  else if (key == "Z") { return CL_KEY_Z; }
-  else if (key == "CL_MOUSE_LEFTBUTTON") { return CL_MOUSE_LEFTBUTTON; }
-  else if (key == "CL_MOUSE_MIDDLEBUTTON") { return CL_MOUSE_MIDDLEBUTTON; }
-  else if (key == "CL_MOUSE_RIGHTBUTTON") { return CL_MOUSE_RIGHTBUTTON; }
-  else if (key == "CL_MOUSE_THUMBBUTTON") { return CL_MOUSE_THUMBBUTTON; }
-  else if (key == "CL_MOUSE_WHEELBUTTON") { return CL_MOUSE_WHEELBUTTON; }
-  else if (key == "CL_MOUSE_WHEELDOWN") { return CL_MOUSE_WHEELDOWN; }
-  else if (key == "CL_MOUSE_WHEELUP") { return CL_MOUSE_WHEELUP; }
-  else if (key == "CL_NO_KEY") { return CL_NO_KEY; }
-  else if (key == "CL_NUM_KEYS") { return CL_NUM_KEYS; }
-  else
-    {
-      std::cout << "Key Name " << key << "not known" << std::endl;
-      return CL_NO_KEY;
-    }
-#endif
-  return 0;
-}
-
-} // namespace Pingus
-
-/* EOF */

Deleted: trunk/src/input/key_helper.hxx
===================================================================
--- trunk/src/input/key_helper.hxx      2004-05-09 17:52:08 UTC (rev 2324)
+++ trunk/src/input/key_helper.hxx      2004-05-09 18:16:15 UTC (rev 2325)
@@ -1,45 +0,0 @@
-//  $Id: key_helper.hxx,v 1.5 2003/10/20 19:28:55 grumbel Exp $
-//
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_PINGUS_INPUT_CL_KEY_HXX
-#define HEADER_PINGUS_INPUT_CL_KEY_HXX
-
-#include <string>
-
-namespace Pingus {
-namespace Input {
-
-class KeyHelper
-{
-public:
-  static std::string key_to_string (int);
-  static int string_to_key (const std::string&);
-
-private:
-  KeyHelper ();
-  KeyHelper (const KeyHelper&);
-  KeyHelper& operator= (const KeyHelper&);
-};
-
-} // namespace Input
-} // namespace Pingus
-
-#endif
-
-/* EOF */