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

Fix up Linux, as well as make a few minor changes to onepad. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2196 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-14 09:02:10 +00:00
parent 848269fc22
commit 7c0d91ce86
9 changed files with 12 additions and 2244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/include/Utilities/pxRadioPanel.h
View File

@ -18,6 +18,7 @@
#include <wx/wx.h> #include <wx/wx.h>
#include "SafeArray.h" #include "SafeArray.h"
#include "wxGuiTools.h" #include "wxGuiTools.h"
#include <vector>
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// RadioPanelItem // RadioPanelItem
@ -174,5 +175,5 @@ public:
protected: protected:
void Init( const RadioPanelItem* srcArray=NULL, int arrsize=0 ); void Init( const RadioPanelItem* srcArray=NULL, int arrsize=0 );
void pxRadioPanel::_setToolTipImmediate( int idx, const wxString &tip ); void _setToolTipImmediate( int idx, const wxString &tip );
}; };

2
pcsx2/gui/wxHelpers.cpp
View File

@ -175,7 +175,7 @@ void wxDialogWithHelpers::AddOkCancel( wxSizer &sizer, bool hasApply )
// create a sizer to hold the help and ok/cancel buttons, for platforms // create a sizer to hold the help and ok/cancel buttons, for platforms
// that need a custom help icon. [fixme: help icon prolly better off somewhere else] // that need a custom help icon. [fixme: help icon prolly better off somewhere else]
buttonSizer = new wxBoxSizer( wxHORIZONTAL ); buttonSizer = new wxBoxSizer( wxHORIZONTAL );
buttonSizer->Add( new wxContextHelpButton(this), wxHelpers::pxSizerFlags::StdButton().Align( wxALIGN_LEFT ) ); buttonSizer->Add( new wxContextHelpButton(this), pxSizerFlags::StdButton().Align( wxALIGN_LEFT ) );
sizer.Add( buttonSizer, wxSizerFlags().Center() ); sizer.Add( buttonSizer, wxSizerFlags().Center() );
#endif #endif
} }

2230
plugins/onepad/Linux/OnePad.depend
View File

File diff suppressed because it is too large Load Diff

3
plugins/onepad/Linux/gui.cpp
View File

@ -106,9 +106,6 @@ void create_a_column(GtkWidget *view, const char *name, int num, bool visible)
void create_columns(GtkWidget *view) void create_columns(GtkWidget *view)
{ {
GtkCellRenderer *renderer;
GtkTreeViewColumn *col;
if (!has_columns) if (!has_columns)
{ {
create_a_column(view, "Pad #", COL_PAD, true); create_a_column(view, "Pad #", COL_PAD, true);

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

@ -63,7 +63,7 @@ void _PADclose()
int _GetJoystickIdFromPAD(int pad) int _GetJoystickIdFromPAD(int pad)
{ {
// select the right joystick id // select the right joystick id
int joyid = -1; u32 joyid = -1;
for (int p = 0; p < MAX_SUB_KEYS; p++) for (int p = 0; p < MAX_SUB_KEYS; p++)
{ {

2
plugins/onepad/analog.cpp
View File

@ -124,7 +124,7 @@ namespace Analog
void ConfigurePad( u8 pad, int index, int value) void ConfigurePad( u8 pad, int index, int value)
{ {
int temp = Pad(pad, index); Pad(pad, index);
SetPad(pad, index, value / 256); SetPad(pad, index, value / 256);
if (RevertPad(index)) InvertPad(pad,index); if (RevertPad(index)) InvertPad(pad,index);
SetPad(pad, index, Pad(pad, index) + 0x80); SetPad(pad, index, Pad(pad, index) + 0x80);

2
plugins/onepad/controller.cpp
View File

@ -24,7 +24,7 @@
HatPins hat_position = {false, false, false, false}; HatPins hat_position = {false, false, false, false};
__forceinline int set_key(int pad, int index, int value) __forceinline void set_key(int pad, int index, int value)
{ {
conf.keys[pad][index] = value; conf.keys[pad][index] = value;
} }

2
plugins/onepad/controller.h
View File

@ -44,7 +44,7 @@ enum KeyType
PAD_NULL = -1 PAD_NULL = -1
}; };
extern int set_key(int pad, int index, int value); extern void set_key(int pad, int index, int value);
extern int get_key(int pad, int index); extern int get_key(int pad, int index);
extern KeyType type_of_key(int pad, int index); extern KeyType type_of_key(int pad, int index);

6
plugins/onepad/onepad.cpp
View File

@ -364,7 +364,7 @@ EXPORT_C_(u8) PADstartPoll(int pad)
u8 _PADpoll(u8 value) u8 _PADpoll(u8 value)
{ {
u8 button_check = 0, button_check2 = 0; u8 button_check = 0;
const int avg_pressure = (pressure * 255) / 100; const int avg_pressure = (pressure * 255) / 100;
if (curByte == 0) if (curByte == 0)
@ -402,7 +402,7 @@ u8 _PADpoll(u8 value)
else else
cmdLen = 4; cmdLen = 4;
button_check2 = stdpar[curPad][2] >> 4; button_check = stdpar[curPad][2] >> 4;
switch (stdpar[curPad][3]) switch (stdpar[curPad][3])
{ {
case 0xBF: // X case 0xBF: // X
@ -448,7 +448,7 @@ u8 _PADpoll(u8 value)
stdpar[curPad][19] = 0x00; // Not pressed stdpar[curPad][19] = 0x00; // Not pressed
break; break;
} }
switch (button_check2) switch (button_check)
{ {
case 0xE: // UP case 0xE: // UP
stdpar[curPad][10] = avg_pressure; stdpar[curPad][10] = avg_pressure;