diff --git a/plugins/onepad/Linux/GamepadConfiguration.cpp b/plugins/onepad/Linux/GamepadConfiguration.cpp index 6074575f3d..81db299482 100644 --- a/plugins/onepad/Linux/GamepadConfiguration.cpp +++ b/plugins/onepad/Linux/GamepadConfiguration.cpp @@ -48,19 +48,26 @@ GamepadConfiguration::GamepadConfiguration(int pad, wxWindow *parent) : wxFrame( wxPoint(20, 20) // Position ); - this->cb_hack_sixaxis = new wxCheckBox( + this->cb_hack_sixaxis_usb = new wxCheckBox( this->pan_gamepad_config, // Parent wxID_ANY, // ID - _T("&Hack Sixaxis/DS3 plugged in USB"), // Label + _T("&Hack: Sixaxis/DS3 plugged in USB"), // Label wxPoint(20, 40) // Position ); + this->cb_hack_sixaxis_pressure = new wxCheckBox( + this->pan_gamepad_config, // Parent + wxID_ANY, // ID + _T("&Hack: Sixaxis/DS3 pressure"), // Label + wxPoint(20, 60) // Position + ); + wxString txt_rumble = wxT("Rumble intensity"); this->lbl_rumble_intensity = new wxStaticText( this->pan_gamepad_config, // Parent wxID_ANY, // ID txt_rumble, // Text which must be displayed - wxPoint(20, 70), // Position + wxPoint(20, 90), // Position wxDefaultSize // Size ); @@ -70,7 +77,7 @@ GamepadConfiguration::GamepadConfiguration(int pad, wxWindow *parent) : wxFrame( 0, // value 0, // min value 0x0000 0x7FFF, // max value 0x7FFF - wxPoint(150, 63), // Position + wxPoint(150, 83), // Position wxSize(200, 30) // Size ); @@ -79,7 +86,7 @@ GamepadConfiguration::GamepadConfiguration(int pad, wxWindow *parent) : wxFrame( this->pan_gamepad_config, // Parent wxID_ANY, // ID txt_joystick, // Text which must be displayed - wxPoint(20, 100), // Position + wxPoint(20, 120), // Position wxDefaultSize // Size ); @@ -89,7 +96,7 @@ GamepadConfiguration::GamepadConfiguration(int pad, wxWindow *parent) : wxFrame( 0, // value 0, // min value 100, // max value - wxPoint(150, 93), // Position + wxPoint(150, 113), // Position wxSize(200, 30) // Size ); @@ -97,7 +104,7 @@ GamepadConfiguration::GamepadConfiguration(int pad, wxWindow *parent) : wxFrame( this->pan_gamepad_config, // Parent wxID_ANY, // ID _T("&OK"), // Label - wxPoint(250, 130), // Position + wxPoint(250, 160), // Position wxSize(60,25) // Size ); @@ -105,7 +112,7 @@ GamepadConfiguration::GamepadConfiguration(int pad, wxWindow *parent) : wxFrame( this->pan_gamepad_config, // Parent wxID_ANY, // ID _T("&Cancel"), // Label - wxPoint(320, 130), // Position + wxPoint(320, 160), // Position wxSize(60,25) // Size ); @@ -242,9 +249,13 @@ void GamepadConfiguration::OnCheckboxChange(wxCommandEvent& event) this->sl_rumble_intensity->Disable(); } } - else if(cb_id == this->cb_hack_sixaxis->GetId()) + else if(cb_id == this->cb_hack_sixaxis_usb->GetId()) { - conf->pad_options[this->pad_id].sixaxis_usb = (this->cb_hack_sixaxis->GetValue())?(u32)1:(u32)0; + conf->pad_options[this->pad_id].sixaxis_usb = (this->cb_hack_sixaxis_usb->GetValue())?(u32)1:(u32)0; + } + else if(cb_id == this->cb_hack_sixaxis_pressure->GetId()) + { + conf->pad_options[this->pad_id].sixaxis_pressure = (this->cb_hack_sixaxis_pressure->GetValue())?(u32)1:(u32)0; } } @@ -256,7 +267,7 @@ void GamepadConfiguration::OnCheckboxChange(wxCommandEvent& event) void GamepadConfiguration::reset() { this->cb_rumble->SetValue(this->init_rumble); - this->cb_hack_sixaxis->SetValue(this->init_hack_sixaxis); + this->cb_hack_sixaxis_usb->SetValue(this->init_hack_sixaxis); this->sl_rumble_intensity->SetValue(this->init_rumble_intensity); this->sl_joystick_sensibility->SetValue(this->init_joystick_sensibility); } @@ -269,7 +280,7 @@ void GamepadConfiguration::repopulate() this->cb_rumble->SetValue(val); val = conf->pad_options[this->pad_id].sixaxis_usb; this->init_hack_sixaxis = val; - this->cb_hack_sixaxis->SetValue(val); + this->cb_hack_sixaxis_usb->SetValue(val); int tmp = conf->get_ff_intensity(); this->sl_rumble_intensity->SetValue(tmp); this->init_rumble_intensity = tmp; diff --git a/plugins/onepad/Linux/GamepadConfiguration.h b/plugins/onepad/Linux/GamepadConfiguration.h index 1aedc5ca17..6edd640541 100644 --- a/plugins/onepad/Linux/GamepadConfiguration.h +++ b/plugins/onepad/Linux/GamepadConfiguration.h @@ -35,7 +35,7 @@ class GamepadConfiguration : public wxFrame { wxPanel* pan_gamepad_config; - wxCheckBox *cb_rumble, *cb_hack_sixaxis; + wxCheckBox *cb_rumble, *cb_hack_sixaxis_usb, *cb_hack_sixaxis_pressure; wxSlider *sl_rumble_intensity, *sl_joystick_sensibility; wxButton *bt_ok, *bt_cancel; wxStaticText *lbl_rumble_intensity, *lbl_joystick_sensibility; diff --git a/plugins/onepad/Linux/dialog.cpp b/plugins/onepad/Linux/dialog.cpp index bab27b0e5a..f30881df3f 100644 --- a/plugins/onepad/Linux/dialog.cpp +++ b/plugins/onepad/Linux/dialog.cpp @@ -46,151 +46,151 @@ Dialog::Dialog() : wxFrame( NULL, // Parent padding[PAD_L1][0] = 218; // Width padding[PAD_L1][1] = 28; // Height padding[PAD_L1][2] = 50; // X - padding[PAD_L1][3] = 174; // Y + padding[PAD_L1][3] = 175; // Y // L2 padding[PAD_L2][0] = 218; // Width padding[PAD_L2][1] = 28; // Height padding[PAD_L2][2] = 50; // X - padding[PAD_L2][3] = 103; // Y + padding[PAD_L2][3] = 104; // Y // R1 padding[PAD_R1][0] = 218; // Width padding[PAD_R1][1] = 28; // Height padding[PAD_R1][2] = 726; // X - padding[PAD_R1][3] = 174; // Y + padding[PAD_R1][3] = 175; // Y // R2 padding[PAD_R2][0] = 218; // Width padding[PAD_R2][1] = 28; // Height padding[PAD_R2][2] = 726; // X - padding[PAD_R2][3] = 103; // Y + padding[PAD_R2][3] = 104; // Y // Triangle padding[PAD_TRIANGLE][0] = 218; // Width padding[PAD_TRIANGLE][1] = 28; // Height padding[PAD_TRIANGLE][2] = 726; // X - padding[PAD_TRIANGLE][3] = 244; // Y + padding[PAD_TRIANGLE][3] = 246; // Y // Circle padding[PAD_CIRCLE][0] = 218; // Width padding[PAD_CIRCLE][1] = 28; // Height padding[PAD_CIRCLE][2] = 726; // X - padding[PAD_CIRCLE][3] = 317; // Y + padding[PAD_CIRCLE][3] = 319; // Y // Cross padding[PAD_CROSS][0] = 218; // Width padding[PAD_CROSS][1] = 28; // Height padding[PAD_CROSS][2] = 726; // X - padding[PAD_CROSS][3] = 389; // Y + padding[PAD_CROSS][3] = 391; // Y // Square padding[PAD_SQUARE][0] = 218; // Width padding[PAD_SQUARE][1] = 28; // Height padding[PAD_SQUARE][2] = 726; // X - padding[PAD_SQUARE][3] = 461; // Y + padding[PAD_SQUARE][3] = 463; // Y // Directional pad up padding[PAD_UP][0] = 100; // Width padding[PAD_UP][1] = 25; // Height padding[PAD_UP][2] = 108; // X - padding[PAD_UP][3] = 288; // Y + padding[PAD_UP][3] = 290; // Y // Directional pad down padding[PAD_DOWN][0] = 100; // Width padding[PAD_DOWN][1] = 25; // Height padding[PAD_DOWN][2] = 108; // X - padding[PAD_DOWN][3] = 338; // Y + padding[PAD_DOWN][3] = 340; // Y // Directional pad right padding[PAD_RIGHT][0] = 109; // Width padding[PAD_RIGHT][1] = 25; // Height padding[PAD_RIGHT][2] = 159; // X - padding[PAD_RIGHT][3] = 313; // Y + padding[PAD_RIGHT][3] = 315; // Y // Directional pad left padding[PAD_LEFT][0] = 109; // Width padding[PAD_LEFT][1] = 25; // Height padding[PAD_LEFT][2] = 50; // X - padding[PAD_LEFT][3] = 313; // Y + padding[PAD_LEFT][3] = 315; // Y // Left Joystick up padding[PAD_L_UP][0] = 100; // Width padding[PAD_L_UP][1] = 25; // Height - padding[PAD_L_UP][2] = 330; // X - padding[PAD_L_UP][3] = 525; // Y + padding[PAD_L_UP][2] = 325; // X + padding[PAD_L_UP][3] = 527; // Y // Left Joystick down padding[PAD_L_DOWN][0] = 100; // Width padding[PAD_L_DOWN][1] = 25; // Height - padding[PAD_L_DOWN][2] = 330; // X - padding[PAD_L_DOWN][3] = 575; // Y + padding[PAD_L_DOWN][2] = 325; // X + padding[PAD_L_DOWN][3] = 577; // Y // Left Joystick right padding[PAD_L_RIGHT][0] = 109; // Width padding[PAD_L_RIGHT][1] = 25; // Height - padding[PAD_L_RIGHT][2] = 382; // X - padding[PAD_L_RIGHT][3] = 550; // Y + padding[PAD_L_RIGHT][2] = 377; // X + padding[PAD_L_RIGHT][3] = 552; // Y // Left Joystick left padding[PAD_L_LEFT][0] = 109; // Width padding[PAD_L_LEFT][1] = 25; // Height - padding[PAD_L_LEFT][2] = 273; // X - padding[PAD_L_LEFT][3] = 550; // Y + padding[PAD_L_LEFT][2] = 268; // X + padding[PAD_L_LEFT][3] = 552; // Y // L3 padding[PAD_L3][0] = 218; // Width padding[PAD_L3][1] = 28; // Height - padding[PAD_L3][2] = 273; // X - padding[PAD_L3][3] = 642; // Y + padding[PAD_L3][2] = 268; // X + padding[PAD_L3][3] = 641; // Y // Right Joystick up padding[PAD_R_UP][0] = 100; // Width padding[PAD_R_UP][1] = 25; // Height - padding[PAD_R_UP][2] = 560; // X - padding[PAD_R_UP][3] = 525; // Y + padding[PAD_R_UP][2] = 555; // X + padding[PAD_R_UP][3] = 527; // Y // Right Joystick down padding[PAD_R_DOWN][0] = 100; // Width padding[PAD_R_DOWN][1] = 25; // Height - padding[PAD_R_DOWN][2] = 560; // X - padding[PAD_R_DOWN][3] = 575; // Y + padding[PAD_R_DOWN][2] = 555; // X + padding[PAD_R_DOWN][3] = 577; // Y // Right Joystick right padding[PAD_R_RIGHT][0] = 109; // Width padding[PAD_R_RIGHT][1] = 25; // Height - padding[PAD_R_RIGHT][2] = 612; // X - padding[PAD_R_RIGHT][3] = 550; // Y + padding[PAD_R_RIGHT][2] = 607; // X + padding[PAD_R_RIGHT][3] = 552; // Y // Right Joystick left padding[PAD_R_LEFT][0] = 109; // Width padding[PAD_R_LEFT][1] = 25; // Height - padding[PAD_R_LEFT][2] = 503; // X - padding[PAD_R_LEFT][3] = 550; // Y + padding[PAD_R_LEFT][2] = 498; // X + padding[PAD_R_LEFT][3] = 552; // Y // R3 padding[PAD_R3][0] = 218; // Width padding[PAD_R3][1] = 28; // Height - padding[PAD_R3][2] = 503; // X - padding[PAD_R3][3] = 642; // Y + padding[PAD_R3][2] = 498; // X + padding[PAD_R3][3] = 641; // Y // Start padding[PAD_START][0] = 218; // Width padding[PAD_START][1] = 28; // Height padding[PAD_START][2] = 503; // X - padding[PAD_START][3] = 32; // Y + padding[PAD_START][3] = 34; // Y // Select padding[PAD_SELECT][0] = 218; // Width padding[PAD_SELECT][1] = 28; // Height padding[PAD_SELECT][2] = 273; // X - padding[PAD_SELECT][3] = 32; // Y + padding[PAD_SELECT][3] = 34; // Y // Analog padding[Analog][0] = 218; // Width padding[Analog][1] = 28; // Height padding[Analog][2] = 50; // X - padding[Analog][3] = 450; // Y + padding[Analog][3] = 452; // Y // Left Joystick Configuration padding[JoyL_config][0] = 180; // Width