feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity
Files
5b4b74de6a930e429b83fc065bf421f1076a6fe0
dolphin/Source/Core/DolphinWX/WXInputBase.cpp

162 lines
5.8 KiB
C++
Raw Normal View History

Lastly - new license header introduced to main Dolphin project. All done now.
2013-04-17 23:43:35 -04:00
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
Make DolphinWX/ mostly IWYU clean.
2014-02-22 23:36:30 +01:00
#include <wx/chartype.h>
#include <wx/defs.h>
#include <wx/string.h>
#include <wx/translation.h>
Convert all includes to relative paths.
2014-02-17 05:18:15 -05:00
#include "DolphinWX/WXInputBase.h"
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
DolphinWX: Make WXInputBase part of the WxUtils namespace. There's no need for the preprocessor checks for wx, since this is used in wx code. Also, this being a part of the InputCommon namespace is kind of wrong.
2014-10-05 05:31:45 -04:00
namespace WxUtils
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
{
Fixed WXKeyToString which had several problems, mostly just to get hotkey configuration working with wx 2.9, but it turned out to be too tempting to use it to hack up OS X keyboard support using wx key events in the "old" input plugins. It was with some reluctance that I used PAD_Input (and copied it for Wiimote as well) as that is clearly a deprecated interface, but this way the hack is contained within the old plugins for when the switchover to ControllerInterface happens. The idea is to provide stable keyboard support on OS X for both GCPad and Wiimote while we debug HID keyboard and real 'mote code. It works pretty well, although the wx approach does impose a few limitations like no arrow keys and left/right side modifier keys are considered equivalent. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5622 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 19:03:37 +00:00
const wxString WXKeyToString(int keycode)
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
{
switch (keycode)
{
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_BACK: return _("Back");
case WXK_TAB: return _("Tab");
case WXK_RETURN: return _("Return");
case WXK_ESCAPE: return _("Escape");
case WXK_SPACE: return _("Space");
case WXK_DELETE: return _("Delete");
Fixed WXKeyToString which had several problems, mostly just to get hotkey configuration working with wx 2.9, but it turned out to be too tempting to use it to hack up OS X keyboard support using wx key events in the "old" input plugins. It was with some reluctance that I used PAD_Input (and copied it for Wiimote as well) as that is clearly a deprecated interface, but this way the hack is contained within the old plugins for when the switchover to ControllerInterface happens. The idea is to provide stable keyboard support on OS X for both GCPad and Wiimote while we debug HID keyboard and real 'mote code. It works pretty well, although the wx approach does impose a few limitations like no arrow keys and left/right side modifier keys are considered equivalent. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5622 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 19:03:37 +00:00
Use 10.5 compatible API's to get list of display resolutions on OS X. Patch from user gamepromcompany on the MacOSX_Build wiki page. Add support for the Mac command key as a hotkey modifier in WXKeyToString but present it as Control. WXKeyToString is used for both hotkeys and menu accelerators, the latter only supporting Shift/Alt/Control with wxWidgets. wxSpinCtrl on wx 2.9 has a very small default size, so give the window size ones a reasonable size. Use wxFULLSCREEN_ALL when switching to fullscreen, which gets rid of window decorations like the title bar. Note that to actually be rid of it with wx 2.9 on OS X, you'll need this patch: http://trac.wxwidgets.org/ticket/11701 Also remove a couple of files I had accidentally duplicated. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5642 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-09 20:03:37 +00:00
// Undocumented wx keycodes
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case 167: return _("Paragraph");
case 177: return _("Plus-Minus");
Use 10.5 compatible API's to get list of display resolutions on OS X. Patch from user gamepromcompany on the MacOSX_Build wiki page. Add support for the Mac command key as a hotkey modifier in WXKeyToString but present it as Control. WXKeyToString is used for both hotkeys and menu accelerators, the latter only supporting Shift/Alt/Control with wxWidgets. wxSpinCtrl on wx 2.9 has a very small default size, so give the window size ones a reasonable size. Use wxFULLSCREEN_ALL when switching to fullscreen, which gets rid of window decorations like the title bar. Note that to actually be rid of it with wx 2.9 on OS X, you'll need this patch: http://trac.wxwidgets.org/ticket/11701 Also remove a couple of files I had accidentally duplicated. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5642 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-09 20:03:37 +00:00
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_START: return _("Start");
case WXK_LBUTTON: return _("L Button");
case WXK_RBUTTON: return _("R Button");
case WXK_CANCEL: return _("Cancel");
case WXK_MBUTTON: return _("M Button");
case WXK_CLEAR: return _("Clear");
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
case WXK_SHIFT: return "Shift";
case WXK_ALT: return "Alt";
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_RAW_CONTROL: return _("Control");
build against wxWidgets3 from Externals on Windows. use Externals version of libpng on Windows.
2012-03-18 02:31:19 -07:00
#ifdef __WXOSX__
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_COMMAND: return _("Command");
build against wxWidgets3 from Externals on Windows. use Externals version of libpng on Windows.
2012-03-18 02:31:19 -07:00
#endif
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_MENU: return _("Menu");
case WXK_PAUSE: return _("Pause");
case WXK_CAPITAL: return _("Caps Lock");
case WXK_END: return _("End");
case WXK_HOME: return _("Home");
case WXK_LEFT: return _("Left");
case WXK_UP: return _("Up");
case WXK_RIGHT: return _("Right");
case WXK_DOWN: return _("Down");
case WXK_SELECT: return _("Select");
case WXK_PRINT: return _("Print");
case WXK_EXECUTE: return _("Execute");
case WXK_SNAPSHOT: return _("Snapshot");
case WXK_INSERT: return _("Insert");
case WXK_HELP: return _("Help");
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
case WXK_NUMPAD0: return "NP 0";
case WXK_NUMPAD1: return "NP 1";
case WXK_NUMPAD2: return "NP 2";
case WXK_NUMPAD3: return "NP 3";
case WXK_NUMPAD4: return "NP 4";
case WXK_NUMPAD5: return "NP 5";
case WXK_NUMPAD6: return "NP 6";
case WXK_NUMPAD7: return "NP 7";
case WXK_NUMPAD8: return "NP 8";
case WXK_NUMPAD9: return "NP 9";
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_MULTIPLY: return _("Multiply");
case WXK_ADD: return _("Add");
case WXK_SEPARATOR: return _("Separator");
case WXK_SUBTRACT: return _("Subtract");
case WXK_DECIMAL: return _("Decimal");
case WXK_DIVIDE: return _("Divide");
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
case WXK_F1: return "F1";
case WXK_F2: return "F2";
case WXK_F3: return "F3";
case WXK_F4: return "F4";
case WXK_F5: return "F5";
case WXK_F6: return "F6";
case WXK_F7: return "F7";
case WXK_F8: return "F8";
case WXK_F9: return "F9";
case WXK_F10: return "F10";
case WXK_F11: return "F11";
case WXK_F12: return "F12";
case WXK_F13: return "F13";
case WXK_F14: return "F14";
case WXK_F15: return "F15";
case WXK_F16: return "F16";
case WXK_F17: return "F17";
case WXK_F18: return "F19";
case WXK_F19: return "F20";
case WXK_F20: return "F21";
case WXK_F21: return "F22";
case WXK_F22: return "F23";
case WXK_F23: return "F24";
case WXK_F24: return "F25";
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_NUMLOCK: return _("Num Lock");
case WXK_SCROLL: return _("Scroll Lock");
case WXK_PAGEUP: return _("Page Up");
case WXK_PAGEDOWN: return _("Page Down");
case WXK_NUMPAD_SPACE: return _("NP Space");
case WXK_NUMPAD_TAB: return _("NP Tab");
case WXK_NUMPAD_ENTER: return _("NP Enter");
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
case WXK_NUMPAD_F1: return "NP F1";
case WXK_NUMPAD_F2: return "NP F2";
case WXK_NUMPAD_F3: return "NP F3";
case WXK_NUMPAD_F4: return "NP F4";
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
case WXK_NUMPAD_HOME: return _("NP Home");
case WXK_NUMPAD_LEFT: return _("NP Left");
case WXK_NUMPAD_UP: return _("NP Up");
case WXK_NUMPAD_RIGHT: return _("NP Right");
case WXK_NUMPAD_DOWN: return _("NP Down");
case WXK_NUMPAD_PAGEUP: return _("NP Page Up");
case WXK_NUMPAD_PAGEDOWN: return _("NP Page Down");
case WXK_NUMPAD_END: return _("NP End");
case WXK_NUMPAD_BEGIN: return _("NP Begin");
case WXK_NUMPAD_INSERT: return _("NP Insert");
case WXK_NUMPAD_DELETE: return _("NP Delete");
case WXK_NUMPAD_EQUAL: return _("NP Equal");
case WXK_NUMPAD_MULTIPLY: return _("NP Multiply");
case WXK_NUMPAD_ADD: return _("NP Add");
case WXK_NUMPAD_SEPARATOR: return _("NP Separator");
case WXK_NUMPAD_SUBTRACT: return _("NP Subtract");
case WXK_NUMPAD_DECIMAL: return _("NP Decimal");
case WXK_NUMPAD_DIVIDE: return _("NP Divide");
case WXK_WINDOWS_LEFT: return _("Windows Left");
case WXK_WINDOWS_RIGHT: return _("Windows Right");
case WXK_WINDOWS_MENU: return _("Windows Menu");
Fixed WXKeyToString which had several problems, mostly just to get hotkey configuration working with wx 2.9, but it turned out to be too tempting to use it to hack up OS X keyboard support using wx key events in the "old" input plugins. It was with some reluctance that I used PAD_Input (and copied it for Wiimote as well) as that is clearly a deprecated interface, but this way the hack is contained within the old plugins for when the switchover to ControllerInterface happens. The idea is to provide stable keyboard support on OS X for both GCPad and Wiimote while we debug HID keyboard and real 'mote code. It works pretty well, although the wx approach does impose a few limitations like no arrow keys and left/right side modifier keys are considered equivalent. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5622 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 19:03:37 +00:00
}
Second and final pass of clearing out tabs.
2014-02-16 23:51:41 -05:00
if (keycode > WXK_SPACE && keycode < WXK_DELETE)
{
Fixed WXKeyToString which had several problems, mostly just to get hotkey configuration working with wx 2.9, but it turned out to be too tempting to use it to hack up OS X keyboard support using wx key events in the "old" input plugins. It was with some reluctance that I used PAD_Input (and copied it for Wiimote as well) as that is clearly a deprecated interface, but this way the hack is contained within the old plugins for when the switchover to ControllerInterface happens. The idea is to provide stable keyboard support on OS X for both GCPad and Wiimote while we debug HID keyboard and real 'mote code. It works pretty well, although the wx approach does impose a few limitations like no arrow keys and left/right side modifier keys are considered equivalent. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5622 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 19:03:37 +00:00
return wxString((wxChar)keycode, 1);
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
}
Fixed WXKeyToString which had several problems, mostly just to get hotkey configuration working with wx 2.9, but it turned out to be too tempting to use it to hack up OS X keyboard support using wx key events in the "old" input plugins. It was with some reluctance that I used PAD_Input (and copied it for Wiimote as well) as that is clearly a deprecated interface, but this way the hack is contained within the old plugins for when the switchover to ControllerInterface happens. The idea is to provide stable keyboard support on OS X for both GCPad and Wiimote while we debug HID keyboard and real 'mote code. It works pretty well, although the wx approach does impose a few limitations like no arrow keys and left/right side modifier keys are considered equivalent. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5622 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 19:03:37 +00:00
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
return "";
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
}
Fixed WXKeyToString which had several problems, mostly just to get hotkey configuration working with wx 2.9, but it turned out to be too tempting to use it to hack up OS X keyboard support using wx key events in the "old" input plugins. It was with some reluctance that I used PAD_Input (and copied it for Wiimote as well) as that is clearly a deprecated interface, but this way the hack is contained within the old plugins for when the switchover to ControllerInterface happens. The idea is to provide stable keyboard support on OS X for both GCPad and Wiimote while we debug HID keyboard and real 'mote code. It works pretty well, although the wx approach does impose a few limitations like no arrow keys and left/right side modifier keys are considered equivalent. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5622 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-05 19:03:37 +00:00
const wxString WXKeymodToString(int modifier)
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
{
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
wxString mods;
if (modifier & wxMOD_META)
#ifdef __APPLE__
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
mods += "Cmd+";
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
#elif defined _WIN32
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
mods += "Win+";
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
#else
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
mods += "Meta+";
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
#endif
if (modifier & wxMOD_CONTROL)
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
mods += "Ctrl+";
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
if (modifier & wxMOD_ALT)
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
mods += "Alt+";
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
if (modifier & wxMOD_SHIFT)
Kill off _T and wxT macros Minor other alterations that relate to above as well. Also added the PanicAlertT version of alerts for some error messages that use PanicAlert. We want the user to actually understand why the error occurred.
2014-05-17 13:17:28 -04:00
mods += "Shift+";
Be more flexible about hotkey modifier permutations. Open .ini files with TextEdit on OS X since wx has no binding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6986 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 14:20:20 +00:00
return mods;
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster. Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
}
}
Copy Permalink