merge cafeberry/main (keep ported KBM input)

Headers/Windows64/4J_Input.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #define	MAP_STYLE_0		0
 #define	MAP_STYLE_1		1
 #define	MAP_STYLE_2		2
@@ -36,6 +35,9 @@
 #define	_360_JOY_BUTTON_RT						0x00400000
 #define	_360_JOY_BUTTON_LT						0x00800000
 
+//str1k3r - DualShock 4 / DualSense Touchpad
+#define	_PS_JOY_BUTTON_TOUCHPAD		_360_JOY_BUTTON_BACK
+
 // Stick axis maps - to allow changes for SouthPaw in-game axis mapping
 #define AXIS_MAP_LX								0
 #define AXIS_MAP_LY								1