Rename some buttons

docs/lua_api.rst

@@ -978,7 +978,7 @@ Keyboard Button Names
 	* ``num_lock``, ``numpad_enter``, ``numpad_.``, ``numpad_*``, ``numpad_+``, ``numpad_-``, ``numpad_/``, ``numpad_0``, ``numpad_1``, ``numpad_2``, ``numpad_3``, ``numpad_4``, ``numpad_5``, ``numpad_6``, ``numpad_7``, ``numpad_8``, ``numpad_9``
 	* ``f1``, ``f2``, ``f3``, ``f4``, ``f5``, ``f6``, ``f7``, ``f8``, ``f9``, ``f10``, ``f11``, ``f12``
 	* ``home``, ``left``, ``up``, ``right``, ``down``, ``page_up``, ``page_down``, ``ins``, ``del``, ``end``
-	* ``left_ctrl``, ``right_ctrl``, ``left_shift``, ``right_shift``, ``caps_lock``, ``left_alt``, ``right_alt``, ``left_super``, ``right_super``
+	* ``ctrl_left``, ``ctrl_right``, ``shift_left``, ``shift_right``, ``caps_lock``, ``alt_left``, ``alt_right``, ``super_left``, ``super_right``
 	* ``0``, ``1``, ``2``, ``3``, ``4``, ``5``, ``6``, ``7``, ``8``, ``9``
 	* ``a``, ``b``, ``c``, ``d``, ``e``, ``f``, ``g``, ``h``, ``i``, ``j``, ``k``, ``l``, ``m``, ``n``, ``o``, ``p``, ``q``, ``r``, ``s``, ``t``, ``u``, ``v``, ``w``, ``x``, ``y``, ``z``
 
@@ -1130,8 +1130,8 @@ Pad Button Names
 
 	* ``up``, ``down``, ``left``, ``right``
 	* ``start``, ``back``, ``guide``
-	* ``left_thumb``, ``right_thumb``
-	* ``left_shoulder``, ``right_shoulder``
+	* ``thumb_left``, ``thumb_right``
+	* ``shoulder_left``, ``shoulder_right``
 	* ``a``, ``b``, ``x``, ``y``
 
 Pad Axis Names

src/device/input_manager.cpp

@@ -55,15 +55,15 @@ static const char* s_keyboard_button_names[] =
 	"ins",          // KeyboardButton::INS
 	"del",          // KeyboardButton::DEL
 	"end",          // KeyboardButton::END
-	"left_ctrl",    // KeyboardButton::LEFT_CTRL
-	"right_ctrl",   // KeyboardButton::RIGHT_CTRL
-	"left_shift",   // KeyboardButton::LEFT_SHIFT
-	"right_shift",  // KeyboardButton::RIGHT_SHIFT
+	"ctrl_left",    // KeyboardButton::CTRL_LEFT
+	"ctrl_right",   // KeyboardButton::CTRL_RIGHT
+	"shift_left",   // KeyboardButton::SHIFT_LEFT
+	"shift_right",  // KeyboardButton::SHIFT_RIGHT
 	"caps_lock",    // KeyboardButton::CAPS_LOCK
-	"left_alt",     // KeyboardButton::LEFT_ALT
-	"right_alt",    // KeyboardButton::RIGHT_ALT
-	"left_super",   // KeyboardButton::LEFT_SUPER
-	"right_super",  // KeyboardButton::RIGHT_SUPER
+	"alt_left",     // KeyboardButton::ALT_LEFT
+	"alt_right",    // KeyboardButton::ALT_RIGHT
+	"super_left",   // KeyboardButton::SUPER_LEFT
+	"super_right",  // KeyboardButton::SUPER_RIGHT
 	"0",            // KeyboardButton::NUMBER_0
 	"1",            // KeyboardButton::NUMBER_1
 	"2",            // KeyboardButton::NUMBER_2
@@ -148,10 +148,10 @@ static const char* s_pad_button_names[] =
 	"start",          // JoypadButton::START
 	"back",           // JoypadButton::BACK
 	"guide",          // JoypadButton::GUIDE
-	"left_thumb",     // JoypadButton::LEFT_THUMB
-	"right_thumb",    // JoypadButton::RIGHT_THUMB
-	"left_shoulder",  // JoypadButton::LEFT_SHOULDER
-	"right_shoulder", // JoypadButton::RIGHT_SHOULDER
+	"thumb_left",     // JoypadButton::THUMB_LEFT
+	"thumb_right",    // JoypadButton::THUMB_RIGHT
+	"shoulder_left",  // JoypadButton::SHOULDER_LEFT
+	"shoulder_right", // JoypadButton::SHOULDER_RIGHT
 	"a",              // JoypadButton::A
 	"b",              // JoypadButton::B
 	"x",              // JoypadButton::X

src/device/input_types.h

@@ -85,15 +85,15 @@ struct KeyboardButton
 		END,
 
 		/* Modifier keys */
-		LEFT_CTRL,
-		RIGHT_CTRL,
-		LEFT_SHIFT,
-		RIGHT_SHIFT,
+		CTRL_LEFT,
+		CTRL_RIGHT,
+		SHIFT_LEFT,
+		SHIFT_RIGHT,
 		CAPS_LOCK,
-		LEFT_ALT,
-		RIGHT_ALT,
-		LEFT_SUPER,
-		RIGHT_SUPER,
+		ALT_LEFT,
+		ALT_RIGHT,
+		SUPER_LEFT,
+		SUPER_RIGHT,
 
 		NUMBER_0,
 		NUMBER_1,
@@ -211,10 +211,10 @@ struct JoypadButton
 		START,
 		BACK,
 		GUIDE,
-		LEFT_THUMB,
-		RIGHT_THUMB,
-		LEFT_SHOULDER,
-		RIGHT_SHOULDER,
+		THUMB_LEFT,
+		THUMB_RIGHT,
+		SHOULDER_LEFT,
+		SHOULDER_RIGHT,
 		A,
 		B,
 		X,

src/device/main_linux.cpp

@@ -58,15 +58,15 @@ static KeyboardButton::Enum x11_translate_key(KeySym x11_key)
 	case XK_Insert:       return KeyboardButton::INS;
 	case XK_Delete:       return KeyboardButton::DEL;
 	case XK_End:          return KeyboardButton::END;
-	case XK_Shift_L:      return KeyboardButton::LEFT_SHIFT;
-	case XK_Shift_R:      return KeyboardButton::RIGHT_SHIFT;
-	case XK_Control_L:    return KeyboardButton::LEFT_CTRL;
-	case XK_Control_R:    return KeyboardButton::RIGHT_CTRL;
+	case XK_Shift_L:      return KeyboardButton::SHIFT_LEFT;
+	case XK_Shift_R:      return KeyboardButton::SHIFT_RIGHT;
+	case XK_Control_L:    return KeyboardButton::CTRL_LEFT;
+	case XK_Control_R:    return KeyboardButton::CTRL_RIGHT;
 	case XK_Caps_Lock:    return KeyboardButton::CAPS_LOCK;
-	case XK_Alt_L:        return KeyboardButton::LEFT_ALT;
-	case XK_Alt_R:        return KeyboardButton::RIGHT_ALT;
-	case XK_Super_L:      return KeyboardButton::LEFT_SUPER;
-	case XK_Super_R:      return KeyboardButton::RIGHT_SUPER;
+	case XK_Alt_L:        return KeyboardButton::ALT_LEFT;
+	case XK_Alt_R:        return KeyboardButton::ALT_RIGHT;
+	case XK_Super_L:      return KeyboardButton::SUPER_LEFT;
+	case XK_Super_R:      return KeyboardButton::SUPER_RIGHT;
 	case XK_Num_Lock:     return KeyboardButton::NUM_LOCK;
 	case XK_KP_Enter:     return KeyboardButton::NUMPAD_ENTER;
 	case XK_KP_Delete:    return KeyboardButton::NUMPAD_DELETE;
@@ -148,13 +148,13 @@ static u8 s_button[] =
 	JoypadButton::B,
 	JoypadButton::X,
 	JoypadButton::Y,
-	JoypadButton::LEFT_SHOULDER,
-	JoypadButton::RIGHT_SHOULDER,
+	JoypadButton::SHOULDER_LEFT,
+	JoypadButton::SHOULDER_RIGHT,
 	JoypadButton::BACK,
 	JoypadButton::START,
 	JoypadButton::GUIDE,
-	JoypadButton::LEFT_THUMB,
-	JoypadButton::RIGHT_THUMB,
+	JoypadButton::THUMB_LEFT,
+	JoypadButton::THUMB_RIGHT,
 	JoypadButton::UP, // FIXME (reported as axis...)
 	JoypadButton::DOWN,
 	JoypadButton::LEFT,

src/device/main_windows.cpp

@@ -53,15 +53,15 @@ static KeyboardButton::Enum win_translate_key(s32 winkey)
 	case VK_INSERT:   return KeyboardButton::INS;
 	case VK_DELETE:   return KeyboardButton::DEL;
 	case VK_END:      return KeyboardButton::END;
-	case VK_LSHIFT:   return KeyboardButton::LEFT_SHIFT;
-	case VK_RSHIFT:   return KeyboardButton::RIGHT_SHIFT;
-	case VK_LCONTROL: return KeyboardButton::LEFT_CTRL;
-	case VK_RCONTROL: return KeyboardButton::RIGHT_CTRL;
+	case VK_LSHIFT:   return KeyboardButton::SHIFT_LEFT;
+	case VK_RSHIFT:   return KeyboardButton::SHIFT_RIGHT;
+	case VK_LCONTROL: return KeyboardButton::CTRL_LEFT;
+	case VK_RCONTROL: return KeyboardButton::CTRL_RIGHT;
 	case VK_CAPITAL:  return KeyboardButton::CAPS_LOCK;
-	case VK_LMENU:    return KeyboardButton::LEFT_ALT;
-	case VK_RMENU:    return KeyboardButton::RIGHT_ALT;
-	case VK_LWIN:     return KeyboardButton::LEFT_SUPER;
-	case VK_RWIN:     return KeyboardButton::RIGHT_SUPER;
+	case VK_LMENU:    return KeyboardButton::ALT_LEFT;
+	case VK_RMENU:    return KeyboardButton::ALT_RIGHT;
+	case VK_LWIN:     return KeyboardButton::SUPER_LEFT;
+	case VK_RWIN:     return KeyboardButton::SUPER_RIGHT;
 	case VK_NUMLOCK:  return KeyboardButton::NUM_LOCK;
 	// case VK_RETURN:   return KeyboardButton::NUMPAD_ENTER;
 	case VK_DECIMAL:  return KeyboardButton::NUMPAD_DELETE;
@@ -133,10 +133,10 @@ static XinputToJoypad s_xinput_to_joypad[] =
 	{ XINPUT_GAMEPAD_DPAD_RIGHT,     JoypadButton::RIGHT          },
 	{ XINPUT_GAMEPAD_START,          JoypadButton::START          },
 	{ XINPUT_GAMEPAD_BACK,           JoypadButton::BACK           },
-	{ XINPUT_GAMEPAD_LEFT_THUMB,     JoypadButton::LEFT_THUMB     },
-	{ XINPUT_GAMEPAD_RIGHT_THUMB,    JoypadButton::RIGHT_THUMB    },
-	{ XINPUT_GAMEPAD_LEFT_SHOULDER,  JoypadButton::LEFT_SHOULDER  },
-	{ XINPUT_GAMEPAD_RIGHT_SHOULDER, JoypadButton::RIGHT_SHOULDER },
+	{ XINPUT_GAMEPAD_LEFT_THUMB,     JoypadButton::THUMB_LEFT     },
+	{ XINPUT_GAMEPAD_RIGHT_THUMB,    JoypadButton::THUMB_RIGHT    },
+	{ XINPUT_GAMEPAD_LEFT_SHOULDER,  JoypadButton::SHOULDER_LEFT  },
+	{ XINPUT_GAMEPAD_RIGHT_SHOULDER, JoypadButton::SHOULDER_RIGHT },
 	{ XINPUT_GAMEPAD_A,              JoypadButton::A              },
 	{ XINPUT_GAMEPAD_B,              JoypadButton::B              },
 	{ XINPUT_GAMEPAD_X,              JoypadButton::X              },