X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=3a0710a5808153657ee492d9fbdf6776604a9322;hb=f6eb0b1c75fd9103a1ad18aed5d00aa0c41fa24e;hp=f77b6e1e810cf076c0f0ef74a51a83296790639a;hpb=b23cf6d99d6023da79344b3438278cf3fb35092f;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index f77b6e1e..3a0710a5 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -68,23 +68,59 @@ static long CALLBACK PADshutdown(void) { return 0; }
 static long CALLBACK PADclose(void) { return 0; }
 static void CALLBACK PADsetSensitive(int _) { return; }
 
-static long CALLBACK PADreadPort1(PadDataS *pad)
-{
-	pad->controllerType = in_type[0];
-	pad->buttonStatus = ~in_keystate[0];
-	if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD) {
-		pad->leftJoyX = in_analog_left[0][0];
-		pad->leftJoyY = in_analog_left[0][1];
-		pad->rightJoyX = in_analog_right[0][0];
-		pad->rightJoyY = in_analog_right[0][1];
+static long CALLBACK PADreadPort1(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+
+	pad->controllerType = in_type[pad_index];
+	pad->buttonStatus = ~in_keystate[pad_index];
+
+	pad->portMultitap = multitap1;
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+	{
+		pad->leftJoyX = in_analog_left[pad_index][0];
+		pad->leftJoyY = in_analog_left[pad_index][1];
+		pad->rightJoyX = in_analog_right[pad_index][0];
+		pad->rightJoyY = in_analog_right[pad_index][1];
+
+		pad->absoluteX = in_analog_left[pad_index][0];
+		pad->absoluteY = in_analog_left[pad_index][1];
 	}
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+	{
+		pad->moveX = in_mouse[pad_index][0];
+		pad->moveY = in_mouse[pad_index][1];
+	}
+
 	return 0;
 }
 
-static long CALLBACK PADreadPort2(PadDataS *pad)
-{
-	pad->controllerType = in_type[1];
-	pad->buttonStatus = ~in_keystate[0] >> 16;
+static long CALLBACK PADreadPort2(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+
+	pad->controllerType = in_type[pad_index];
+	pad->buttonStatus = ~in_keystate[pad_index];
+
+	pad->portMultitap = multitap2;
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+	{
+		pad->leftJoyX = in_analog_left[pad_index][0];
+		pad->leftJoyY = in_analog_left[pad_index][1];
+		pad->rightJoyX = in_analog_right[pad_index][0];
+		pad->rightJoyY = in_analog_right[pad_index][1];
+
+		pad->absoluteX = in_analog_left[pad_index][0];
+		pad->absoluteY = in_analog_left[pad_index][1];
+	}
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+	{
+		pad->moveX = in_mouse[pad_index][0];
+		pad->moveY = in_mouse[pad_index][1];
+	}
+
 	return 0;
 }