added X button to mimic the end button

[physics.git] / src / input / inputManager.cpp

diff --git a/src/input/inputManager.cpp b/src/input/inputManager.cpp
index aa21684..21934c4 100644 (file)
--- a/src/input/inputManager.cpp
+++ b/src/input/inputManager.cpp
@@ -1,6 +1,25 @@
+/*
+ *  Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ *  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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "inputManager.h"
 #include "../debug.h"
 
+#include "../config/keys.h"
+
 
 /// ***** Private Variables *****
 
@@ -51,24 +70,48 @@ void input::update()
         case SDL_KEYDOWN:
             keyState[event.key.keysym.sym] = wasP;
             break;
+        case SDL_QUIT:
+            keyState[key::end] = wasR;
+            break;
         }
     }
 }
 
-bool input::isPressed(Uint8 key)
+Vector2 input::mousePosition()
+{
+    int x,y;
+    SDL_GetMouseState(&x, &y);
+
+    return Vector2(x,y);
+}
+
+bool input::mouseLeft()
+{
+    Uint8 state = SDL_GetMouseState(NULL, NULL);
+
+    return state & SDL_BUTTON(1);
+}
+bool input::mouseRight()
+{
+    Uint8 state = SDL_GetMouseState(NULL, NULL);
+
+    return state & SDL_BUTTON(3);
+}
+
+bool input::isPressed(SDLKey key)
 {
     return keyState[key] == isP || keyState[key] == wasP;
 }
-bool input::isReleased(Uint8 key)
+bool input::isReleased(SDLKey key)
 {
     return keyState[key] == isR || keyState[key] == wasR;
 }
 
-bool input::wasPressed(Uint8 key)
+bool input::wasPressed(SDLKey key)
 {
     return keyState[key] == wasP;
 }
-bool input::wasReleased(Uint8 key)
+bool input::wasReleased(SDLKey key)
 {
     return keyState[key] == wasR;
 }