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

evdev/dupcheck: Don't check unassigned buttons 

Also removes the trailing whitespaces.
This commit is contained in:
Christoph "baka0815" Schwerdtfeger 2018-08-13 13:10:59 +02:00
parent 989c0fa776
commit 7029af98a3
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/linux-dist/evdev.cpp
View File

@ -196,30 +196,34 @@
}; };
return mapping; return mapping;
} }
bool input_evdev_button_assigned(EvdevControllerMapping* mapping, int button) bool input_evdev_button_assigned(EvdevControllerMapping* mapping, int button)
{ {
return ((mapping->Btn_A == button) // Don't check unassigned buttons
|| (mapping->Btn_B == button) if (button == -1)
|| (mapping->Btn_C == button) return false;
|| (mapping->Btn_D == button)
|| (mapping->Btn_X == button) return ((mapping->Btn_A == button)
|| (mapping->Btn_Y == button) || (mapping->Btn_B == button)
|| (mapping->Btn_Z == button) || (mapping->Btn_C == button)
|| (mapping->Btn_Start == button) || (mapping->Btn_D == button)
|| (mapping->Btn_Escape == button) || (mapping->Btn_X == button)
|| (mapping->Btn_DPad_Left == button) || (mapping->Btn_Y == button)
|| (mapping->Btn_DPad_Right == button) || (mapping->Btn_Z == button)
|| (mapping->Btn_DPad_Up == button) || (mapping->Btn_Start == button)
|| (mapping->Btn_DPad_Down == button) || (mapping->Btn_Escape == button)
|| (mapping->Btn_DPad2_Left == button) || (mapping->Btn_DPad_Left == button)
|| (mapping->Btn_DPad2_Right == button) || (mapping->Btn_DPad_Right == button)
|| (mapping->Btn_DPad2_Up == button) || (mapping->Btn_DPad_Up == button)
|| (mapping->Btn_DPad2_Down == button) || (mapping->Btn_DPad_Down == button)
|| (mapping->Btn_Trigger_Left == button) || (mapping->Btn_DPad2_Left == button)
|| (mapping->Btn_DPad2_Right == button)
|| (mapping->Btn_DPad2_Up == button)
|| (mapping->Btn_DPad2_Down == button)
|| (mapping->Btn_Trigger_Left == button)
|| (mapping->Btn_Trigger_Right == button)); || (mapping->Btn_Trigger_Right == button));
} }
bool input_evdev_button_duplicate_button(EvdevControllerMapping* mapping1, EvdevControllerMapping* mapping2) bool input_evdev_button_duplicate_button(EvdevControllerMapping* mapping1, EvdevControllerMapping* mapping2)
{ {
return (input_evdev_button_assigned(mapping1, mapping2->Btn_A) return (input_evdev_button_assigned(mapping1, mapping2->Btn_A)