piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

nJoy:

Browse Source 
- Enabled Half press for shoulder buttons
- Added a option to select controller type
- Normal controllers should use the default joystick
- Some joysticks dont have a real hat (POV) but fake this with buttons.
In this case Joystick (no hat) should be selected.
After this is selected, four new buttons will appear for the d-pad.
- Next version will probably include keyboard support.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@60 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Laurence Muller
2008-07-23 00:49:20 +00:00
parent a3bae5f132
commit f9582bef30
6 changed files with 227 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Plugins/Plugin_nJoy_SDL/Res/Plugin_nJoy_SDL.rc
View File

@ -56,7 +56,7 @@ IDD_CONFIG DIALOGEX 0, 0, 411, 282
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
COMBOBOX IDC_JOYNAME,8,18,317,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_JOYNAME,8,18,317,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Controller:",IDC_STATIC,3,7,405,28
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,65,46,281,187
CONTROL "Controller attached",IDC_JOYATTACH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,330,19,73,10
@ -90,12 +90,25 @@ BEGIN
LTEXT "Y-axis",IDC_STATIC,368,229,20,8
PUSHBUTTON "",IDC_SY,351,240,15,10,0,WS_EX_STATICEDGE
PUSHBUTTON "",IDC_MY,46,158,15,10,0,WS_EX_STATICEDGE
GROUPBOX "Extra settings",IDC_STATIC,3,236,95,43
LTEXT "Deadzone",IDC_STATIC,11,248,33,8
LTEXT "Half press",IDC_STATIC,11,263,33,8
COMBOBOX IDC_DEADZONE,45,246,48,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_HALFPRESS,45,261,48,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Extra settings:",IDC_STATIC,69,236,103,43
LTEXT "Deadzone",IDC_STATIC,77,248,33,8
LTEXT "Half press",IDC_STATIC,77,263,33,8
COMBOBOX IDC_DEADZONE,111,246,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "www.multigesture.net",IDC_STATIC,336,271,72,8
COMBOBOX IDC_CONTROLTYPE,244,247,87,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Controller type:",IDC_STATIC,239,236,95,27
PUSHBUTTON "",IDC_DPAD_DOWN,46,205,15,10,0,WS_EX_STATICEDGE
CTEXT "",IDTEXT_DPAD_DOWN,4,205,40,12,WS_BORDER
PUSHBUTTON "",IDC_DPAD_LEFT,45,228,15,10,0,WS_EX_STATICEDGE
CTEXT "",IDTEXT_DPAD_LEFT,3,227,40,12,WS_BORDER
PUSHBUTTON "",IDC_DPAD_RIGHT,45,251,15,10,0,WS_EX_STATICEDGE
CTEXT "",IDTEXT_DPAD_RIGHT,3,250,40,12,WS_BORDER
LTEXT "Up",IDC_DPAD_TEXT1,4,172,10,8
LTEXT "Down",IDC_DPAD_TEXT2,4,195,19,8
LTEXT "Left",IDC_DPAD_TEXT3,4,217,14,8
LTEXT "Right",IDC_DPAD_TEXT4,4,240,18,8
PUSHBUTTON "",IDC_HALFPRESS,153,263,15,10,0,WS_EX_STATICEDGE
CTEXT "",IDTEXT_HALFPRESS,111,261,40,12,WS_BORDER
END
IDD_ABOUT DIALOGEX 0, 0, 133, 227
@ -141,6 +154,24 @@ END
IDB_BITMAP1 BITMAP "controller.bmp"
IDB_BITMAP2 BITMAP "njoy.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog Info
//
IDD_CONFIG DLGINIT
BEGIN
IDC_CONTROLTYPE, 0x403, 9, 0
0x6f4a, 0x7379, 0x6974, 0x6b63, "\000"
IDC_CONTROLTYPE, 0x403, 18, 0
0x6f4a, 0x7379, 0x6974, 0x6b63, 0x2820, 0x6f6e, 0x6820, 0x7461, 0x0029,
IDC_CONTROLTYPE, 0x403, 9, 0
0x654b, 0x6279, 0x616f, 0x6472, "\000"
0
END
#endif // Dutch (Netherlands) resources
/////////////////////////////////////////////////////////////////////////////

30
Source/Plugins/Plugin_nJoy_SDL/Res/resource.h
View File

@ -8,7 +8,6 @@
#define IDB_BITMAP2 104
#define IDC_JOYNAME 1001
#define IDC_JOYATTACH 1002
#define IDC_SHOULDERL 1010
#define IDC_SHOULDERR 1011
#define IDC_A 1012
@ -17,16 +16,24 @@
#define IDC_Y 1015
#define IDC_Z 1016
#define IDC_START 1017
#define IDC_DPAD 1018
#define IDC_MX 1019
#define IDC_MY 1020
#define IDC_SX 1021
#define IDC_SY 1022
#define IDC_DEADZONE 1023
#define IDC_HALFPRESS 1024
#define IDC_DPAD_DOWN 1025
#define IDC_DPAD_LEFT 1026
#define IDC_DPAD_RIGHT 1027
#define IDC_ABOUT_TEXT 1032
#define IDC_ABOUT_TEXT2 1033
#define IDC_ABOUT_TEXT3 1034
#define IDC_CONTROLTYPE 1036
#define IDC_DPAD_TEXT1 1037
#define IDC_DPAD_TEXT2 1038
#define IDC_DPAD_TEXT3 1039
#define IDC_DPAD_TEXT4 1040
#define IDTEXT_SHOULDERL 2010
#define IDTEXT_SHOULDERR 2011
#define IDTEXT_A 2012
@ -35,26 +42,23 @@
#define IDTEXT_Y 2015
#define IDTEXT_Z 2016
#define IDTEXT_START 2017
#define IDTEXT_DPAD 2018
#define IDTEXT_MX 2019
#define IDTEXT_MY 2020
#define IDTEXT_SX 2021
#define IDTEXT_SY 2022
#define IDC_ABOUT_TEXT 1032
#define IDC_ABOUT_TEXT2 1033
#define IDC_ABOUT_TEXT3 1034
#define IDTEXT_HALFPRESS 2024
#define IDTEXT_DPAD_DOWN 2025
#define IDTEXT_DPAD_LEFT 2026
#define IDTEXT_DPAD_RIGHT 2027
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 105
#define _APS_NEXT_RESOURCE_VALUE 106
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1036
#define _APS_NEXT_CONTROL_VALUE 1041
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif