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

ZeroPad: Revert the changes to the Windows files in ZeroPad, and ifdef off the changes in the common areas, as the Windows version of ZeroPad is clearly only working by voodoo and bailing wire on Windows. (Note: unable to reproduce ZeroPad working properly in any revision [including playground days] on any version of Windows available. Likely because I don't have any poultry handy to sacrifice.) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1130 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-04 10:31:18 +00:00
parent 66a8c03ded
commit b02d6a19dd
3 changed files with 352 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
plugins/zeropad/Windows/win.cpp
View File

@ -29,15 +29,15 @@
using namespace std;
HINSTANCE hInst = NULL;
HINSTANCE hInst=NULL;
static pthread_spinlock_t s_mutexStatus;
static u32 s_keyPress[2], s_keyRelease[2];
extern u16 status[2];
extern string s_strIniPath;
LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
WNDPROC GSwndProc = NULL;
HWND GShwnd = NULL;
WNDPROC GSwndProc=NULL;
HWND GShwnd=NULL;
extern keyEvent event;
@ -51,21 +51,19 @@ void SaveConfig()
GetModuleFileName(GetModuleHandle((LPCSTR)hInst), szIniFile, 256);
szTemp = strrchr(szIniFile, '\\');
if (!szTemp) return;
if(!szTemp) return;
strcpy(szTemp, "\\inis\\zeropad.ini");
for (j = 0; j < 2 * PADSUBKEYS; j++)
{
for (i = 0; i < PADKEYS; i++)
{
for (j=0; j<2; j++) {
for (i=0; i<PADKEYS; i++) {
sprintf(szProf, "%d_%d", j, i);
sprintf(szValue, "%d", conf.keys[j][i]);
WritePrivateProfileString("Interface", szProf, szValue, szIniFile);
WritePrivateProfileString("Interface", szProf,szValue,szIniFile);
}
}
sprintf(szValue, "%u", conf.log);
WritePrivateProfileString("Interface", "Logging", szValue, szIniFile);
sprintf(szValue,"%u",conf.log);
WritePrivateProfileString("Interface", "Logging",szValue,szIniFile);
}
void LoadConfig()
@ -97,21 +95,18 @@ void LoadConfig()
GetModuleFileName(GetModuleHandle((LPCSTR)hInst), szIniFile, 256);
szTemp = strrchr(szIniFile, '\\');
if (!szTemp) return ;
if(!szTemp) return ;
strcpy(szTemp, "\\inis\\zeropad.ini");
fp = fopen("inis\\zeropad.ini", "rt");//check if usbnull.ini really exists
if (!fp)
{
CreateDirectory("inis", NULL);
fp=fopen("inis\\zeropad.ini","rt");//check if usbnull.ini really exists
if (!fp) {
CreateDirectory("inis",NULL);
SaveConfig();//save and return
return ;
}
fclose(fp);
for (j = 0; j < 2 * PADSUBKEYS; j++)
{
for (i = 0; i < PADKEYS; i++)
{
for (j=0; j<2; j++) {
for (i=0; i<PADKEYS; i++) {
sprintf(szProf, "%d_%d", j, i);
GetPrivateProfileString("Interface", szProf, NULL, szValue, 20, szIniFile);
conf.keys[j][i] = strtoul(szValue, NULL, 10);
@ -122,13 +117,12 @@ void LoadConfig()
conf.log = strtoul(szValue, NULL, 10);
}
void SysMessage(char *fmt, ...)
{
void SysMessage(char *fmt, ...) {
va_list list;
char tmp[512];
va_start(list, fmt);
vsprintf(tmp, fmt, list);
va_start(list,fmt);
vsprintf(tmp,fmt,list);
va_end(list);
MessageBox(0, tmp, "PADwinKeyb Msg", 0);
}
@ -141,13 +135,12 @@ s32 _PADopen(void *pDsp)
s_keyPress[0] = s_keyPress[1] = 0;
s_keyRelease[0] = s_keyRelease[1] = 0;
if (GShwnd != NULL && GSwndProc != NULL)
{
if( GShwnd != NULL && GSwndProc != NULL ) {
// revert
SetWindowLongPtr(GShwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)(GSwndProc));
}
GShwnd = (HWND) * (long*)pDsp;
GShwnd = (HWND)*(long*)pDsp;
GSwndProc = (WNDPROC)GetWindowLongPtr(GShwnd, GWLP_WNDPROC);
GSwndProc = ((WNDPROC)SetWindowLongPtr(GShwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)(PADwndProc)));
@ -156,8 +149,7 @@ s32 _PADopen(void *pDsp)
void _PADclose()
{
if (GShwnd != NULL && GSwndProc != NULL)
{
if( GShwnd != NULL && GSwndProc != NULL ) {
SetWindowLongPtr(GShwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)(GSwndProc));
GSwndProc = NULL;
GShwnd = NULL;
@ -181,30 +173,40 @@ void CALLBACK PADupdate(int pad)
LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
int i, pad, keyPress[2] = {0}, keyRelease[2] = {0};
static bool lbutton = false, rbutton = false;
int i,pad,keyPress[2]={0},keyRelease[2]={0};
static bool lbutton=false,rbutton=false;
switch (msg)
{
switch (msg) {
case WM_KEYDOWN:
if (lParam & 0x40000000)
return TRUE;
i = FindKey(wParam, pad);
if (i != -1) {
keyPress[pad] |= (1 << i);
keyRelease[pad] &= ~(1 << i);
for(pad = 0; pad < 2; ++pad ) {
for (i=0; i<PADKEYS; i++) {
if (wParam == conf.keys[pad][i]) {
keyPress[pad] |=(1<<i);
keyRelease[pad] &=~(1<<i);
break;
}
}
}
event.evt = KEYPRESS;
event.key = wParam;
break;
case WM_KEYUP:
i = FindKey(wParam, pad);
if (i != -1) {
keyPress[pad] &= ~(1 << i);
keyRelease[pad] |= (1 << i);
for(pad = 0; pad < 2; ++pad ) {
for (i=0; i<PADKEYS; i++) {
if (wParam == conf.keys[pad][i]) {
keyPress[pad] &=~(1<<i);
keyRelease[pad] |= (1<<i);
break;
}
}
}
event.evt = KEYRELEASE;
event.key = wParam;
break;
@ -234,14 +236,14 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
break;
case WM_MOUSEMOVE:
if (lbutton)
if(lbutton)
{
g_lanalog[0].x = LOWORD(lParam) & 254;
g_lanalog[0].y = HIWORD(lParam) & 254;
g_lanalog[1].x = LOWORD(lParam) & 254;
g_lanalog[1].y = HIWORD(lParam) & 254;
}
if (rbutton)
if(rbutton)
{
g_ranalog[0].x = LOWORD(lParam) & 254;
g_ranalog[0].y = HIWORD(lParam) & 254;
@ -261,8 +263,7 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
pthread_spin_lock(&s_mutexStatus);
for (pad = 0; pad < 2; ++pad)
{
for(pad = 0; pad < 2; ++pad ) {
s_keyPress[pad] |= keyPress[pad];
s_keyPress[pad] &= ~keyRelease[pad];
s_keyRelease[pad] |= keyRelease[pad];
@ -276,61 +277,56 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
string GetKeyLabel(const int pad, const int index)
{
const int key = conf.keys[pad][index];
char buff[16] = "NONE)";
char buff[16]="NONE)";
if (key < 0x100)
{
if (key == 0)
strcpy(buff, "NONE");
else
{
if (key >= 0x60 && key <= 0x69)
strcpy (buff, "NONE");
else {
if(key>=0x60 && key<=0x69) {
sprintf(buff, "NumPad %c", '0' + key - 0x60);
else
sprintf(buff, "%c", key);
}
else sprintf(buff, "%c", key);
}
}
else if (key >= 0x1000 && key < 0x2000)
{
sprintf(buff, "J%d_%d", (key & 0xfff) / 0x100, (key & 0xff) + 1);
sprintf (buff, "J%d_%d", (key & 0xfff) / 0x100, (key & 0xff) + 1);
}
else if (key >= 0x2000 && key < 0x3000)
{
static const char name[][4] = { "MIN", "MAX" };
const int axis = (key & 0xff);
sprintf(buff, "J%d_AXIS%d_%s", (key & 0xfff) / 0x100, axis / 2, name[axis % 2]);
if (index >= 17 && index <= 20) buff[strlen(buff) -4] = '\0';
sprintf (buff, "J%d_AXIS%d_%s", (key & 0xfff) / 0x100, axis / 2, name[axis % 2]);
if (index >= 17 && index <= 20)
buff[strlen (buff) -4] = '\0';
}
else if (key >= 0x3000 && key < 0x4000)
{
static const char name[][7] = { "FOWARD", "RIGHT", "BACK", "LEFT" };
const int pov = (key & 0xff);
sprintf(buff, "J%d_POV%d_%s", (key & 0xfff) / 0x100, pov / 4, name[pov % 4]);
sprintf (buff, "J%d_POV%d_%s", (key & 0xfff) / 0x100, pov /4, name[pov % 4]);
}
return buff;
}
BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
HWND hWC;
TCITEM tcI;
int i, key, numkeys;
int i,key, numkeys;
u8* pkeyboard;
static int disabled = 0;
static int padn = 0;
static int disabled=0;
static int padn=0;
switch (uMsg)
{
switch(uMsg) {
case WM_INITDIALOG:
LoadConfig();
padn = 0;
if (conf.log) CheckDlgButton(hW, IDC_LOG, TRUE);
for (i = 0; i < PADKEYS; i++)
{
hWC = GetDlgItem(hW, IDC_L2 + i * 2);
for (i=0; i<PADKEYS; i++) {
hWC = GetDlgItem(hW, IDC_L2 + i*2);
Button_SetText(hWC, GetKeyLabel(padn, i).c_str());
}
@ -348,46 +344,41 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
return TRUE;
case WM_TIMER:
if (disabled)
{
if (disabled){
key = 0;
//pkeyboard = SDL_GetKeyState(&numkeys);
for (int i = 0; i < numkeys; ++i)
{
if (pkeyboard[i])
{
for (int i = 0; i < numkeys; ++i) {
if( pkeyboard[i] ) {
key = i;
break;
}
}
if (key == 0)
{
if( key == 0 ) {
// check joystick
}
if (key != 0)
{
if (key != 0){
KillTimer(hW, 0x80);
hWC = GetDlgItem(hW, disabled);
conf.keys[padn][disabled-IDC_L2] = key;
Button_SetText(hWC, GetKeyLabel(padn, disabled - IDC_L2).c_str());
Button_SetText(hWC, GetKeyLabel(padn, disabled-IDC_L2).c_str());
EnableWindow(hWC, TRUE);
disabled = 0;
disabled=0;
return TRUE;
}
}
return TRUE;
case WM_COMMAND:
for (i = IDC_L2; i <= IDC_LEFT; i += 2)
for(i = IDC_L2; i <= IDC_LEFT; i+=2)
{
if (LOWORD(wParam) == i)
if(LOWORD(wParam) == i)
{
if (disabled)//change selection
EnableWindow(GetDlgItem(hW, disabled), TRUE);
EnableWindow(GetDlgItem(hW, disabled = wParam), FALSE);
EnableWindow(GetDlgItem(hW, disabled=wParam), FALSE);
SetTimer(hW, 0x80, 250, NULL);
@ -395,21 +386,16 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
}
}
switch (LOWORD(wParam))
{
switch(LOWORD(wParam)) {
case IDCANCEL:
KillTimer(hW, 0x80);
EndDialog(hW, TRUE);
return TRUE;
case IDOK:
KillTimer(hW, 0x80);
if (IsDlgButtonChecked(hW, IDC_LOG))
conf.log = 1;
else
conf.log = 0;
else conf.log = 0;
SaveConfig();
EndDialog(hW, FALSE);
return TRUE;
@ -417,18 +403,17 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
break;
case WM_NOTIFY:
switch (wParam)
{
switch (wParam) {
case IDC_TABC:
hWC = GetDlgItem(hW, IDC_TABC);
padn = TabCtrl_GetCurSel(hWC);
for (i = 0; i < PADKEYS; i++)
{
for (i=0; i<PADKEYS; i++) {
hWC = GetDlgItem(hW, IDC_EL3 + i);
Button_SetText(hWC, GetKeyLabel(padn, i).c_str());
}
return TRUE;
}
return FALSE;
@ -436,16 +421,13 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE;
}
BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
switch(uMsg) {
case WM_INITDIALOG:
return TRUE;
case WM_COMMAND:
switch (LOWORD(wParam))
{
switch(LOWORD(wParam)) {
case IDOK:
EndDialog(hW, FALSE);
return TRUE;
@ -454,28 +436,24 @@ BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE;
}
void CALLBACK PADconfigure()
{
void CALLBACK PADconfigure() {
DialogBox(hInst,
MAKEINTRESOURCE(IDD_DIALOG1),
GetActiveWindow(),
(DLGPROC)ConfigureDlgProc);
}
void CALLBACK PADabout()
{
void CALLBACK PADabout() {
SysMessage("Author: zerofrog\nThanks to SSSPSXPad, TwinPAD, and PADwin plugins");
}
s32 CALLBACK PADtest()
{
s32 CALLBACK PADtest() {
return 0;
}
BOOL APIENTRY DllMain(HANDLE hModule, // DLL INIT
DWORD dwReason,
LPVOID lpReserved)
{
LPVOID lpReserved) {
hInst = (HINSTANCE)hModule;
return TRUE; // very quick :)
}

19
plugins/zeropad/zeropad.cpp
View File

@ -136,6 +136,14 @@ void _KeyPress(int pad, u32 key)
{
int i;
#ifdef _WIN32
for (i=0; i<PADKEYS; i++) {
if (key == conf.keys[pad][i]) {
status[pad]&=~(1<<i);
return;
}
}
#else
for (int p = 0; p < PADSUBKEYS; p++)
{
for (i = 0; i < PADKEYS; i++)
@ -147,6 +155,7 @@ void _KeyPress(int pad, u32 key)
}
}
}
#endif
event.evt = KEYPRESS;
event.key = key;
@ -156,6 +165,14 @@ void _KeyRelease(int pad, u32 key)
{
int i;
#ifdef _WIN32
for (i=0; i<PADKEYS; i++) {
if (key == conf.keys[pad][i]) {
status[pad]|= (1<<i);
return;
}
}
#else
for (int p = 0; p < PADSUBKEYS; p++)
{
for (i = 0; i < PADKEYS; i++)
@ -167,7 +184,7 @@ void _KeyRelease(int pad, u32 key)
}
}
}
#endif
event.evt = KEYRELEASE;
event.key = key;
}

5
plugins/zeropad/zeropad.h
View File

@ -72,7 +72,12 @@ extern char libraryName[256];
#define PADOPTION_REVERTRX 0x8
#define PADOPTION_REVERTRY 0x10
#ifdef _WIN32
#define PADSUBKEYS 1
#else
#define PADSUBKEYS 2
#endif
extern int PadEnum[2][2];
typedef struct