ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PAD: initial windows merge complete

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-12-12 08:44:10 +01:00 committed by lightningterror
parent a0c18d97fd
commit cd70ba753e
10 changed files with 182 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/PAD/Windows/Diagnostics.cpp
View File

@ -20,7 +20,7 @@
#include "DeviceEnumerator.h"
#include "KeyboardQueue.h"
#include "resource.h"
#include "resource_pad.h"
#include "InputManager.h"
#include "WndProcEater.h"

2
pcsx2/PAD/Windows/PAD.cpp
View File

@ -23,7 +23,7 @@
#include <fstream>
#include <iomanip>
#include <sstream>
#include "resource.h"
#include "resource_pad.h"
#include "InputManager.h"
#include "PADConfig.h"
#include "PAD.h"

74
pcsx2/PAD/Windows/PAD.rc
View File

@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#include "resource_pad.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
// Anglais (<28>tats-Unis) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@ -55,7 +55,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE
// Input Bindings:
PUSHBUTTON "Select",ID_SELECT,328,34,34,15
PUSHBUTTON "Start",ID_START,366,34,34,15
PUSHBUTTON "Analog",ID_ANALOG,328,51,34,15
@ -87,27 +86,22 @@ BEGIN
PUSHBUTTON "R3",ID_R3,348,171,30,15
PUSHBUTTON "Right",ID_RSTICK_RIGHT,380,171,30,15
PUSHBUTTON "Down",ID_RSTICK_DOWN,348,191,30,15
// Force Feedback bindings:
GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30
COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14
// Input options:
PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15
CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15
PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15
COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
// Special bindings:
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15
PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15
PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15
// Force Feedback & Input configurations:
PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15
PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15
// Force Feedback configuration:
GROUPBOX "",ID_FF,195,9,222,248
COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17
@ -135,7 +129,6 @@ BEGIN
CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10
EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING
PUSHBUTTON "Test",ID_TEST,335,260,59,15
// Input configuration:
GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110
EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP
@ -159,9 +152,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE
// Input Bindings:
PUSHBUTTON "Select", ID_SELECT,262,25,43,15
PUSHBUTTON "Start", ID_START,306,25,43,15
PUSHBUTTON "Select",ID_SELECT,262,25,43,15
PUSHBUTTON "Start",ID_START,306,25,43,15
PUSHBUTTON "White L",ID_TRIANGLE,196,69,43,15
PUSHBUTTON "Yellow L",ID_CIRCLE,218,51,43,15
PUSHBUTTON "Green L",ID_R1,240,69,43,15
@ -171,27 +163,22 @@ BEGIN
PUSHBUTTON "Green R",ID_R2,328,69,43,15
PUSHBUTTON "Yellow R",ID_DPAD_UP,350,51,43,15
PUSHBUTTON "White R",ID_L2,372,69,43,15
// Force Feedback bindings:
GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30
COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14
// Input options:
PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15
CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15
PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15
COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
// Special bindings:
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15
PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15
PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15
// Force Feedback & Input configurations:
PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15
PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15
// Force Feedback configuration:
GROUPBOX "",ID_FF,195,9,222,248
COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17
@ -219,7 +206,6 @@ BEGIN
CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10
EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING
PUSHBUTTON "Test",ID_TEST,335,260,59,15
// Input configuration:
GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110
EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP
@ -243,7 +229,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE
// Input Bindings:
PUSHBUTTON "Fret 1",ID_R2,283,30,45,15
PUSHBUTTON "Fret 2",ID_CIRCLE,283,53,45,15
PUSHBUTTON "Fret 3",ID_TRIANGLE,283,76,45,15
@ -255,27 +240,22 @@ BEGIN
PUSHBUTTON "Whammy Bar Down",ID_LSTICK_DOWN,219,191,69,15
PUSHBUTTON "Strum Bar Up",ID_DPAD_UP,336,168,58,15
PUSHBUTTON "Strum Bar Down",ID_DPAD_DOWN,336,191,58,15
// Force Feedback bindings:
GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30
COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14
// Input options:
PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15
CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15
PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15
COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
// Special bindings:
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15
PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15
PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15
// Force Feedback & Input configurations:
PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15
PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15
// Force Feedback configuration:
GROUPBOX "",ID_FF,195,9,222,248
COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17
@ -303,7 +283,6 @@ BEGIN
CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10
EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING
PUSHBUTTON "Test",ID_TEST,335,260,59,15
// Input configuration:
GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110
EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP
@ -327,7 +306,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE
// Input bindings:
PUSHBUTTON "Mouse",ID_MOUSE,379,28,34,15
GROUPBOX "Mouse buttons",IDC_FACE,242,46,124,34
PUSHBUTTON "Left-click",ID_CIRCLE,256,57,45,15
@ -337,27 +315,22 @@ BEGIN
PUSHBUTTON "X-axis Right",ID_LSTICK_RIGHT,307,112,45,15
PUSHBUTTON "Y-axis Up",ID_LSTICK_UP,283,92,45,15
PUSHBUTTON "Y-axis Down",ID_LSTICK_DOWN,283,132,45,15
// Force Feedback bindings:
GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30
COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14
// Input options:
PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15
CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15
PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15
COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
// Special bindings:
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15
PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15
PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15
// Force Feedback & Input configurations:
PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15
PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15
// Input configuration:
GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110
EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP
@ -381,7 +354,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE
// Input bindings:
GROUPBOX "Shoulder buttons",IDC_SHOULDER,220,30,173,34
PUSHBUTTON "Analog L",ID_L1,233,41,34,15
PUSHBUTTON "Digital R",ID_R1,346,41,34,15
@ -401,27 +373,22 @@ BEGIN
PUSHBUTTON "Right",ID_LSTICK_RIGHT,327,147,30,15
PUSHBUTTON "Start",ID_START,207,139,34,15
PUSHBUTTON "Mouse",ID_MOUSE,207,158,34,15
// Force Feedback bindings:
GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30
COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14
// Input options:
PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15
CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15
PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15
COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
// Special bindings:
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15
PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15
PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15
// Force Feedback & Input configurations:
PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15
PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15
// Input configuration:
GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110
EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP
@ -452,7 +419,8 @@ BEGIN
GROUPBOX "Game Device APIs",IDC_STATIC,16,70,191,62
CONTROL "DirectInput (Legacy)",IDC_G_DI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,82,100,10
CONTROL "XInput (Modern)",IDC_G_XI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,100,10
CONTROL "DualShock 3 native mode (Requires libusb)",IDC_G_DS3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,106,155,10
CONTROL "DualShock 3 native mode (Requires libusb)",IDC_G_DS3,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,106,155,10
CONTROL "Monitor when in background",IDC_BACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,118,107,10
GROUPBOX "Mouse API",IDC_STATIC,216,16,192,85
CONTROL "Windows messaging (Recommended)",IDC_M_WM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,223,27,137,10
@ -464,7 +432,7 @@ BEGIN
GROUPBOX "Pads",IDC_STATIC,7,142,410,62
CONTROL "Port 1 Multitap",IDC_MULTITAP1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,152,63,10
CONTROL "Port 2 Multitap",IDC_MULTITAP2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,164,63,10
CONTROL "Multiple bindings",IDC_MULTIPLE_BINDING, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,176,66,10
CONTROL "Multiple bindings",IDC_MULTIPLE_BINDING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,176,66,10
CONTROL "",IDC_PAD_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP,81,151,183,48,WS_EX_CLIENTEDGE
COMBOBOX IDC_PAD_TYPE,270,151,140,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Device Diagnostics",IDC_STATIC,7,207,201,72
@ -477,16 +445,6 @@ BEGIN
PUSHBUTTON "Save Bindings",ID_SAVE,355,259,62,15
END
IDD_ABOUT DIALOGEX 0, 0, 108, 66
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About LilyPad"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CTEXT "LilyPad plugin",IDC_VERSION,7,7,94,10
ICON IDI_FROG,IDC_STATIC,42,20,21,20
DEFPUSHBUTTON "OK",IDOK,28,45,50,14
END
IDD_DIAG DIALOGEX 0, 0, 190, 178
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION " "
@ -509,7 +467,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 417
TOPMARGIN, 7
BOTTOMMARGIN, 311
END
IDD_CONFIG_POPN, DIALOG
@ -517,7 +474,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 417
TOPMARGIN, 7
BOTTOMMARGIN, 311
END
IDD_CONFIG_GUITAR, DIALOG
@ -525,7 +481,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 417
TOPMARGIN, 7
BOTTOMMARGIN, 311
END
IDD_CONFIG_PS1_MOUSE, DIALOG
@ -533,7 +488,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 417
TOPMARGIN, 7
BOTTOMMARGIN, 311
END
IDD_CONFIG_NEGCON, DIALOG
@ -541,7 +495,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 417
TOPMARGIN, 7
BOTTOMMARGIN, 311
END
IDD_GENERAL, DIALOG
@ -549,15 +502,6 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 417
TOPMARGIN, 7
BOTTOMMARGIN, 319
END
IDD_ABOUT, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 101
TOPMARGIN, 7
BOTTOMMARGIN, 59
END
IDD_DIAG, DIALOG
@ -586,9 +530,8 @@ IDR_INI1 RCDATA "Default.ini"
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FROG ICON "frog.ico"
#endif // English (United States) resources
#endif // Anglais (<28>tats-Unis) resources
/////////////////////////////////////////////////////////////////////////////
@ -602,3 +545,4 @@ IDI_FROG ICON "frog.ico"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
pcsx2/PAD/Windows/PADConfig.cpp
View File

@ -18,7 +18,7 @@
#include "PrecompiledHeader.h"
#include "Global.h"
#include "resource.h"
#include "resource_pad.h"
#include "InputManager.h"
#include "PADConfig.h"

BIN
pcsx2/PAD/Windows/RCa08644 Normal file
View File

Binary file not shown.

2
pcsx2/PAD/Windows/Tooltips.cpp
View File

@ -17,7 +17,7 @@
#include "PrecompiledHeader.h"
#include "Global.h"
#include "resource.h"
#include "resource_pad.h"
LPWSTR dialog_message(int ID, bool *updateText)
{

169
pcsx2/PAD/Windows/resource.h
View File

@ -1,169 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by LilyPad.rc
//
#define IDD_GENERAL 0x66
#define IDD_ABOUT 0x67
#define IDI_FROG 0x68
#define IDD_CONFIG 0x69
#define IDD_CONFIG_GUITAR 0x6A
#define IDD_PROPPAGE_LARGE 0x6B
#define IDC_CURSOR1 0x6C
#define IDD_DIAG 0x6D
#define IDR_INI1 0x6E
#define IDD_CONFIG_POPN 0x6F
#define IDD_CONFIG_PS1_MOUSE 0x70
#define IDD_CONFIG_NEGCON 0x71
#define IDC_VERSION 0x72
// General tab:
#define IDC_KB_DISABLE 0x44C
#define IDC_KB_DI 0x44D
#define IDC_KB_WM 0x44E
#define IDC_KB_RAW 0x44F
#define IDC_DISABLE_PAD1 0x450
#define IDC_M_DISABLE 0x451
#define IDC_M_DI 0x452
#define IDC_M_WM 0x453
#define IDC_M_RAW 0x454
#define IDC_G_XI 0x455
#define IDC_G_DI 0x456
#define IDC_G_DS3 0x457
#define IDC_DEBUG_FILE 0x458
#define IDC_GUITAR1 0x459
#define IDC_MULTITAP1 0x45A
#define IDC_MOUSE_UNFOCUS 0x45B
#define IDC_AXIS_BUTTONS 0x45C
#define IDC_MULTITAP2 0x45D
#define IDC_BACKGROUND 0x45E
#define IDC_MULTIPLE_BINDING 0x45F
#define IDC_FORCE_HIDE 0x460
#define IDC_GH2_HACK 0x461
#define IDC_PAD_LIST 0x462
#define IDC_COMBO1 0x463
#define IDC_PAD_TYPE 0x464
#define IDC_DIAG_LIST 0x465
#define ID_SAVE 0x466
#define ID_LOAD 0x467
#define ID_RESTORE_DEFAULTS 0x468
// Pad tabs:
#define IDC_BINDINGS_LIST 0xF00
// Pad Input configuration:
#define IDC_SLIDER_SENSITIVITY 0x1000
#define IDC_FLIP 0x1001
#define IDC_AXIS_DIRECTION 0x1002
#define IDC_AXIS_CONTROL 0x1003
#define IDC_AXIS_SENSITIVITY 0x1004
#define IDC_RAPID_FIRE 0x1005
#define IDC_AXIS_DEVICE 0x1006
#define ID_SENSITIVITY 0x1007
#define IDC_SLIDER_DEADZONE 0x1008
#define IDC_AXIS_DEADZONE 0x1009
#define IDC_LABEL_SENSITIVITY 0x100A
#define IDC_LABEL_DEADZONE 0x100B
#define IDC_LABEL_SKIP_DEADZONE 0x100C
#define IDC_SKIP_DEADZONE_OFF 0x100D
#define IDC_SLIDER_SKIP_DEADZONE 0x100E
#define IDC_AXIS_SKIP_DEADZONE 0x100F
// Pad Input Boxes:
#define IDC_DPAD 0x10D0
#define IDC_LSTICK 0x10D1
#define IDC_RSTICK 0x10D2
#define IDC_FACE 0x10D3
#define IDC_SHOULDER 0x10D4
#define IDC_FACE_ANALOG 0x10D5
// Pad Input Bindings:
#define ID_MOUSE 0x10FF
#define ID_SELECT 0x1100
#define ID_L3 0x1101
#define ID_R3 0x1102
#define ID_START 0x1103
#define ID_DPAD_UP 0x1104
#define ID_DPAD_RIGHT 0x1105
#define ID_DPAD_DOWN 0x1106
#define ID_DPAD_LEFT 0x1107
#define ID_L2 0x1108
#define ID_R2 0x1109
#define ID_L1 0x110A
#define ID_R1 0x110B
#define ID_TRIANGLE 0x110C
#define ID_CIRCLE 0x110D
#define ID_CROSS 0x110E
#define ID_SQUARE 0x110F
#define ID_LSTICK_UP 0x1110
#define ID_LSTICK_RIGHT 0x1111
#define ID_LSTICK_DOWN 0x1112
#define ID_LSTICK_LEFT 0x1113
#define ID_RSTICK_UP 0x1114
#define ID_RSTICK_RIGHT 0x1115
#define ID_RSTICK_DOWN 0x1116
#define ID_RSTICK_LEFT 0x1117
#define ID_ANALOG 0x1118
// Special bindings:
#define ID_EXCLUDE 0x1119
#define ID_LOCK_BUTTONS 0x111A
#define ID_LOCK_ALL_INPUT 0x111B
#define ID_LOCK_DIRECTION 0x111C
#define ID_TURBO_KEY 0x111D
#define ID_QUICK_SETUP 0x111E
#define IDC_QUICK_SETUP_TEXT 0x111F
// Force Feedback bindings:
#define IDC_FORCEFEEDBACK 0x1200
#define IDC_FORCEFEEDBACK_FUNCTION 0x1201
#define ID_BIG_MOTOR 0x1202
#define ID_SMALL_MOTOR 0x1203
#define ID_FORCEFEEDBACK_BOX 0x1204
// Input options:
#define IDC_CONFIGURE_ON_BIND 0x1230
#define IDC_DEVICE_SELECT 0x1231
#define ID_CLEAR 0x1232
#define ID_SPECIAL_INPUTS 0x1233
// Pad Force Feedback configuration:
#define ID_TEST 0x1300
#define ID_FF 0x1301
#define IDC_FF_EFFECT 0x1302
#define IDC_FF_AXIS1_ENABLED 0x1310
#define IDC_FF_AXIS1 0x1311
#define IDC_FF_AXIS1_FLIP 0x1312
#define IDC_FF_AXIS1_SCALE 0x1313
#define IDC_FF_AXIS2_ENABLED 0x1320
#define IDC_FF_AXIS2 0x1321
#define IDC_FF_AXIS2_FLIP 0x1322
#define IDC_FF_AXIS2_SCALE 0x1323
#define IDC_FF_AXIS3_ENABLED 0x1330
#define IDC_FF_AXIS3 0x1331
#define IDC_FF_AXIS3_FLIP 0x1332
#define IDC_FF_AXIS3_SCALE 0x1333
#define IDC_FF_AXIS4_ENABLED 0x1340
#define IDC_FF_AXIS4 0x1341
#define IDC_FF_AXIS4_FLIP 0x1342
#define IDC_FF_AXIS4_SCALE 0x1343
#define IDC_FF_AXIS5_ENABLED 0x1350
#define IDC_FF_AXIS5 0x1351
#define IDC_FF_AXIS5_FLIP 0x1352
#define IDC_FF_AXIS5_SCALE 0x1353
#define IDC_FF_AXIS6_ENABLED 0x1360
#define IDC_FF_AXIS6 0x1361
#define IDC_FF_AXIS6_FLIP 0x1362
#define IDC_FF_AXIS6_SCALE 0x1363
#define IDC_FF_AXIS7_ENABLED 0x1370
#define IDC_FF_AXIS7 0x1371
#define IDC_FF_AXIS7_FLIP 0x1372
#define IDC_FF_AXIS7_SCALE 0x1373
#define IDC_FF_AXIS8_ENABLED 0x1380
#define IDC_FF_AXIS8 0x1381
#define IDC_FF_AXIS8_FLIP 0x1382
#define IDC_FF_AXIS8_SCALE 0x1383
// Force Feedback & Input configurations:
#define ID_CONTROLS 0x1390
#define ID_RESET_CONFIG 0x1391
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 5010
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

156
pcsx2/PAD/Windows/resource_pad.h Normal file
View File

@ -0,0 +1,156 @@
//{{NO_DEPENDENCIES}}
// fichier Include Microsoft Visual C++.
// Utilis<69> par PAD.rc
//
#define IDD_GENERAL 0x366
#define IDD_CONFIG 0x369
#define IDD_CONFIG_GUITAR 0x36A
#define IDD_PROPPAGE_LARGE 0x36B
#define IDC_CURSOR1 0x36C
#define IDD_DIAG 0x36D
#define IDR_INI1 0x36E
#define IDD_CONFIG_POPN 0x36F
#define IDD_CONFIG_PS1_MOUSE 0x370
#define IDD_CONFIG_NEGCON 0x371
#define IDC_KB_DISABLE 0x344C
#define IDC_KB_DI 0x344D
#define IDC_KB_WM 0x344E
#define IDC_KB_RAW 0x344F
#define IDC_DISABLE_PAD1 0x3450
#define IDC_M_DISABLE 0x3451
#define IDC_M_DI 0x3452
#define IDC_M_WM 0x3453
#define IDC_M_RAW 0x3454
#define IDC_G_XI 0x3455
#define IDC_G_DI 0x3456
#define IDC_G_DS3 0x3457
#define IDC_DEBUG_FILE 0x3458
#define IDC_GUITAR1 0x3459
#define IDC_MULTITAP1 0x345A
#define IDC_MOUSE_UNFOCUS 0x345B
#define IDC_AXIS_BUTTONS 0x345C
#define IDC_MULTITAP2 0x345D
#define IDC_BACKGROUND 0x345E
#define IDC_MULTIPLE_BINDING 0x345F
#define IDC_FORCE_HIDE 0x3460
#define IDC_GH2_HACK 0x3461
#define IDC_PAD_LIST 0x3462
#define IDC_COMBO1 0x3463
#define IDC_PAD_TYPE 0x3464
#define IDC_DIAG_LIST 0x3465
#define ID_SAVE 0x3466
#define ID_LOAD 0x3467
#define ID_RESTORE_DEFAULTS 0x3468
#define IDC_BINDINGS_LIST 0x3F00
#define IDC_SLIDER_SENSITIVITY 0x4000
#define IDC_FLIP 0x4001
#define IDC_AXIS_DIRECTION 0x4002
#define IDC_AXIS_CONTROL 0x4003
#define IDC_AXIS_SENSITIVITY 0x4004
#define IDC_RAPID_FIRE 0x4005
#define IDC_AXIS_DEVICE 0x4006
#define ID_SENSITIVITY 0x4007
#define IDC_SLIDER_DEADZONE 0x4008
#define IDC_AXIS_DEADZONE 0x4009
#define IDC_LABEL_SENSITIVITY 0x400A
#define IDC_LABEL_DEADZONE 0x400B
#define IDC_LABEL_SKIP_DEADZONE 0x400C
#define IDC_SKIP_DEADZONE_OFF 0x400D
#define IDC_SLIDER_SKIP_DEADZONE 0x400E
#define IDC_AXIS_SKIP_DEADZONE 0x400F
#define IDC_DPAD 0x40D0
#define IDC_LSTICK 0x40D1
#define IDC_RSTICK 0x40D2
#define IDC_FACE 0x40D3
#define IDC_SHOULDER 0x40D4
#define IDC_FACE_ANALOG 0x40D5
#define ID_MOUSE 0x40FF
#define ID_SELECT 0x4100
#define ID_L3 0x4101
#define ID_R3 0x4102
#define ID_START 0x4103
#define ID_DPAD_UP 0x4104
#define ID_DPAD_RIGHT 0x4105
#define ID_DPAD_DOWN 0x4106
#define ID_DPAD_LEFT 0x4107
#define ID_L2 0x4108
#define ID_R2 0x4109
#define ID_L1 0x410A
#define ID_R1 0x410B
#define ID_TRIANGLE 0x410C
#define ID_CIRCLE 0x410D
#define ID_CROSS 0x410E
#define ID_SQUARE 0x410F
#define ID_LSTICK_UP 0x4110
#define ID_LSTICK_RIGHT 0x4111
#define ID_LSTICK_DOWN 0x4112
#define ID_LSTICK_LEFT 0x4113
#define ID_RSTICK_UP 0x4114
#define ID_RSTICK_RIGHT 0x4115
#define ID_RSTICK_DOWN 0x4116
#define ID_RSTICK_LEFT 0x4117
#define ID_ANALOG 0x4118
#define ID_EXCLUDE 0x4119
#define ID_LOCK_BUTTONS 0x411A
#define ID_LOCK_ALL_INPUT 0x411B
#define ID_LOCK_DIRECTION 0x411C
#define ID_TURBO_KEY 0x411D
#define ID_QUICK_SETUP 0x411E
#define IDC_QUICK_SETUP_TEXT 0x411F
#define IDC_FORCEFEEDBACK 0x4200
#define IDC_FORCEFEEDBACK_FUNCTION 0x4201
#define ID_BIG_MOTOR 0x4202
#define ID_SMALL_MOTOR 0x4203
#define ID_FORCEFEEDBACK_BOX 0x4204
#define IDC_CONFIGURE_ON_BIND 0x4230
#define IDC_DEVICE_SELECT 0x4231
#define ID_CLEAR 0x4232
#define ID_SPECIAL_INPUTS 0x4233
#define ID_TEST 0x4300
#define ID_FF 0x4301
#define IDC_FF_EFFECT 0x4302
#define IDC_FF_AXIS1_ENABLED 0x4310
#define IDC_FF_AXIS1 0x4311
#define IDC_FF_AXIS1_FLIP 0x4312
#define IDC_FF_AXIS1_SCALE 0x4313
#define IDC_FF_AXIS2_ENABLED 0x4320
#define IDC_FF_AXIS2 0x4321
#define IDC_FF_AXIS2_FLIP 0x4322
#define IDC_FF_AXIS2_SCALE 0x4323
#define IDC_FF_AXIS3_ENABLED 0x4330
#define IDC_FF_AXIS3 0x4331
#define IDC_FF_AXIS3_FLIP 0x4332
#define IDC_FF_AXIS3_SCALE 0x4333
#define IDC_FF_AXIS4_ENABLED 0x4340
#define IDC_FF_AXIS4 0x4341
#define IDC_FF_AXIS4_FLIP 0x4342
#define IDC_FF_AXIS4_SCALE 0x4343
#define IDC_FF_AXIS5_ENABLED 0x4350
#define IDC_FF_AXIS5 0x4351
#define IDC_FF_AXIS5_FLIP 0x4352
#define IDC_FF_AXIS5_SCALE 0x4353
#define IDC_FF_AXIS6_ENABLED 0x4360
#define IDC_FF_AXIS6 0x4361
#define IDC_FF_AXIS6_FLIP 0x4362
#define IDC_FF_AXIS6_SCALE 0x4363
#define IDC_FF_AXIS7_ENABLED 0x4370
#define IDC_FF_AXIS7 0x4371
#define IDC_FF_AXIS7_FLIP 0x4372
#define IDC_FF_AXIS7_SCALE 0x4373
#define IDC_FF_AXIS8_ENABLED 0x4380
#define IDC_FF_AXIS8 0x4381
#define IDC_FF_AXIS8_FLIP 0x4382
#define IDC_FF_AXIS8_SCALE 0x4383
#define ID_CONTROLS 0x4390
#define ID_RESET_CONFIG 0x4391
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 5010
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

14
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -76,12 +76,12 @@
</ClCompile>
<Link>
<LargeAddressAware>Yes</LargeAddressAware>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;dxguid.lib;dinput8.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@ -663,7 +663,7 @@
<ClInclude Include="..\..\PAD\Windows\InputManager.h" />
<ClInclude Include="..\..\PAD\Windows\KeyboardQueue.h" />
<ClInclude Include="..\..\PAD\Windows\PADRawInput.h" />
<ClInclude Include="..\..\PAD\Windows\resource.h" />
<ClInclude Include="..\..\PAD\Windows\resource_pad.h" />
<ClInclude Include="..\..\PAD\Windows\Tooltips.h" />
<ClInclude Include="..\..\PAD\Windows\usb.h" />
<ClInclude Include="..\..\PAD\Windows\VKey.h" />

6
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -1990,9 +1990,6 @@
<ClInclude Include="..\..\PAD\Windows\KeyboardQueue.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\resource.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\Tooltips.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
@ -2026,6 +2023,9 @@
<ClInclude Include="..\..\PAD\Windows\PAD.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\resource_pad.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\wxResources.rc">