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

onepad: various cleanup. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3168 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-06-05 11:03:12 +00:00
parent fb89acafe9
commit e7b2379b03
10 changed files with 143 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
plugins/onepad/Linux/dialog.cpp
View File

@ -19,15 +19,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "linux.h"
#include <gdk/gdkx.h>
#include "joystick.h"
#include "onepad.h"
#include <gtk/gtk.h>
extern bool PollX11Keyboard(char* &temp, u32 &pkey);
extern string KeyName(int pad, int key);
void config_key(int pad, int key);
void on_conf_key(GtkButton *button, gpointer user_data);
int current_pad = 0;
int current_joystick = -1;
GtkWidget *rev_lx_check, *rev_ly_check, *force_feedback_check, *rev_rx_check, *rev_ry_check;
const char* s_pGuiKeyMap[] =
@ -191,13 +194,42 @@ class keys_tree
if (get_selected(pad, key))
{
config_key(pad,key);
// Config key calls update.
update();
}
}
};
keys_tree *fir;
extern int _GetJoystickIdFromPAD(int pad);
int _GetJoystickIdFromPAD(int pad)
{
// select the right joystick id
u32 joyid = -1;
// for (int p = 0; p < MAX_SUB_KEYS; p++)
// {
// for (int i = 0; i < MAX_KEYS; ++i)
// {
// KeyType k = type_of_key(PadEnum[pad][p],i);
//
// if (k == PAD_JOYSTICK || k == PAD_JOYBUTTONS)
// {
// joyid = key_to_joystick_id(PadEnum[pad][p],i);
// return joyid;
// }
// }
// }
if (!JoystickIdWithinBounds(joyid))
{
// get first unused joystick
for (joyid = 0; joyid < s_vjoysticks.size(); ++joyid)
{
if (s_vjoysticks[joyid]->GetPAD() < 0) break;
}
}
return joyid;
}
int Get_Current_Joystick()
{
@ -227,6 +259,7 @@ void populate_new_joysticks(GtkComboBox *box)
gtk_combo_box_append_text(box, str);
it++;
}
current_joystick = Get_Current_Joystick();
}
typedef struct
@ -316,8 +349,6 @@ void config_key(int pad, int key)
itjoy++;
}
}
fir->update();
}
void on_conf_key(GtkButton *button, gpointer user_data)
@ -328,6 +359,7 @@ void on_conf_key(GtkButton *button, gpointer user_data)
if (key == -1) return;
config_key(current_pad, key);
fir->update();
}
void on_remove_clicked(GtkButton *button, gpointer user_data)
@ -361,59 +393,64 @@ void joy_changed(GtkComboBox *box, gpointer user_data)
void pad_changed(GtkComboBox *box, gpointer user_data)
{
int temp = gtk_combo_box_get_active(box);
if (temp != -1) current_pad = temp;
if (temp >= 0) current_pad = temp;
fir->update();
int options = (conf.options >> (16 * current_pad));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_lx_check), (options & PADOPTION_REVERTLX));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ly_check), (options & PADOPTION_REVERTLY));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_rx_check), (options & PADOPTION_REVERTRX));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ry_check), (options & PADOPTION_REVERTRY));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_lx_check), (options & PADOPTION_REVERSELX));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ly_check), (options & PADOPTION_REVERSELY));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_rx_check), (options & PADOPTION_REVERSERX));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ry_check), (options & PADOPTION_REVERSERY));
}
void update_option(int option, bool value)
{
int mask = (option << (16 * current_pad));
if (value)
conf.options |= mask;
else
conf.options &= ~mask;
}
void on_refresh(GtkComboBox *box, gpointer user_data)
{
GtkComboBox *joy_choose_cbox = (GtkComboBox*)user_data;
if (current_joystick < 0) current_joystick = Get_Current_Joystick();
for(int i=0; i <= (int)s_vjoysticks.size(); i++)
{
gtk_combo_box_remove_text(joy_choose_cbox, 0);
}
populate_new_joysticks(joy_choose_cbox);
if (gtk_combo_box_get_active(joy_choose_cbox) != current_joystick)
gtk_combo_box_set_active(joy_choose_cbox, current_joystick);
}
void on_rev_lx(GtkComboBox *box, gpointer user_data)
{
int mask = (PADOPTION_REVERTLX << (16 * current_pad));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_lx_check)))
conf.options |= mask;
else
conf.options &= ~mask;
update_option(PADOPTION_REVERSELX, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_lx_check)));
}
void on_rev_ly(GtkComboBox *box, gpointer user_data)
{
int mask = (PADOPTION_REVERTLY << (16 * current_pad));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_ly_check)))
conf.options |= mask;
else
conf.options &= ~mask;
update_option(PADOPTION_REVERSELY, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_ly_check)));
}
void on_rev_rx(GtkComboBox *box, gpointer user_data)
{
int mask = (PADOPTION_REVERTRX << (16 * current_pad));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_rx_check)))
conf.options |= mask;
else
conf.options &= ~mask;
update_option(PADOPTION_REVERSERX, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_rx_check)));
}
void on_rev_ry(GtkComboBox *box, gpointer user_data)
{
int mask = (PADOPTION_REVERTRY << (16 * current_pad));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_ry_check)))
conf.options |= mask;
else
conf.options &= ~mask;
update_option(PADOPTION_REVERSERY, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev_ry_check)));
}
//void on_forcefeedback_toggled(GtkToggleButton *togglebutton, gpointer user_data)
//{
// int mask = PADOPTION_REVERTLX << (16 * s_selectedpad);
// int mask = PADOPTION_REVERSELX << (16 * s_selectedpad);
//
// if (gtk_toggle_button_get_active(togglebutton))
// {
@ -437,10 +474,11 @@ void DisplayDialog()
GtkWidget *main_frame, *main_box;
GtkWidget *pad_choose_frame, *pad_choose_box;
GtkWidget *pad_choose_cbox;
GtkComboBox *pad_choose_cbox;
GtkWidget *joy_choose_frame, *joy_choose_box;
GtkWidget *joy_choose_cbox;
GtkComboBox *joy_choose_cbox;
//GtkWidget *joy_refresh;
GtkWidget *keys_frame, *keys_box;
@ -451,8 +489,11 @@ void DisplayDialog()
GtkWidget *keys_static_frame, *keys_static_box;
GtkWidget *keys_static_area;
dialog_buttons btn[29];
LoadConfig();
current_pad = 0;
fir = new keys_tree;
fir->init();
/* Create the widgets */
dialog = gtk_dialog_new_with_buttons (
@ -465,21 +506,24 @@ void DisplayDialog()
GTK_RESPONSE_REJECT,
NULL);
pad_choose_cbox = gtk_combo_box_new_text ();
gtk_combo_box_append_text(GTK_COMBO_BOX(pad_choose_cbox), "Pad 1");
gtk_combo_box_append_text(GTK_COMBO_BOX(pad_choose_cbox), "Pad 2");
gtk_combo_box_append_text(GTK_COMBO_BOX(pad_choose_cbox), "Pad 1 (alt)");
gtk_combo_box_append_text(GTK_COMBO_BOX(pad_choose_cbox), "Pad 2 (alt)");
gtk_combo_box_set_active(GTK_COMBO_BOX(pad_choose_cbox), 0);
current_pad = 0;
pad_choose_cbox = GTK_COMBO_BOX(gtk_combo_box_new_text());
gtk_combo_box_append_text(pad_choose_cbox, "Pad 1");
gtk_combo_box_append_text(pad_choose_cbox, "Pad 2");
gtk_combo_box_append_text(pad_choose_cbox, "Pad 1 (alt)");
gtk_combo_box_append_text(pad_choose_cbox, "Pad 2 (alt)");
gtk_combo_box_set_active(pad_choose_cbox, current_pad);
g_signal_connect(GTK_OBJECT (pad_choose_cbox), "changed", G_CALLBACK(pad_changed), NULL);
joy_choose_cbox = gtk_combo_box_new_text ();
populate_new_joysticks(GTK_COMBO_BOX(joy_choose_cbox));
gtk_combo_box_set_active(GTK_COMBO_BOX(joy_choose_cbox), Get_Current_Joystick());
if (current_joystick == -1) current_joystick = Get_Current_Joystick();
joy_choose_cbox = GTK_COMBO_BOX(gtk_combo_box_new_text());
populate_new_joysticks(joy_choose_cbox);
gtk_combo_box_set_active(joy_choose_cbox, current_joystick);
g_signal_connect(GTK_OBJECT (joy_choose_cbox), "changed", G_CALLBACK(joy_changed), NULL);
fir->init();
//joy_refresh = gtk_button_new_with_label("Refresh");
//g_signal_connect(GTK_OBJECT (joy_refresh), "clicked", G_CALLBACK(on_refresh), joy_choose_cbox);
//gtk_widget_set_size_request(joy_refresh, 64, 24);
keys_tree_clear_btn = gtk_button_new_with_label("Clear All");
g_signal_connect(GTK_OBJECT (keys_tree_clear_btn), "clicked", G_CALLBACK(on_clear_clicked), NULL);
gtk_widget_set_size_request(keys_tree_clear_btn, 64, 24);
@ -500,7 +544,7 @@ void DisplayDialog()
pad_choose_frame = gtk_frame_new ("Choose a Pad to modify:");
gtk_container_add (GTK_CONTAINER(pad_choose_frame), pad_choose_box);
joy_choose_box = gtk_vbox_new(false, 5);
joy_choose_box = gtk_hbox_new(false, 5);
joy_choose_frame = gtk_frame_new ("Joystick to use for this pad");
gtk_container_add (GTK_CONTAINER(joy_choose_frame), joy_choose_box);
@ -562,22 +606,22 @@ void DisplayDialog()
int options = (conf.options >> (16 * current_pad));
rev_lx_check = gtk_check_button_new_with_label("Reverse Lx");
gtk_fixed_put(GTK_FIXED(keys_static_area), rev_lx_check, static_offset + 40, 344);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_lx_check), (options & PADOPTION_REVERTLX));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_lx_check), (options & PADOPTION_REVERSELX));
g_signal_connect(GTK_OBJECT (rev_lx_check), "toggled", G_CALLBACK(on_rev_lx), NULL);
rev_ly_check = gtk_check_button_new_with_label("Reverse Ly");
gtk_fixed_put(GTK_FIXED(keys_static_area), rev_ly_check, static_offset + 40, 368);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ly_check), (options & PADOPTION_REVERTLY));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ly_check), (options & PADOPTION_REVERSELY));
g_signal_connect(GTK_OBJECT (rev_ly_check), "toggled", G_CALLBACK(on_rev_ly), NULL);
rev_rx_check = gtk_check_button_new_with_label("Reverse Rx");
gtk_fixed_put(GTK_FIXED(keys_static_area), rev_rx_check, static_offset + 368, 344);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_rx_check), (options & PADOPTION_REVERTRX));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_rx_check), (options & PADOPTION_REVERSERX));
g_signal_connect(GTK_OBJECT (rev_rx_check), "toggled", G_CALLBACK(on_rev_rx), NULL);
rev_ry_check = gtk_check_button_new_with_label("Reverse Ry");
gtk_fixed_put(GTK_FIXED(keys_static_area), rev_ry_check, static_offset + 368, 368);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ry_check), (options & PADOPTION_REVERTRY));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rev_ry_check), (options & PADOPTION_REVERSERY));
g_signal_connect(GTK_OBJECT (rev_ry_check), "toggled", G_CALLBACK(on_rev_ry), NULL);
keys_box = gtk_hbox_new(false, 5);
@ -589,8 +633,9 @@ void DisplayDialog()
gtk_box_pack_end (GTK_BOX (keys_btn_box), keys_tree_remove_btn, false, false, 0);
gtk_box_pack_end (GTK_BOX (keys_btn_box), keys_tree_modify_btn, false, false, 0);
gtk_container_add(GTK_CONTAINER(pad_choose_box), pad_choose_cbox);
gtk_container_add(GTK_CONTAINER(joy_choose_box), joy_choose_cbox);
gtk_container_add(GTK_CONTAINER(pad_choose_box), GTK_WIDGET(pad_choose_cbox));
gtk_container_add(GTK_CONTAINER(joy_choose_box), GTK_WIDGET(joy_choose_cbox));
//gtk_container_add(GTK_CONTAINER(joy_choose_box), joy_refresh);
gtk_container_add(GTK_CONTAINER(keys_tree_box), keys_btn_frame);
gtk_box_pack_start (GTK_BOX (keys_box), keys_tree_frame, true, true, 0);
gtk_container_add(GTK_CONTAINER(keys_box), keys_static_area);
@ -606,11 +651,7 @@ void DisplayDialog()
gtk_widget_show_all (dialog);
return_value = gtk_dialog_run (GTK_DIALOG (dialog));
if (return_value == GTK_RESPONSE_ACCEPT)
{
SaveConfig();
}
if (return_value == GTK_RESPONSE_ACCEPT) SaveConfig();
LoadConfig();
delete fir;

6
plugins/onepad/Linux/ini.cpp
View File

@ -19,15 +19,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <string.h>
#include <string.h>
#include <gtk/gtk.h>
#include <pthread.h>
#include "joystick.h"
#include "onepad.h"
#include "linux.h"
extern char* KeysymToChar(int keysym);
extern std::string s_strIniPath;
string KeyName(int pad, int key)
@ -116,7 +115,6 @@ void DefaultValues()
void SaveConfig()
{
FILE *f;
char cfg[255];
const std::string iniFile(s_strIniPath + "OnePAD.ini");
f = fopen(iniFile.c_str(), "w");

42
plugins/onepad/Linux/linux.cpp
View File

@ -19,9 +19,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "joystick.h"
#include "onepad.h"
#include <string.h>
#include <gtk/gtk.h>
#include "linux.h"
#include <gdk/gdkx.h>
extern void PollForKeyboardInput(int pad);
extern void SetAutoRepeat(bool autorep);
Display *GSdsp;
extern string KeyName(int pad, int key);
@ -96,37 +103,6 @@ void _PADclose()
s_vjoysticks.clear();
}
int _GetJoystickIdFromPAD(int pad)
{
// select the right joystick id
u32 joyid = -1;
for (int p = 0; p < MAX_SUB_KEYS; p++)
{
for (int i = 0; i < MAX_KEYS; ++i)
{
KeyType k = type_of_key(PadEnum[pad][p],i);
if (k == PAD_JOYSTICK || k == PAD_JOYBUTTONS)
{
joyid = key_to_joystick_id(PadEnum[pad][p],i);
return joyid;
}
}
}
if (!JoystickIdWithinBounds(joyid))
{
// get first unused joystick
for (joyid = 0; joyid < s_vjoysticks.size(); ++joyid)
{
if (s_vjoysticks[joyid]->GetPAD() < 0) break;
}
}
return joyid;
}
EXPORT_C_(void) PADupdate(int pad)
{
// Poll keyboard.
@ -174,7 +150,7 @@ EXPORT_C_(void) PADupdate(int pad)
}
case PAD_POV:
{
int value = SDL_JoystickGetAxis((pjoy)->GetJoy(), key_to_axis(cpad, i));
int value = pjoy->GetAxisFromKey(cpad, i);
PAD_LOG("%s: %d (%d)\n", KeyName(cpad, i).c_str(), value, key_to_pov_sign(cpad, i));
if (key_to_pov_sign(cpad, i) && (value < -2048))
@ -196,7 +172,7 @@ EXPORT_C_(void) PADupdate(int pad)
}
case PAD_JOYSTICK:
{
int value = SDL_JoystickGetAxis((pjoy)->GetJoy(), key_to_axis(cpad, i));
int value = pjoy->GetAxisFromKey(cpad, i);
switch (i)
{

18
plugins/onepad/Linux/linux.h
View File

@ -18,14 +18,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "joystick.h"
#include "keyboard.h"
#include "onepad.h"
#include <string.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <pthread.h>
//
//#include "joystick.h"
//#include "keyboard.h"
//#include "onepad.h"
//
//#include <string.h>
//#include <gtk/gtk.h>
//#include <gdk/gdkkeysyms.h>
//#include <pthread.h>
extern void DisplayDialog();

12
plugins/onepad/analog.cpp
View File

@ -96,24 +96,24 @@ namespace Analog
}
}
bool RevertPad(u8 index)
bool ReversePad(u8 index)
{
switch (index)
{
case PAD_LX:
return ((conf.options & PADOPTION_REVERTLX) != 0);
return ((conf.options & PADOPTION_REVERSELX) != 0);
break;
case PAD_RX:
return ((conf.options & PADOPTION_REVERTRX) != 0);
return ((conf.options & PADOPTION_REVERSERX) != 0);
break;
case PAD_LY:
return ((conf.options & PADOPTION_REVERTLY) != 0);
return ((conf.options & PADOPTION_REVERSELY) != 0);
break;
case PAD_RY:
return ((conf.options & PADOPTION_REVERTRY) != 0);
return ((conf.options & PADOPTION_REVERSERY) != 0);
break;
default:
@ -126,7 +126,7 @@ namespace Analog
{
Pad(pad, index);
SetPad(pad, index, value / 256);
if (RevertPad(index)) InvertPad(pad,index);
if (ReversePad(index)) InvertPad(pad,index);
SetPad(pad, index, Pad(pad, index) + 0x80);
}

2
plugins/onepad/analog.h
View File

@ -28,7 +28,7 @@
extern u8 Pad(int pad, u8 index);
extern void SetPad(u8 pad, int index, u8 value);
extern void InvertPad(u8 pad, int key);
extern bool RevertPad(u8 index);
extern bool ReversePad(u8 index);
extern void ResetPad( u8 pad, int key);
extern void ConfigurePad( u8 pad, int index, int value);
extern int KeypadToPad(u8 keypress);

5
plugins/onepad/joystick.cpp
View File

@ -307,3 +307,8 @@ bool JoystickInfo::PollHats(int &jbutton, int &dir, u32 &pkey)
}
return false;
}
int JoystickInfo::GetAxisFromKey(int pad, int index)
{
return SDL_JoystickGetAxis(GetJoy(), key_to_axis(pad, index));
}

2
plugins/onepad/joystick.h
View File

@ -133,7 +133,7 @@ class JoystickInfo
{
return joy;
}
int GetAxisFromKey(int pad, int index);
private:
string devname; // pretty device name

7
plugins/onepad/keyboard.cpp
View File

@ -23,9 +23,10 @@
* Theoretically, this header is for anything to do with keyboard input.
* Pragmatically, event handing's going in here too.
*/
#include "keyboard.h"
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "keyboard.h"
int FindKey(int key, int pad)
{

8
plugins/onepad/onepad.h
View File

@ -58,10 +58,10 @@ extern char libraryName[256];
enum PadOptions
{
PADOPTION_FORCEFEEDBACK = 0x1,
PADOPTION_REVERTLX = 0x2,
PADOPTION_REVERTLY = 0x4,
PADOPTION_REVERTRX = 0x8,
PADOPTION_REVERTRY = 0x10
PADOPTION_REVERSELX = 0x2,
PADOPTION_REVERSELY = 0x4,
PADOPTION_REVERSERX = 0x8,
PADOPTION_REVERSERY = 0x10
};
extern FILE *padLog;