kb test

Author: Megamouse

rpcs3/Emu/Cell/Modules/cellKb.cpp

@@ -160,6 +160,8 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 {
 	cellKb.trace("cellKbCnvRawCode(arrange=%d, mkey=%d, led=%d, rawcode=0x%x)", arrange, mkey, led, rawcode);
 
+	const auto proc = [&]() -> u16
+	{
 	// CELL_KB_RAWDAT
 	if (rawcode <= CELL_KEYC_E_UNDEF ||
 		rawcode == CELL_KEYC_ESCAPE ||
@@ -304,6 +306,11 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 	// TODO: Add more keys and layouts
 
 	return 0x0000;
+	};
+
+	u16 res = proc();
+	cellKb.always()("Conv key (arrange=0x%x, mkey=0x%x, led=0x%x, rawcode=0x%x, res=0x%x)", arrange, mkey, led, rawcode, res);
+	return res;
 }
 
 error_code cellKbGetInfo(vm::ptr<CellKbInfo> info)
@@ -379,9 +386,10 @@ error_code cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 		for (s32 i = 0; i < current_data.len; i++)
 		{
 			data->keycode[i] = current_data.buttons[i].m_keyCode;
+			if (data->keycode[i]) cellKb.always()("Read key (mkey=0x%x, kcode=0x%x)", data->mkey, data->keycode[i]);
 		}
 
-		KbConfig& current_config = consumer.GetConfig(port_no);
+		const KbConfig& current_config = consumer.GetConfig(port_no);
 
 		// For single character mode to work properly we need to "flush" the buffer after reading or else we'll constantly get the same key presses with each call.
 		// Actual key repeats are handled by adding a new key code to the buffer periodically. Key releases are handled in a similar fashion.

rpcs3/Emu/Io/KeyboardHandler.cpp

@@ -93,7 +93,7 @@ void KeyboardHandlerBase::RemoveConsumer(keyboard_consumer::identifier id)
 	}
 }
 
-bool KeyboardHandlerBase::HandleKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key)
+bool KeyboardHandlerBase::HandleKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::string& key)
 {
 	bool consumed = false;
 
@@ -107,7 +107,7 @@ bool KeyboardHandlerBase::HandleKey(u32 qt_code, u32 native_code, bool pressed,
 	return consumed;
 }
 
-bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key)
+bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::string& key)
 {
 	bool consumed = false;
 
@@ -144,6 +144,9 @@ bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, b
 				}
 			}
 
+			if (pressed)
+				input_log.always()("Consuming key (key=%s, toRaw=%d, qt=0x%x, native=0x%x, out_key_code=0x%x, kcode=0x%x)", key, config.code_type == CELL_KB_CODETYPE_RAW, qt_code, native_code, out_key_code, kcode);
+
 			if (pressed)
 			{
 				if (data.len == 1 && data.buttons[0].m_keyCode == CELL_KEYC_NO_EVENT)
@@ -345,7 +348,7 @@ void keyboard_consumer::ReleaseAllKeys()
 			}
 		}
 
-		for (const std::u32string& key : keyboard.m_extra_data.pressed_keys)
+		for (const std::string& key : keyboard.m_extra_data.pressed_keys)
 		{
 			ConsumeKey(CELL_KEYC_NO_EVENT, 0, false, false, key);
 		}

rpcs3/Emu/Io/KeyboardHandler.h

@@ -89,7 +89,7 @@ struct KbData
 
 struct KbExtraData
 {
-	std::set<std::u32string> pressed_keys{};
+	std::set<std::string> pressed_keys{};
 };
 
 struct KbConfig
@@ -121,16 +121,16 @@ class keyboard_consumer
 	keyboard_consumer() {}
 	keyboard_consumer(identifier id) : m_id(id) {}
 
-	bool ConsumeKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key);
+	bool ConsumeKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::string& key);
 	void SetIntercepted(bool intercepted);
 
 	static bool IsMetaKey(u32 code);
 
 	KbInfo& GetInfo() { return m_info; }
 	std::vector<Keyboard>& GetKeyboards() { return m_keyboards; }
-	KbData& GetData(const u32 keyboard) { return m_keyboards[keyboard].m_data; }
-	KbExtraData& GetExtraData(const u32 keyboard) { return m_keyboards[keyboard].m_extra_data; }
-	KbConfig& GetConfig(const u32 keyboard) { return m_keyboards[keyboard].m_config; }
+	KbData& GetData(const u32 keyboard) { return ::at32(m_keyboards, keyboard).m_data; }
+	KbExtraData& GetExtraData(const u32 keyboard) { return ::at32(m_keyboards, keyboard).m_extra_data; }
+	KbConfig& GetConfig(const u32 keyboard) { return ::at32(m_keyboards, keyboard).m_config; }
 	identifier id() const { return m_id; }
 
 	void ReleaseAllKeys();
@@ -161,7 +161,7 @@ class KeyboardHandlerBase
 	keyboard_consumer& GetConsumer(keyboard_consumer::identifier id);
 	void RemoveConsumer(keyboard_consumer::identifier id);
 
-	bool HandleKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key);
+	bool HandleKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::string& key);
 	void SetIntercepted(bool intercepted);
 
 	stx::init_mutex init;

rpcs3/Emu/RSX/Overlays/overlays.cpp

@@ -201,9 +201,9 @@ namespace rsx
 								on_key_pressed(current_data.led, current_data.mkey, key.m_keyCode, key.m_outKeyCode, key.m_pressed, {});
 							}
 
-							for (const std::u32string& key : extra_data.pressed_keys)
+							for (const std::string& key : extra_data.pressed_keys)
 							{
-								on_key_pressed(0, 0, 0, 0, true, key);
+								on_key_pressed(0, 0, 0, 0, true, utf8_to_u32string(key));
 							}
 
 							// Flush buffer unconditionally. Otherwise we get a flood of key events.

rpcs3/Input/basic_keyboard_handler.cpp

@@ -121,7 +121,7 @@ void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent)
 
 	const int key = getUnmodifiedKey(keyEvent);
 
-	if (key < 0 || !HandleKey(static_cast<u32>(key), keyEvent->nativeScanCode(), true, keyEvent->isAutoRepeat(), keyEvent->text().toStdU32String()))
+	if (key < 0 || !HandleKey(static_cast<u32>(key), keyEvent->nativeScanCode(), true, keyEvent->isAutoRepeat(), keyEvent->text().toStdString()))
 	{
 		keyEvent->ignore();
 	}
@@ -142,7 +142,7 @@ void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
 
 	const int key = getUnmodifiedKey(keyEvent);
 
-	if (key < 0 || !HandleKey(static_cast<u32>(key), keyEvent->nativeScanCode(), false, keyEvent->isAutoRepeat(), keyEvent->text().toStdU32String()))
+	if (key < 0 || !HandleKey(static_cast<u32>(key), keyEvent->nativeScanCode(), false, keyEvent->isAutoRepeat(), keyEvent->text().toStdString()))
 	{
 		keyEvent->ignore();
 	}