From deffc957948dd86306a6845c24db42fca7d71288 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 16 Jul 2010 03:43:11 +0000 Subject: New Wiimote Plugin: Moved Linux cursor position code into ControllerInterface/Xlib. (absolute cursor position can be mapped to something other than IR camera) (code fixed by Glennrics) Put the UDP Wiimote dialog's Update Buttons,Update IR,Update Nunchuk... checkboxes in an "Update" group box. Fixed some Linux config dialog problems. (thanks Glennrics again) Some other minor cleanup in ControllerInterface. (changed some std::string/stringstream to char[] where possible) Removed a warning in DX11 plugin. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5880 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp') diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 598936d121..33101c2507 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -262,20 +262,22 @@ std::string KeyboardMouse::Key::GetName() const std::string KeyboardMouse::Button::GetName() const { - return std::string("Button ") + char('0'+m_index); + return std::string("Button ") + char('0' + m_index); } std::string KeyboardMouse::Axis::GetName() const { - std::string tmpstr("Axis "); - tmpstr += "XYZ"[m_index]; tmpstr += (m_range>0 ? '+' : '-'); + static char tmpstr[] = "Axis .."; + tmpstr[5] = (char)('X' + m_index); + tmpstr[6] = (m_range<0 ? '-' : '+'); return tmpstr; } std::string KeyboardMouse::Cursor::GetName() const { - std::string tmpstr("Cursor "); - tmpstr += "XY"[m_index]; tmpstr += (m_positive ? '+' : '-'); + static char tmpstr[] = "Cursor .."; + tmpstr[7] = (char)('X' + m_index); + tmpstr[8] = (m_positive ? '+' : '-'); return tmpstr; } -- cgit v1.2.3