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

onepad: s/set_keyboad_key/set_keyboard_key/

This commit is contained in:
Gregory Hainaut 2017-05-02 22:29:45 +02:00
parent b9e62be3c1
commit d8f88ee1e3
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,7 +415,7 @@ void Dialog::config_key(int pad, int key)
// Note: key_pressed == 0 when ESC is hit to abort the capture // Note: key_pressed == 0 when ESC is hit to abort the capture
if (key_pressed > 0) { if (key_pressed > 0) {
clear_key(pad, key); clear_key(pad, key);
set_keyboad_key(pad, key_pressed, key); set_keyboard_key(pad, key_pressed, key);
m_simulatedKeys[pad][key] = key_pressed; m_simulatedKeys[pad][key] = key_pressed;
} }
captured = true; captured = true;

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

@ -62,20 +62,20 @@ string KeyName(int pad, int key, int keysym)
void DefaultKeyboardValues() void DefaultKeyboardValues()
{ {
set_keyboad_key(0, XK_a, PAD_L2); set_keyboard_key(0, XK_a, PAD_L2);
set_keyboad_key(0, XK_semicolon, PAD_R2); set_keyboard_key(0, XK_semicolon, PAD_R2);
set_keyboad_key(0, XK_w, PAD_L1); set_keyboard_key(0, XK_w, PAD_L1);
set_keyboad_key(0, XK_p, PAD_R1); set_keyboard_key(0, XK_p, PAD_R1);
set_keyboad_key(0, XK_i, PAD_TRIANGLE); set_keyboard_key(0, XK_i, PAD_TRIANGLE);
set_keyboad_key(0, XK_l, PAD_CIRCLE); set_keyboard_key(0, XK_l, PAD_CIRCLE);
set_keyboad_key(0, XK_k, PAD_CROSS); set_keyboard_key(0, XK_k, PAD_CROSS);
set_keyboad_key(0, XK_j, PAD_SQUARE); set_keyboard_key(0, XK_j, PAD_SQUARE);
set_keyboad_key(0, XK_v, PAD_SELECT); set_keyboard_key(0, XK_v, PAD_SELECT);
set_keyboad_key(0, XK_n, PAD_START); set_keyboard_key(0, XK_n, PAD_START);
set_keyboad_key(0, XK_e, PAD_UP); set_keyboard_key(0, XK_e, PAD_UP);
set_keyboad_key(0, XK_f, PAD_RIGHT); set_keyboard_key(0, XK_f, PAD_RIGHT);
set_keyboad_key(0, XK_d, PAD_DOWN); set_keyboard_key(0, XK_d, PAD_DOWN);
set_keyboad_key(0, XK_s, PAD_LEFT); set_keyboard_key(0, XK_s, PAD_LEFT);
} }
void SaveConfig() void SaveConfig()
@ -145,7 +145,7 @@ void LoadConfig()
u32 keysym; u32 keysym;
u32 index; u32 index;
while (fscanf(f, "PAD %u:KEYSYM 0x%x = %u\n", &pad, &keysym, &index) == 3) { while (fscanf(f, "PAD %u:KEYSYM 0x%x = %u\n", &pad, &keysym, &index) == 3) {
set_keyboad_key(pad & 1, keysym, index); set_keyboard_key(pad & 1, keysym, index);
if (pad == 0) if (pad == 0)
have_user_setting = true; have_user_setting = true;
} }

2
plugins/onepad/controller.cpp
View File

@ -22,7 +22,7 @@
#include "onepad.h" #include "onepad.h"
#include "controller.h" #include "controller.h"
__forceinline void set_keyboad_key(int pad, int keysym, int index) __forceinline void set_keyboard_key(int pad, int keysym, int index)
{ {
conf->keysym_map[pad][keysym] = index; conf->keysym_map[pad][keysym] = index;
} }

2
plugins/onepad/controller.h
View File

@ -23,7 +23,7 @@
#include <string.h> // for memset #include <string.h> // for memset
#define MAX_KEYS 24 #define MAX_KEYS 24
extern void set_keyboad_key(int pad, int keysym, int index); extern void set_keyboard_key(int pad, int keysym, int index);
extern int get_keyboard_key(int pad, int keysym); extern int get_keyboard_key(int pad, int keysym);
extern bool IsAnalogKey(int index); extern bool IsAnalogKey(int index);