aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/platform/wince/CEDevice.cpp63
-rw-r--r--backends/platform/wince/CEDevice.h1
-rw-r--r--gui/KeysDialog.cpp60
3 files changed, 21 insertions, 103 deletions
diff --git a/backends/platform/wince/CEDevice.cpp b/backends/platform/wince/CEDevice.cpp
index 5a60c76bfe..fb2ad6f35c 100644
--- a/backends/platform/wince/CEDevice.cpp
+++ b/backends/platform/wince/CEDevice.cpp
@@ -154,66 +154,3 @@ bool CEDevice::isSmartphone() {
return true;
return (_wcsnicmp(platformType, TEXT("SmartPhone"), 10) == 0);
}
-
-Common::String CEDevice::getKeyName(unsigned int keyCode) {
- switch (keyCode) {
- case SDLK_F1:
- return "Softkey A";
- case SDLK_F2:
- return "Softkey B";
- case SDLK_F3:
- return "Talk";
- case SDLK_F4:
- return "End";
- case SDLK_APP1:
- return "Application 1";
- case SDLK_APP2:
- return "Application 2";
- case SDLK_APP3:
- return "Application 3";
- case SDLK_APP4:
- return "Application 4";
- case SDLK_APP5:
- return "Application 5";
- case SDLK_APP6:
- return "Application 6";
- case SDLK_LSUPER:
- return "Home";
- case SDLK_ESCAPE:
- return "Back";
- case SDLK_UP:
- return "Up";
- case SDLK_DOWN:
- return "Down";
- case SDLK_LEFT:
- return "Left";
- case SDLK_RIGHT:
- return "Right";
- case SDLK_RETURN:
- return "Action";
- case SDLK_F10:
- return "Record";
- case SDLK_F6:
- return "Volume Up";
- case SDLK_F7:
- return "Volume Down";
- case SDLK_F17:
- return "Flip";
- case SDLK_F18:
- return "Power";
- case SDLK_F16:
- return "Speaker";
- case SDLK_F8:
- return "Star";
- case SDLK_F9:
- return "Pound";
- case SDLK_F11:
- return "Symbol";
- case SDLK_F19:
- return "Red Key";
- case 0:
- return "None";
- default:
- return SDL_GetKeyName((SDLKey)keyCode);
- }
-}
diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h
index 4dd86f1619..15f3f2223c 100644
--- a/backends/platform/wince/CEDevice.h
+++ b/backends/platform/wince/CEDevice.h
@@ -39,7 +39,6 @@ class CEDevice {
static bool hasWideResolution();
static bool hasSmartphoneResolution();
static bool isSmartphone();
- static Common::String getKeyName(unsigned int keyCode);
private:
static DWORD reg_access(TCHAR *key, TCHAR *val, DWORD data);
diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp
index db70f0dbfb..ae37d9f964 100644
--- a/gui/KeysDialog.cpp
+++ b/gui/KeysDialog.cpp
@@ -32,16 +32,13 @@
namespace GUI {
enum {
- kMapCmd = 'map ',
- kOKCmd = 'ok '
+ kMapCmd = 'map ',
+ kOKCmd = 'ok '
};
KeysDialog::KeysDialog(const Common::String &title)
: GUI::Dialog("keysdialog") {
-//tmp
-// addButton(this, _w - (buttonWidth + 10), _h - buttonHeight - 8, "Choose", kChooseCmd, 0, ws);
-//tmp
new ButtonWidget(this, "keysdialog_map", "Map", kMapCmd, 0);
new ButtonWidget(this, "keysdialog_ok", "OK", kOKCmd, 0);
new ButtonWidget(this, "keysdialog_cancel", "Cancel", kCloseCmd, 0);
@@ -73,23 +70,18 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
case kListSelectionChangedCmd:
if (_actionsList->getSelected() >= 0) {
char selection[100];
-#ifdef __SYMBIAN32__
- uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected());
-
- if (key != 0) {
- // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
- if (key >= 315 && key <= 323) {
- key = key - 315 + SDLK_F1;
- }
- }
+ uint16 key = Actions::Instance()->getMapping(_actionsList->getSelected());
+#ifdef __SYMBIAN32__
+ // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
+ if (key >= 315 && key <= 323)
+ key = key - 315 + SDLK_F1;
+#endif
if (key != 0)
sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));
else
sprintf(selection, "Associated key : none");
-#else
- sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)(_actionsList->getSelected()))).c_str());
-#endif
+
_keyMapping->setLabel(selection);
_keyMapping->draw();
}
@@ -102,21 +94,17 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
char selection[100];
_actionSelected = _actionsList->getSelected();
-#ifdef __SYMBIAN32__
uint16 key = Actions::Instance()->getMapping(_actionSelected);
- if (key != 0) {
- // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
- if (key >= 315 && key <= 323) {
- key = key - 315 + SDLK_F1;
- }
-
+#ifdef __SYMBIAN32__
+ // ScummVM mappings for F1-F9 are different from SDL so remap back to sdl
+ if (key >= 315 && key <= 323)
+ key = key - 315 + SDLK_F1;
+#endif
+ if (key != 0)
sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));
- }
else
sprintf(selection, "Associated key : none");
-#else
- sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)_actionSelected)).c_str());
-#endif
+
_actionTitle->setLabel("Press the key to associate");
_keyMapping->setLabel(selection);
_keyMapping->draw();
@@ -137,29 +125,25 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
}
void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers){
- if (!Actions::Instance()->mappingActive()) {
+ if (!Actions::Instance()->mappingActive())
Dialog::handleKeyDown(ascii,keycode,modifiers);
- }
}
void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
#ifdef __SYMBIAN32__
if (Actions::Instance()->mappingActive()) {
#else
- // GAPI key was selected
- if (modifiers == 0xff && Actions::Instance()->mappingActive()) {
+ if (modifiers == 0xff && Actions::Instance()->mappingActive()) { // GAPI key was selected
#endif
char selection[100];
Actions::Instance()->setMapping((ActionType)_actionSelected, ascii);
-#ifdef __SYMBIAN32__
+
if (ascii != 0)
sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) keycode));
else
sprintf(selection, "Associated key : none");
-#else
- sprintf(selection, "Associated key : %s", CEDevice::getKeyName(Actions::Instance()->getMapping((ActionType)_actionSelected)).c_str());
-#endif
+
_actionTitle->setLabel("Choose an action to map");
_keyMapping->setLabel(selection);
_keyMapping->draw();
@@ -167,10 +151,8 @@ void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
_actionSelected = -1;
_actionsList->setEnabled(true);
Actions::Instance()->beginMapping(false);
- }
- else {
+ } else
Dialog::handleKeyUp(ascii,keycode,modifiers);
- }
}
} // namespace GUI
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 01:47:02 +0000