actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use wchar_t. This doesn't actually compile on the mac using the 10.2.8 sdk because wctype.h is missing so no towupper function exists.

Browse Source
This commit is contained in:
Steve Checkoway
2006-06-10 22:36:25 +00:00
parent 2eae8660a8
commit fa56d41c17
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler.cpp
+33 -32
View File
@@ -3,6 +3,7 @@
#include "RageUtil.h" #include "RageUtil.h"
#include "InputHandler.h" #include "InputHandler.h"
#include "RageLog.h" #include "RageLog.h"
#include <wctype.h>
void InputHandler::UpdateTimer() void InputHandler::UpdateTimer()
{ {
@@ -36,21 +37,21 @@ void InputHandler::ButtonPressed( DeviceInput di, bool Down )
wchar_t InputHandler::DeviceButtonToChar( DeviceButton button, bool bUseCurrentKeyModifiers ) wchar_t InputHandler::DeviceButtonToChar( DeviceButton button, bool bUseCurrentKeyModifiers )
{ {
wchar_t c = '\0'; wchar_t c = L'\0';
switch( button ) switch( button )
{ {
default: default:
if( button < 127 ) if( button < 127 )
c = (char) button; c = (wchar_t) button;
else if( button >= KEY_KP_C0 && button <= KEY_KP_C9 ) else if( button >= KEY_KP_C0 && button <= KEY_KP_C9 )
c =(char) (button - KEY_KP_C0) + '0'; c =(wchar_t) (button - KEY_KP_C0) + '0';
break; break;
case KEY_KP_SLASH: c ='/'; break; case KEY_KP_SLASH: c = L'/'; break;
case KEY_KP_ASTERISK: c ='*'; break; case KEY_KP_ASTERISK: c = L'*'; break;
case KEY_KP_HYPHEN: c ='-'; break; case KEY_KP_HYPHEN: c = L'-'; break;
case KEY_KP_PLUS: c ='+'; break; case KEY_KP_PLUS: c = L'+'; break;
case KEY_KP_PERIOD: c ='.'; break; case KEY_KP_PERIOD: c = L'.'; break;
case KEY_KP_EQUAL: c ='='; break; case KEY_KP_EQUAL: c = L'='; break;
} }
// Handle some default US keyboard modifiers for derived InputHandlers that // Handle some default US keyboard modifiers for derived InputHandlers that
@@ -67,31 +68,31 @@ wchar_t InputHandler::DeviceButtonToChar( DeviceButton button, bool bUseCurrentK
if( bHoldingShift && !bHoldingCtrl ) if( bHoldingShift && !bHoldingCtrl )
{ {
c = (char)toupper(c); c = towupper(c);
switch( c ) switch( c )
{ {
case '`': c='~'; break; case '`': c = L'~'; break;
case '1': c='!'; break; case '1': c = L'!'; break;
case '2': c='@'; break; case '2': c = L'@'; break;
case '3': c='#'; break; case '3': c = L'#'; break;
case '4': c='$'; break; case '4': c = L'$'; break;
case '5': c='%'; break; case '5': c = L'%'; break;
case '6': c='^'; break; case '6': c = L'^'; break;
case '7': c='&'; break; case '7': c = L'&'; break;
case '8': c='*'; break; case '8': c = L'*'; break;
case '9': c='('; break; case '9': c = L'('; break;
case '0': c=')'; break; case '0': c = L')'; break;
case '-': c='_'; break; case '-': c = L'_'; break;
case '=': c='+'; break; case '=': c = L'+'; break;
case '[': c='{'; break; case '[': c = L'{'; break;
case ']': c='}'; break; case ']': c = L'}'; break;
case '\'': c='"'; break; case '\'': c = L'"'; break;
case '\\': c='|'; break; case '\\': c = L'|'; break;
case ';': c=':'; break; case ';': c = L':'; break;
case ',': c='<'; break; case ',': c = L'<'; break;
case '.': c='>'; break; case '.': c = L'>'; break;
case '/': c='?'; break; case '/': c = L'?'; break;
} }
} }
@@ -107,7 +108,7 @@ RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di )
wchar_t c = DeviceButtonToChar( di.button, false ); wchar_t c = DeviceButtonToChar( di.button, false );
if( c ) if( c )
{ {
if( c == ' ' ) if( c == L' ' )
return "space"; // Don't show "Key " for space. return "space"; // Don't show "Key " for space.
else else
return "Key " + WStringToRString(wstring()+c); return "Key " + WStringToRString(wstring()+c);