[Scummvm-git-logs] scummvm master -> 88761ea49ce5244dc33a0784bbfba702f82d3241
digitall
547637+digitall at users.noreply.github.com
Sat Nov 30 20:50:33 UTC 2019
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
54e6cf4cda GPH/OPENPANDORA: Remove global variable BUTTON_STATE_L
00fecbb6e6 GPH/OPENPANDORA: Move ToggleTapMode() into the event manager
1af8584666 GPH/OPENPANDORA: Remove unnecessary stat() calls
88761ea49c GPH/OPENPANDORA: Replace use of strcat()/strcpy() with Common::String()
Commit: 54e6cf4cda16cfbb4ea5e3b728188fb837468279
https://github.com/scummvm/scummvm/commit/54e6cf4cda16cfbb4ea5e3b728188fb837468279
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-11-30T20:50:27Z
Commit Message:
GPH/OPENPANDORA: Remove global variable BUTTON_STATE_L
Changed paths:
backends/events/gph/gph-events.cpp
backends/events/openpandora/op-events.cpp
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index a720ded..18a4c6c 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -41,9 +41,6 @@
#define JOY_XAXIS 0
#define JOY_YAXIS 1
-/* Quick default button states for modifiers. */
-int BUTTON_STATE_L = false;
-
#if defined(CAANOO)
/* Caanoo: Main Joystick Button Mappings */
@@ -165,7 +162,7 @@ GPHEventSource::GPHEventSource()
bool GPHEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
- if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+ if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONDOWN;
else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONDOWN;
@@ -200,7 +197,7 @@ bool GPHEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event)
bool GPHEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
- if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+ if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONUP;
else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONUP;
@@ -348,11 +345,11 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
break;
case BUTTON_L:
- BUTTON_STATE_L = true;
+ _buttonStateL = true;
break;
case BUTTON_R:
event.type = Common::EVENT_KEYDOWN;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
#ifdef ENABLE_VKEYBD
event.type = Common::EVENT_VIRTUAL_KEYBOARD;
#else
@@ -367,7 +364,7 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
case BUTTON_SELECT:
case BUTTON_HOME:
event.type = Common::EVENT_KEYDOWN;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
event.type = Common::EVENT_QUIT;
} else {
event.kbd.keycode = Common::KEYCODE_ESCAPE;
@@ -376,7 +373,7 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
break;
case BUTTON_A:
event.type = Common::EVENT_KEYDOWN;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
event.type = Common::EVENT_PREDICTIVE_DIALOG;
} else {
event.kbd.keycode = Common::KEYCODE_PERIOD;
@@ -385,7 +382,7 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
break;
case BUTTON_Y:
event.type = Common::EVENT_KEYDOWN;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
GPH::ToggleTapMode();
if (GPH::tapmodeLevel == TAPMODE_LEFT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click"));
@@ -402,7 +399,7 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
case BUTTON_MENU:
case BUTTON_HELP:
event.type = Common::EVENT_KEYDOWN;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
event.type = Common::EVENT_MAINMENU;
} else {
event.kbd.keycode = Common::KEYCODE_F5;
@@ -472,7 +469,7 @@ bool GPHEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
break;
case BUTTON_L:
- BUTTON_STATE_L = false;
+ _buttonStateL = false;
break;
case BUTTON_SELECT:
case BUTTON_HOME:
@@ -493,7 +490,7 @@ bool GPHEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
case BUTTON_MENU:
case BUTTON_HELP:
event.type = Common::EVENT_KEYUP;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
event.type = Common::EVENT_MAINMENU;
} else {
event.kbd.keycode = Common::KEYCODE_F5;
@@ -502,7 +499,7 @@ bool GPHEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
break;
case BUTTON_R:
event.type = Common::EVENT_KEYUP;
- if (BUTTON_STATE_L == true) {
+ if (_buttonStateL == true) {
#ifdef ENABLE_VKEYBD
event.kbd.keycode = Common::KEYCODE_F7;
event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
diff --git a/backends/events/openpandora/op-events.cpp b/backends/events/openpandora/op-events.cpp
index 80fff20..fd5d2bc 100644
--- a/backends/events/openpandora/op-events.cpp
+++ b/backends/events/openpandora/op-events.cpp
@@ -37,9 +37,6 @@
#include "common/util.h"
#include "common/events.h"
-/* Quick default button states for modifiers. */
-int BUTTON_STATE_L = false;
-
enum {
/* Touchscreen TapMode */
TAPMODE_LEFT = 0,
@@ -56,7 +53,7 @@ OPEventSource::OPEventSource()
bool OPEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
- if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+ if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONDOWN;
else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONDOWN;
@@ -93,7 +90,7 @@ bool OPEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
bool OPEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
- if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+ if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONUP;
else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONUP;
@@ -181,7 +178,7 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
}
break;
case SDLK_RSHIFT:
- BUTTON_STATE_L = true;
+ _buttonStateL = true;
break;
case SDLK_RCTRL:
break;
@@ -209,7 +206,7 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
case SDLK_PAGEUP:
break;
case SDLK_RSHIFT:
- BUTTON_STATE_L = false;
+ _buttonStateL = false;
break;
case SDLK_RCTRL:
break;
Commit: 00fecbb6e638a943c6f45cca84986ba38803ad91
https://github.com/scummvm/scummvm/commit/00fecbb6e638a943c6f45cca84986ba38803ad91
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-11-30T20:50:27Z
Commit Message:
GPH/OPENPANDORA: Move ToggleTapMode() into the event manager
Changed paths:
R backends/platform/openpandora/op-options.cpp
R backends/platform/openpandora/op-options.h
backends/events/gph/gph-events.cpp
backends/events/gph/gph-events.h
backends/events/openpandora/op-events.cpp
backends/events/openpandora/op-events.h
backends/platform/gph/gph-hw.cpp
backends/platform/gph/gph-hw.h
backends/platform/openpandora/module.mk
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 18a4c6c..3762786 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -155,7 +155,20 @@ enum {
};
GPHEventSource::GPHEventSource()
- : _buttonStateL(false) {
+ : _buttonStateL(false),
+ _tapmodeLevel(TAPMODE_LEFT) {
+}
+
+void GPHEventSource::ToggleTapMode() {
+ if (_tapmodeLevel == TAPMODE_LEFT) {
+ _tapmodeLevel = TAPMODE_RIGHT;
+ } else if (_tapmodeLevel == TAPMODE_RIGHT) {
+ _tapmodeLevel = TAPMODE_HOVER;
+ } else if (_tapmodeLevel == TAPMODE_HOVER) {
+ _tapmodeLevel = TAPMODE_LEFT;
+ } else {
+ _tapmodeLevel = TAPMODE_LEFT;
+ }
}
/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */
@@ -164,11 +177,11 @@ bool GPHEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event)
if (ev.button.button == SDL_BUTTON_LEFT) {
if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONDOWN;
- else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONDOWN;
- else if (GPH::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
event.type = Common::EVENT_RBUTTONDOWN;
- else if (GPH::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
event.type = Common::EVENT_MOUSEMOVE;
else
event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */
@@ -199,11 +212,11 @@ bool GPHEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONUP;
- else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONUP;
- else if (GPH::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
event.type = Common::EVENT_RBUTTONUP;
- else if (GPH::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
event.type = Common::EVENT_MOUSEMOVE;
else
event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */
@@ -383,12 +396,12 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
case BUTTON_Y:
event.type = Common::EVENT_KEYDOWN;
if (_buttonStateL == true) {
- GPH::ToggleTapMode();
- if (GPH::tapmodeLevel == TAPMODE_LEFT) {
+ ToggleTapMode();
+ if (_tapmodeLevel == TAPMODE_LEFT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click"));
- } else if (GPH::tapmodeLevel == TAPMODE_RIGHT) {
+ } else if (_tapmodeLevel == TAPMODE_RIGHT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Right Click"));
- } else if (GPH::tapmodeLevel == TAPMODE_HOVER) {
+ } else if (_tapmodeLevel == TAPMODE_HOVER) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (No Click)"));
}
} else {
@@ -426,12 +439,12 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
event.type = Common::EVENT_QUIT;
break;
case BUTTON_HELP2:
- GPH::ToggleTapMode();
- if (GPH::tapmodeLevel == TAPMODE_LEFT) {
+ ToggleTapMode();
+ if (_tapmodeLevel == TAPMODE_LEFT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click"));
- } else if (GPH::tapmodeLevel == TAPMODE_RIGHT) {
+ } else if (_tapmodeLevel == TAPMODE_RIGHT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Right Click"));
- } else if (GPH::tapmodeLevel == TAPMODE_HOVER) {
+ } else if (_tapmodeLevel == TAPMODE_HOVER) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (No Click)"));
}
break;
diff --git a/backends/events/gph/gph-events.h b/backends/events/gph/gph-events.h
index 507aa94..bdcb62d 100644
--- a/backends/events/gph/gph-events.h
+++ b/backends/events/gph/gph-events.h
@@ -39,6 +39,10 @@ protected:
*/
bool _buttonStateL;
+ int _tapmodeLevel;
+
+ void ToggleTapMode();
+
bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
diff --git a/backends/events/openpandora/op-events.cpp b/backends/events/openpandora/op-events.cpp
index fd5d2bc..6302c15 100644
--- a/backends/events/openpandora/op-events.cpp
+++ b/backends/events/openpandora/op-events.cpp
@@ -46,7 +46,22 @@ enum {
};
OPEventSource::OPEventSource()
- : _buttonStateL(false) {
+ : _buttonStateL(false),
+ _tapmodeLevel(TAPMODE_LEFT) {
+}
+
+void OPEventSource::ToggleTapMode() {
+ if (_tapmodeLevel == TAPMODE_LEFT) {
+ _tapmodeLevel = TAPMODE_RIGHT;
+ } else if (_tapmodeLevel == TAPMODE_RIGHT) {
+ _tapmodeLevel = TAPMODE_HOVER;
+ } else if (_tapmodeLevel == TAPMODE_HOVER) {
+ _tapmodeLevel = TAPMODE_HOVER_DPAD;
+ } else if (_tapmodeLevel == TAPMODE_HOVER_DPAD) {
+ _tapmodeLevel = TAPMODE_LEFT;
+ } else {
+ _tapmodeLevel = TAPMODE_LEFT;
+ }
}
/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */
@@ -55,13 +70,13 @@ bool OPEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONDOWN;
- else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONDOWN;
- else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
event.type = Common::EVENT_RBUTTONDOWN;
- else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
event.type = Common::EVENT_MOUSEMOVE;
- else if (OP::tapmodeLevel == TAPMODE_HOVER_DPAD) /* TAPMODE_HOVER_DPAD = Hover (DPad Clicks) Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_HOVER_DPAD) /* TAPMODE_HOVER_DPAD = Hover (DPad Clicks) Tap Mode */
event.type = Common::EVENT_MOUSEMOVE;
else
event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */
@@ -92,13 +107,13 @@ bool OPEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT) {
if (_buttonStateL == true) /* _buttonStateL = Left Trigger Held, force Right Click */
event.type = Common::EVENT_RBUTTONUP;
- else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
event.type = Common::EVENT_LBUTTONUP;
- else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
event.type = Common::EVENT_RBUTTONUP;
- else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
event.type = Common::EVENT_MOUSEMOVE;
- else if (OP::tapmodeLevel == TAPMODE_HOVER_DPAD) /* TAPMODE_HOVER_DPAD = Hover (DPad Clicks) Tap Mode */
+ else if (_tapmodeLevel == TAPMODE_HOVER_DPAD) /* TAPMODE_HOVER_DPAD = Hover (DPad Clicks) Tap Mode */
event.type = Common::EVENT_MOUSEMOVE;
else
event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */
@@ -125,7 +140,7 @@ bool OPEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
- if (OP::tapmodeLevel == TAPMODE_HOVER_DPAD) {
+ if (_tapmodeLevel == TAPMODE_HOVER_DPAD) {
switch (ev.key.keysym.sym) {
case SDLK_LEFT:
event.type = (ev.type == SDL_KEYDOWN) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP;
@@ -166,14 +181,14 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return true;
break;
case SDLK_PAGEUP:
- OP::ToggleTapMode();
- if (OP::tapmodeLevel == TAPMODE_LEFT) {
+ ToggleTapMode();
+ if (_tapmodeLevel == TAPMODE_LEFT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Left Click"));
- } else if (OP::tapmodeLevel == TAPMODE_RIGHT) {
+ } else if (_tapmodeLevel == TAPMODE_RIGHT) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Right Click"));
- } else if (OP::tapmodeLevel == TAPMODE_HOVER) {
+ } else if (_tapmodeLevel == TAPMODE_HOVER) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (No Click)"));
- } else if (OP::tapmodeLevel == TAPMODE_HOVER_DPAD) {
+ } else if (_tapmodeLevel == TAPMODE_HOVER_DPAD) {
g_system->displayMessageOnOSD(_("Touchscreen 'Tap Mode' - Hover (DPad Clicks)"));
}
break;
diff --git a/backends/events/openpandora/op-events.h b/backends/events/openpandora/op-events.h
index e45ac80..aebd376 100644
--- a/backends/events/openpandora/op-events.h
+++ b/backends/events/openpandora/op-events.h
@@ -40,6 +40,9 @@ protected:
*/
bool _buttonStateL;
+ int _tapmodeLevel;
+
+ void ToggleTapMode();
bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
diff --git a/backends/platform/gph/gph-hw.cpp b/backends/platform/gph/gph-hw.cpp
index 7b004f1..74e3cc3 100644
--- a/backends/platform/gph/gph-hw.cpp
+++ b/backends/platform/gph/gph-hw.cpp
@@ -82,28 +82,3 @@ void mixerMoveVolume(int direction) {
}
} /* namespace WIZ_HW */
-
-namespace GPH {
-
-enum {
- /* Touchscreen TapMode */
- TAPMODE_LEFT = 0,
- TAPMODE_RIGHT = 1,
- TAPMODE_HOVER = 2
-};
-
-int tapmodeLevel = TAPMODE_LEFT;
-
-void ToggleTapMode() {
- if (tapmodeLevel == TAPMODE_LEFT) {
- tapmodeLevel = TAPMODE_RIGHT;
- } else if (tapmodeLevel == TAPMODE_RIGHT) {
- tapmodeLevel = TAPMODE_HOVER;
- } else if (tapmodeLevel == TAPMODE_HOVER) {
- tapmodeLevel = TAPMODE_LEFT;
- } else {
- tapmodeLevel = TAPMODE_LEFT;
- }
-}
-
-} /* namespace GPH */
diff --git a/backends/platform/gph/gph-hw.h b/backends/platform/gph/gph-hw.h
index c6d0094..116af2f 100644
--- a/backends/platform/gph/gph-hw.h
+++ b/backends/platform/gph/gph-hw.h
@@ -38,12 +38,4 @@ extern void mixerMoveVolume(int);
} /* namespace WIZ_HW */
-namespace GPH {
-
-extern int tapmodeLevel;
-
-extern void ToggleTapMode();
-
-} /* namespace GPH */
-
#endif //GPH_HW_H
diff --git a/backends/platform/openpandora/module.mk b/backends/platform/openpandora/module.mk
index 5bd568e..0776bc2 100644
--- a/backends/platform/openpandora/module.mk
+++ b/backends/platform/openpandora/module.mk
@@ -1,7 +1,6 @@
MODULE := backends/platform/openpandora
MODULE_OBJS := \
- op-options.o \
op-backend.o \
op-main.o
diff --git a/backends/platform/openpandora/op-options.cpp b/backends/platform/openpandora/op-options.cpp
deleted file mode 100644
index d2e7860..0000000
--- a/backends/platform/openpandora/op-options.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * OpenPandora: Options, custom code and hardware stuff.
- *
- */
-
-#include "backends/platform/openpandora/op-options.h"
-
-namespace OP {
-
-enum {
- /* Touchscreen TapMode */
- TAPMODE_LEFT = 0,
- TAPMODE_RIGHT = 1,
- TAPMODE_HOVER = 2,
- TAPMODE_HOVER_DPAD = 3
-};
-
-int tapmodeLevel = TAPMODE_LEFT;
-
-void ToggleTapMode() {
- if (tapmodeLevel == TAPMODE_LEFT) {
- tapmodeLevel = TAPMODE_RIGHT;
- } else if (tapmodeLevel == TAPMODE_RIGHT) {
- tapmodeLevel = TAPMODE_HOVER;
- } else if (tapmodeLevel == TAPMODE_HOVER) {
- tapmodeLevel = TAPMODE_HOVER_DPAD;
- } else if (tapmodeLevel == TAPMODE_HOVER_DPAD) {
- tapmodeLevel = TAPMODE_LEFT;
- } else {
- tapmodeLevel = TAPMODE_LEFT;
- }
-}
-
-} /* namespace OP */
diff --git a/backends/platform/openpandora/op-options.h b/backends/platform/openpandora/op-options.h
deleted file mode 100644
index 8eae420..0000000
--- a/backends/platform/openpandora/op-options.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * OpenPandora: Options, custom code and hardware stuff.
- *
- */
-
-#ifndef OP_OPTIONS_H
-#define OP_OPTIONS_H
-
-namespace OP {
-
-extern int tapmodeLevel;
-
-extern void ToggleTapMode();
-
-} /* namespace OP */
-
-#endif //OP_OPTIONS_H
Commit: 1af858466684d0e7c4f23389a5433aa8741592fa
https://github.com/scummvm/scummvm/commit/1af858466684d0e7c4f23389a5433aa8741592fa
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-11-30T20:50:27Z
Commit Message:
GPH/OPENPANDORA: Remove unnecessary stat() calls
Since commit 04c57ba, this should no longer be necessary.
Changed paths:
backends/platform/gph/gph-backend.cpp
backends/platform/openpandora/op-backend.cpp
diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp
index 96f4262..3a51801 100644
--- a/backends/platform/gph/gph-backend.cpp
+++ b/backends/platform/gph/gph-backend.cpp
@@ -43,13 +43,8 @@
#include "audio/mixer_intern.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <time.h> // for getTimeAndDate()
/* Dump console info to files. */
#define DUMP_STDOUT
@@ -77,12 +72,6 @@ void OSystem_GPH::initBackend() {
strcpy(savePath, workDirName);
strcat(savePath, "/saves");
printf("Current save directory: %s\n", savePath);
- struct stat sb;
- if (stat(savePath, &sb) == -1)
- if (errno == ENOENT) // Create the dir if it does not exist
- if (mkdir(savePath, 0755) != 0)
- warning("mkdir for '%s' failed!", savePath);
-
_savefileManager = new DefaultSaveFileManager(savePath);
#ifdef DUMP_STDOUT
diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp
index 0d81ef8..1d620ff 100644
--- a/backends/platform/openpandora/op-backend.cpp
+++ b/backends/platform/openpandora/op-backend.cpp
@@ -42,13 +42,8 @@
#include "audio/mixer_intern.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <time.h> // for getTimeAndDate()
/* Dump console info to files. */
#define DUMP_STDOUT
@@ -76,12 +71,6 @@ void OSystem_OP::initBackend() {
strcpy(savePath, workDirName);
strcat(savePath, "/../saves");
printf("Current save directory: %s\n", savePath);
- struct stat sb;
- if (stat(savePath, &sb) == -1)
- if (errno == ENOENT) // Create the dir if it does not exist
- if (mkdir(savePath, 0755) != 0)
- warning("mkdir for '%s' failed!", savePath);
-
_savefileManager = new DefaultSaveFileManager(savePath);
#ifdef DUMP_STDOUT
Commit: 88761ea49ce5244dc33a0784bbfba702f82d3241
https://github.com/scummvm/scummvm/commit/88761ea49ce5244dc33a0784bbfba702f82d3241
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-11-30T20:50:27Z
Commit Message:
GPH/OPENPANDORA: Replace use of strcat()/strcpy() with Common::String()
Changed paths:
backends/platform/gph/gph-backend.cpp
backends/platform/gph/gph.h
backends/platform/openpandora/op-backend.cpp
backends/platform/openpandora/op-sdl.h
diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp
index 3a51801..340b906 100644
--- a/backends/platform/gph/gph-backend.cpp
+++ b/backends/platform/gph/gph-backend.cpp
@@ -43,8 +43,7 @@
#include "audio/mixer_intern.h"
-#include <unistd.h>
-#include <limits.h>
+#include <unistd.h> // for getcwd()
/* Dump console info to files. */
#define DUMP_STDOUT
@@ -54,61 +53,58 @@ OSystem_GPH::OSystem_GPH()
OSystem_POSIX() {
}
+Common::String OSystem_GPH::getCurrentDirectory() {
+ char cwd[MAXPATHLEN+1];
+ return Common::String(getcwd(cwd, MAXPATHLEN));
+}
+
void OSystem_GPH::initBackend() {
assert(!_inited);
/* Setup default save path to be workingdir/saves */
- char savePath[PATH_MAX+1];
- char workDirName[PATH_MAX+1];
-
- if (getcwd(workDirName, PATH_MAX) == NULL) {
+ Common::String workDirName = getCurrentDirectory();
+ if (workDirName.empty()) {
error("Could not obtain current working directory.");
} else {
- printf("Current working directory: %s\n", workDirName);
+ printf("Current working directory: %s\n", workDirName.c_str());
}
- strcpy(savePath, workDirName);
- strcat(savePath, "/saves");
- printf("Current save directory: %s\n", savePath);
+ Common::String savePath = workDirName + "/saves";
+ printf("Current save directory: %s\n", savePath.c_str());
_savefileManager = new DefaultSaveFileManager(savePath);
#ifdef DUMP_STDOUT
// The GPH devices have a serial console on the breakout board
// but most users do not use this so we output all our STDOUT
// and STDERR to files for debug purposes.
- char STDOUT_FILE[PATH_MAX+1];
- char STDERR_FILE[PATH_MAX+1];
-
- strcpy(STDOUT_FILE, workDirName);
- strcpy(STDERR_FILE, workDirName);
- strcat(STDOUT_FILE, "/scummvm.stdout.txt");
- strcat(STDERR_FILE, "/scummvm.stderr.txt");
+ Common::String STDOUT_FILE = workDirName + "/scummvm.stdout.txt";
+ Common::String STDERR_FILE = workDirName + "/scummvm.stderr.txt";
// Flush the output in case anything is queued
fclose(stdout);
fclose(stderr);
// Redirect standard input and standard output
- FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
+ FILE *newfp = freopen(STDOUT_FILE.c_str(), "w", stdout);
if (newfp == NULL) {
#if !defined(stdout)
- stdout = fopen(STDOUT_FILE, "w");
+ stdout = fopen(STDOUT_FILE.c_str(), "w");
#else
- newfp = fopen(STDOUT_FILE, "w");
+ newfp = fopen(STDOUT_FILE.c_str(), "w");
if (newfp) {
*stdout = *newfp;
}
#endif
}
- newfp = freopen(STDERR_FILE, "w", stderr);
+ newfp = freopen(STDERR_FILE.c_str(), "w", stderr);
if (newfp == NULL) {
#if !defined(stderr)
- stderr = fopen(STDERR_FILE, "w");
+ stderr = fopen(STDERR_FILE.c_str(), "w");
#else
- newfp = fopen(STDERR_FILE, "w");
+ newfp = fopen(STDERR_FILE.c_str(), "w");
if (newfp) {
*stderr = *newfp;
}
@@ -175,9 +171,8 @@ void OSystem_GPH::initSDL() {
void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
/* Setup default extra data paths for engine data files and plugins */
- char workDirName[PATH_MAX+1];
-
- if (getcwd(workDirName, PATH_MAX) == NULL) {
+ Common::String workDirName = getCurrentDirectory();
+ if (workDirName.empty()) {
error("Error: Could not obtain current working directory.");
}
@@ -186,21 +181,13 @@ void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
s.add("__GP2XWIZ_WORKDIR__", new Common::FSDirectory(workDirName), priority);
}
- char enginedataPath[PATH_MAX+1];
-
- strcpy(enginedataPath, workDirName);
- strcat(enginedataPath, "/engine-data");
-
+ Common::String enginedataPath = workDirName + "/engine-data";
Common::FSNode engineNode(enginedataPath);
if (engineNode.exists() && engineNode.isDirectory()) {
s.add("__GP2XWIZ_ENGDATA__", new Common::FSDirectory(enginedataPath), priority);
}
- char pluginsPath[PATH_MAX+1];
-
- strcpy(pluginsPath, workDirName);
- strcat(pluginsPath, "/plugins");
-
+ Common::String pluginsPath = workDirName + "/plugins";
Common::FSNode pluginsNode(pluginsPath);
if (pluginsNode.exists() && pluginsNode.isDirectory()) {
s.add("__GP2XWIZ_PLUGINS__", new Common::FSDirectory(pluginsPath), priority);
diff --git a/backends/platform/gph/gph.h b/backends/platform/gph/gph.h
index d7004f1..c82f763 100644
--- a/backends/platform/gph/gph.h
+++ b/backends/platform/gph/gph.h
@@ -31,10 +31,6 @@
#include "backends/events/gph/gph-events.h"
#include "backends/graphics/gph/gph-graphics.h"
-#ifndef PATH_MAX
-#define PATH_MAX 255
-#endif
-
class OSystem_GPH : public OSystem_POSIX {
public:
OSystem_GPH();
@@ -48,6 +44,9 @@ protected:
bool _inited;
bool _initedSDL;
virtual void initSDL();
+
+private:
+ Common::String getCurrentDirectory();
};
#endif
diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp
index 1d620ff..0295643 100644
--- a/backends/platform/openpandora/op-backend.cpp
+++ b/backends/platform/openpandora/op-backend.cpp
@@ -42,8 +42,7 @@
#include "audio/mixer_intern.h"
-#include <unistd.h>
-#include <limits.h>
+#include <unistd.h> // for getcwd()
/* Dump console info to files. */
#define DUMP_STDOUT
@@ -53,60 +52,57 @@ OSystem_OP::OSystem_OP()
OSystem_POSIX() {
}
+Common::String OSystem_OP::getCurrentDirectory() {
+ char cwd[MAXPATHLEN+1];
+ return Common::String(getcwd(cwd, MAXPATHLEN));
+}
+
void OSystem_OP::initBackend() {
assert(!_inited);
/* Setup default save path to be workingdir/saves */
- char savePath[PATH_MAX+1];
- char workDirName[PATH_MAX+1];
-
- if (getcwd(workDirName, PATH_MAX) == NULL) {
+ Common::String workDirName = getCurrentDirectory();
+ if (workDirName.empty()) {
error("Could not obtain current working directory.");
} else {
- printf("Current working directory: %s\n", workDirName);
+ printf("Current working directory: %s\n", workDirName.c_str());
}
- strcpy(savePath, workDirName);
- strcat(savePath, "/../saves");
- printf("Current save directory: %s\n", savePath);
+ Common::String savePath = workDirName + "/../saves");
+ printf("Current save directory: %s\n", savePath.c_str());
_savefileManager = new DefaultSaveFileManager(savePath);
#ifdef DUMP_STDOUT
// The OpenPandora has a serial console on the EXT connection but most users do not use this so we
// output all our STDOUT and STDERR to files for debug purposes.
- char STDOUT_FILE[PATH_MAX+1];
- char STDERR_FILE[PATH_MAX+1];
-
- strcpy(STDOUT_FILE, workDirName);
- strcpy(STDERR_FILE, workDirName);
- strcat(STDOUT_FILE, "/scummvm.stdout.txt");
- strcat(STDERR_FILE, "/scummvm.stderr.txt");
+ Common::String STDOUT_FILE = workDirName + "/scummvm.stdout.txt";
+ Common::String STDERR_FILE = workDirName + "/scummvm.stderr.txt";
// Flush the output in case anything is queued
fclose(stdout);
fclose(stderr);
// Redirect standard input and standard output
- FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
+ FILE *newfp = freopen(STDOUT_FILE.c_str(), "w", stdout);
if (newfp == NULL) {
#if !defined(stdout)
- stdout = fopen(STDOUT_FILE, "w");
+ stdout = fopen(STDOUT_FILE.c_str(), "w");
#else
- newfp = fopen(STDOUT_FILE, "w");
+ newfp = fopen(STDOUT_FILE.c_str(), "w");
if (newfp) {
*stdout = *newfp;
}
#endif
}
- newfp = freopen(STDERR_FILE, "w", stderr);
+ newfp = freopen(STDERR_FILE.c_str(), "w", stderr);
if (newfp == NULL) {
#if !defined(stderr)
- stderr = fopen(STDERR_FILE, "w");
+ stderr = fopen(STDERR_FILE.c_str(), "w");
#else
- newfp = fopen(STDERR_FILE, "w");
+ newfp = fopen(STDERR_FILE.c_str(), "w");
if (newfp) {
*stderr = *newfp;
}
@@ -163,17 +159,13 @@ void OSystem_OP::initSDL() {
void OSystem_OP::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
/* Setup default extra data paths for engine data files and plugins */
- char workDirName[PATH_MAX+1];
-
- if (getcwd(workDirName, PATH_MAX) == NULL) {
+ Common::String workDirName = getCurrentDirectory();
+ if (workDirName.empty()) {
error("Error: Could not obtain current working directory.");
}
- char enginedataPath[PATH_MAX+1];
-
- strcpy(enginedataPath, workDirName);
- strcat(enginedataPath, "/../data");
- printf("Default engine data directory: %s\n", enginedataPath);
+ Common::String enginedataPath = workDirName + "/../data");
+ printf("Default engine data directory: %s\n", enginedataPath.c_str());
Common::FSNode engineNode(enginedataPath);
if (engineNode.exists() && engineNode.isDirectory()) {
diff --git a/backends/platform/openpandora/op-sdl.h b/backends/platform/openpandora/op-sdl.h
index dd239e5..815b96d 100644
--- a/backends/platform/openpandora/op-sdl.h
+++ b/backends/platform/openpandora/op-sdl.h
@@ -31,10 +31,6 @@
#include "backends/events/openpandora/op-events.h"
#include "backends/graphics/openpandora/op-graphics.h"
-#ifndef PATH_MAX
-#define PATH_MAX 255
-#endif
-
class OSystem_OP : public OSystem_POSIX {
public:
OSystem_OP();
@@ -53,6 +49,9 @@ protected:
* with an OpenPandora workaround.
*/
virtual void initSDL();
+
+private:
+ Common::String getCurrentDirectory();
};
#endif
#endif //OP_SDL_H
More information about the Scummvm-git-logs
mailing list