aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/psp/input.h
diff options
context:
space:
mode:
authorJordi Vilalta Prat2010-10-12 02:18:11 +0000
committerJordi Vilalta Prat2010-10-12 02:18:11 +0000
commit8388e0dfea4ae0d80e51368acd12685c740c5bb5 (patch)
treef960376a145a830cd77b08264c1412f71ec02f7e /backends/platform/psp/input.h
parent43161858ac14bae4ac6dea114d8b3e7a8c1b293b (diff)
downloadscummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.tar.gz
scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.tar.bz2
scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.zip
JANITORAL: Clean trailing whitespaces.
svn-id: r53160
Diffstat (limited to 'backends/platform/psp/input.h')
-rw-r--r--backends/platform/psp/input.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/backends/platform/psp/input.h b/backends/platform/psp/input.h
index 6991c50533..acca04f376 100644
--- a/backends/platform/psp/input.h
+++ b/backends/platform/psp/input.h
@@ -48,11 +48,11 @@ struct PspEvent {
PspEventType type;
uint32 data;
PspEvent() { clear(); }
- void clear() {
+ void clear() {
type = PSP_EVENT_NONE;
data = 0;
}
- bool isEmpty() { return type == PSP_EVENT_NONE; }
+ bool isEmpty() { return type == PSP_EVENT_NONE; }
};
enum PspPadMode {
@@ -75,7 +75,7 @@ private:
uint32 _flag;
PspEvent _pspEventDown; // event when we press
PspEvent _pspEventUp; // event when we release
-public:
+public:
Button();
void clear();
bool getEvent(Common::Event &event, PspEvent &pspEvent, bool buttonDown);
@@ -105,7 +105,7 @@ public:
BTN_LAST
};
-private:
+private:
Button _button[BTN_LAST][SHIFTED_MODE_LAST];
uint32 _buttonsChanged[SHIFTED_MODE_LAST]; // normal and shifted
uint32 _prevButtonState;
@@ -128,7 +128,7 @@ public:
bool isButtonDown() { return _prevButtonState; }
void initButtons();
};
-
+
class Nub {
private:
Cursor *_cursor; // to enable changing/getting cursor position
@@ -137,35 +137,35 @@ private:
ShiftMode _shifted;
bool _dpadMode;
-public:
+public:
Nub() : _shifted(UNSHIFTED), _dpadMode(false) { _buttonPad.initButtons(); }
- void setCursor(Cursor *cursor) { _cursor = cursor; }
+ void setCursor(Cursor *cursor) { _cursor = cursor; }
void setDpadMode(bool active) { _dpadMode = active; }
void setShifted(ShiftMode shifted) { _shifted = shifted; }
bool isButtonDown();
-
+
bool getEvent(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad);
int32 modifyNubAxisMotion(int32 input);
void translateToDpadState(int dpadX, int dpadY, uint32 &buttonState); // convert nub data to dpad data
-};
+};
class InputHandler {
public:
InputHandler() : _keyboard(0), _cursor(0), _padMode(PAD_MODE_NORMAL), _lastPadCheckTime(0) {}
void setKeyboard(PSPKeyboard *keyboard) { _keyboard = keyboard; }
void setCursor(Cursor *cursor) { _cursor = cursor; _nub.setCursor(cursor); }
-
- void init();
+
+ void init();
bool getAllInputs(Common::Event &event);
-
+
private:
PSPKeyboard *_keyboard;
Cursor *_cursor;
-
- Nub _nub;
+
+ Nub _nub;
ButtonPad _buttonPad;
-
+
PspPadMode _padMode; // whice mode we're in
PspEvent _pendingPspEvent; // an event that can't be handled yet
uint32 _lastPadCheckTime;