Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Added 'any' modifier to always work.

Browse Source
This commit is contained in:
Allanis 2014-03-15 19:58:03 +00:00
parent 1a8c08c4c2
commit af0ad658c2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf.c
View File

@ -270,7 +270,7 @@ int conf_loadConfig(const char* file) {
/* Set modifier, probably should be able to handle two at a time. */ /* Set modifier, probably should be able to handle two at a time. */
if(mod != NULL) { if(mod != NULL) {
if(strcmp(mod, "lctrl") ==0) m = KMOD_LCTRL; if(strcmp(mod, "lctrl") ==0) m = KMOD_LCTRL;
else if(strcmp(mod, "rctrl") ==0) m = KMOD_RCTRL; else if(strcmp(mod, "rctrl") ==0) m = KMOD_RCTRL;
else if(strcmp(mod, "lshift") ==0) m = KMOD_LSHIFT; else if(strcmp(mod, "lshift") ==0) m = KMOD_LSHIFT;
else if(strcmp(mod, "rshift") ==0) m = KMOD_RSHIFT; else if(strcmp(mod, "rshift") ==0) m = KMOD_RSHIFT;
@ -278,6 +278,7 @@ int conf_loadConfig(const char* file) {
else if(strcmp(mod, "ralt") ==0) m = KMOD_RALT; else if(strcmp(mod, "ralt") ==0) m = KMOD_RALT;
else if(strcmp(mod, "lmeta") ==0) m = KMOD_LMETA; else if(strcmp(mod, "lmeta") ==0) m = KMOD_LMETA;
else if(strcmp(mod, "rmeta") ==0) m = KMOD_RMETA; else if(strcmp(mod, "rmeta") ==0) m = KMOD_RMETA;
else if(strcmp(mod, "any") ==0) m = KMOD_ALL;
else { else {
WARN("Unkown keybinding mod of type %s", mod); WARN("Unkown keybinding mod of type %s", mod);
m = KMOD_NONE; m = KMOD_NONE;

2
src/input.c
View File

@ -227,7 +227,7 @@ int input_getKeybind(char* keybind, KeybindType* type, SDLMod* mod, int* reverse
} }
/** /**
* * @brief Get the description of the keybinding
*/ */
const char* input_getKeybindDescription(char* keybind) { const char* input_getKeybindDescription(char* keybind) {
int i; int i;