mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
e1bbda1e18
Looking at the old code for the ButtonManager was a brainfsck. This fixes a ton of bugs I kept uncovering as I was moving along. Fixes the gamepad configuration file being incorrect. No longer treats touchscreen in a special way. Ends up as a regular device with a "Touchscreen" device name. Was incorrectly converting a index from integer to ButtonType. Wouldn't work due to the addition of some unused(in JNI) enumerators in ButtonType. Fixes an issue where a map had a key as an axis which was causing its binding to be overwritten for every axis that was used twice (eg main stick left and right); Fixes Triggers not working at all. Fixes DPad not working at all. Fixes C-Stick only half working. Removes touch screen specific nativelibrary types onTouchAxisEvent and onTouchEvent. Adds a configuration version configuration option. Allows easy configuration overwriting if the options need to be changed during updating. Supersedes github PR #291.
105 lines
2.6 KiB
INI
105 lines
2.6 KiB
INI
[GCPad1]
|
|
Device = Android/0/Touchscreen
|
|
Buttons/A = `Button 0`
|
|
Buttons/B = `Button 1`
|
|
Buttons/X = `Button 3`
|
|
Buttons/Y = `Button 4`
|
|
Buttons/Z = `Button 5`
|
|
Buttons/Start = `Button 2`
|
|
Main Stick/Up = `Axis 11`
|
|
Main Stick/Down = `Axis 12`
|
|
Main Stick/Left = `Axis 13`
|
|
Main Stick/Right = `Axis 14`
|
|
Main Stick/Modifier = Shift_L
|
|
Main Stick/Modifier/Range = 50.000000
|
|
C-Stick/Up = `Axis 16`
|
|
C-Stick/Down = `Axis 17`
|
|
C-Stick/Left = `Axis 18`
|
|
C-Stick/Right = `Axis 19`
|
|
C-Stick/Modifier = Control_L
|
|
C-Stick/Modifier/Range = 50.000000
|
|
Triggers/L = `Axis 20`
|
|
Triggers/R = `Axis 21`
|
|
D-Pad/Up = `Button 6`
|
|
D-Pad/Down = `Button 7`
|
|
D-Pad/Left = `Button 8`
|
|
D-Pad/Right = `Button 9`
|
|
[GCPad2]
|
|
Device = Android/1/Touchscreen
|
|
Buttons/A = `Button 0`
|
|
Buttons/B = `Button 1`
|
|
Buttons/X = `Button 3`
|
|
Buttons/Y = `Button 4`
|
|
Buttons/Z = `Button 5`
|
|
Buttons/Start = `Button 2`
|
|
Main Stick/Up = `Axis 11`
|
|
Main Stick/Down = `Axis 12`
|
|
Main Stick/Left = `Axis 13`
|
|
Main Stick/Right = `Axis 14`
|
|
Main Stick/Modifier = Shift_L
|
|
Main Stick/Modifier/Range = 50.000000
|
|
C-Stick/Up = `Axis 16`
|
|
C-Stick/Down = `Axis 17`
|
|
C-Stick/Left = `Axis 18`
|
|
C-Stick/Right = `Axis 19`
|
|
C-Stick/Modifier = Control_L
|
|
C-Stick/Modifier/Range = 50.000000
|
|
Triggers/L = `Axis 20`
|
|
Triggers/R = `Axis 21`
|
|
D-Pad/Up = `Button 6`
|
|
D-Pad/Down = `Button 7`
|
|
D-Pad/Left = `Button 8`
|
|
D-Pad/Right = `Button 9`
|
|
[GCPad3]
|
|
Device = Android/2/Touchscreen
|
|
Buttons/A = `Button 0`
|
|
Buttons/B = `Button 1`
|
|
Buttons/X = `Button 3`
|
|
Buttons/Y = `Button 4`
|
|
Buttons/Z = `Button 5`
|
|
Buttons/Start = `Button 2`
|
|
Main Stick/Up = `Axis 11`
|
|
Main Stick/Down = `Axis 12`
|
|
Main Stick/Left = `Axis 13`
|
|
Main Stick/Right = `Axis 14`
|
|
Main Stick/Modifier = Shift_L
|
|
Main Stick/Modifier/Range = 50.000000
|
|
C-Stick/Up = `Axis 16`
|
|
C-Stick/Down = `Axis 17`
|
|
C-Stick/Left = `Axis 18`
|
|
C-Stick/Right = `Axis 19`
|
|
C-Stick/Modifier = Control_L
|
|
C-Stick/Modifier/Range = 50.000000
|
|
Triggers/L = `Axis 20`
|
|
Triggers/R = `Axis 21`
|
|
D-Pad/Up = `Button 6`
|
|
D-Pad/Down = `Button 7`
|
|
D-Pad/Left = `Button 8`
|
|
D-Pad/Right = `Button 9`
|
|
[GCPad4]
|
|
Device = Android/3/Touchscreen
|
|
Buttons/A = `Button 0`
|
|
Buttons/B = `Button 1`
|
|
Buttons/X = `Button 3`
|
|
Buttons/Y = `Button 4`
|
|
Buttons/Z = `Button 5`
|
|
Buttons/Start = `Button 2`
|
|
Main Stick/Up = `Axis 11`
|
|
Main Stick/Down = `Axis 12`
|
|
Main Stick/Left = `Axis 13`
|
|
Main Stick/Right = `Axis 14`
|
|
Main Stick/Modifier = Shift_L
|
|
Main Stick/Modifier/Range = 50.000000
|
|
C-Stick/Up = `Axis 16`
|
|
C-Stick/Down = `Axis 17`
|
|
C-Stick/Left = `Axis 18`
|
|
C-Stick/Right = `Axis 19`
|
|
C-Stick/Modifier = Control_L
|
|
C-Stick/Modifier/Range = 50.000000
|
|
Triggers/L = `Axis 20`
|
|
Triggers/R = `Axis 21`
|
|
D-Pad/Up = `Button 6`
|
|
D-Pad/Down = `Button 7`
|
|
D-Pad/Left = `Button 8`
|
|
D-Pad/Right = `Button 9`
|