AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 19:38:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify joyb_names and mouseb_names arrays

Browse Source
This commit is contained in:
Roman Fomin 2024-05-25 12:08:21 +07:00
parent b468c19580
commit 9a88954c8e
1 changed files with 50 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/m_input.c
View File

@ -296,58 +296,50 @@ static const struct
{KEYP_PERIOD, "num." }, {KEYP_PERIOD, "num." },
}; };
static const struct static const char *joyb_names[] = {
{ [CONTROLLER_A] = "pada",
int joyb; [CONTROLLER_B] = "padb",
const char *name; [CONTROLLER_X] = "padx",
} joyb_names[] = { [CONTROLLER_Y] = "pady",
{CONTROLLER_A, "pada" }, [CONTROLLER_BACK] = "back",
{CONTROLLER_B, "padb" }, [CONTROLLER_GUIDE] = "guide",
{CONTROLLER_X, "padx" }, [CONTROLLER_START] = "start",
{CONTROLLER_Y, "pady" }, [CONTROLLER_LEFT_STICK] = "ls",
{CONTROLLER_BACK, "back" }, [CONTROLLER_RIGHT_STICK] = "rs",
{CONTROLLER_GUIDE, "guide" }, [CONTROLLER_LEFT_SHOULDER] = "lb",
{CONTROLLER_START, "start" }, [CONTROLLER_RIGHT_SHOULDER] = "rb",
{CONTROLLER_LEFT_STICK, "ls" }, [CONTROLLER_DPAD_UP] = "padup",
{CONTROLLER_RIGHT_STICK, "rs" }, [CONTROLLER_DPAD_DOWN] = "paddown",
{CONTROLLER_LEFT_SHOULDER, "lb" }, [CONTROLLER_DPAD_LEFT] = "padleft",
{CONTROLLER_RIGHT_SHOULDER, "rb" }, [CONTROLLER_DPAD_RIGHT] = "padright",
{CONTROLLER_DPAD_UP, "padup" }, [CONTROLLER_MISC1] = "misc1",
{CONTROLLER_DPAD_DOWN, "paddown" }, [CONTROLLER_PADDLE1] = "paddle1",
{CONTROLLER_DPAD_LEFT, "padleft" }, [CONTROLLER_PADDLE2] = "paddle2",
{CONTROLLER_DPAD_RIGHT, "padright"}, [CONTROLLER_PADDLE3] = "paddle3",
{CONTROLLER_MISC1, "misc1" }, [CONTROLLER_PADDLE4] = "paddle4",
{CONTROLLER_PADDLE1, "paddle1" }, [CONTROLLER_TOUCHPAD] = "touch",
{CONTROLLER_PADDLE2, "paddle2" }, [CONTROLLER_LEFT_TRIGGER] = "lt",
{CONTROLLER_PADDLE3, "paddle3" }, [CONTROLLER_RIGHT_TRIGGER] = "rt",
{CONTROLLER_PADDLE4, "paddle4" }, [CONTROLLER_LEFT_STICK_UP] = "lsup",
{CONTROLLER_TOUCHPAD, "touch" }, [CONTROLLER_LEFT_STICK_DOWN] = "lsdown",
{CONTROLLER_LEFT_TRIGGER, "lt" }, [CONTROLLER_LEFT_STICK_LEFT] = "lsleft",
{CONTROLLER_RIGHT_TRIGGER, "rt" }, [CONTROLLER_LEFT_STICK_RIGHT] = "lsright",
{CONTROLLER_LEFT_STICK_UP, "lsup" }, [CONTROLLER_RIGHT_STICK_UP] = "rsup",
{CONTROLLER_LEFT_STICK_DOWN, "lsdown" }, [CONTROLLER_RIGHT_STICK_DOWN] = "rsdown",
{CONTROLLER_LEFT_STICK_LEFT, "lsleft" }, [CONTROLLER_RIGHT_STICK_LEFT] = "rsleft",
{CONTROLLER_LEFT_STICK_RIGHT, "lsright" }, [CONTROLLER_RIGHT_STICK_RIGHT] = "rsright",
{CONTROLLER_RIGHT_STICK_UP, "rsup" },
{CONTROLLER_RIGHT_STICK_DOWN, "rsdown" },
{CONTROLLER_RIGHT_STICK_LEFT, "rsleft" },
{CONTROLLER_RIGHT_STICK_RIGHT, "rsright" },
}; };
static const struct static const char *mouseb_names[] = {
{ [MOUSE_BUTTON_LEFT] = "mouse1",
int mouseb; [MOUSE_BUTTON_RIGHT] = "mouse2",
const char *name; [MOUSE_BUTTON_MIDDLE] = "mouse3",
} mouseb_names[] = { [MOUSE_BUTTON_X1] = "mouse4",
{MOUSE_BUTTON_LEFT, "mouse1" }, [MOUSE_BUTTON_X2] = "mouse5",
{MOUSE_BUTTON_RIGHT, "mouse2" }, [MOUSE_BUTTON_WHEELUP] = "wheelup",
{MOUSE_BUTTON_MIDDLE, "mouse3" }, [MOUSE_BUTTON_WHEELDOWN] = "wheeldown",
{MOUSE_BUTTON_X1, "mouse4" }, [MOUSE_BUTTON_WHEELLEFT] = "wheelleft",
{MOUSE_BUTTON_X2, "mouse5" }, [MOUSE_BUTTON_WHEELRIGHT] = "wheelright",
{MOUSE_BUTTON_WHEELUP, "wheelup" },
{MOUSE_BUTTON_WHEELDOWN, "wheeldown" },
{MOUSE_BUTTON_WHEELLEFT, "wheelleft" },
{MOUSE_BUTTON_WHEELRIGHT, "wheelright"},
}; };
const char *M_GetNameForKey(int key) const char *M_GetNameForKey(int key)
@ -376,12 +368,9 @@ int M_GetKeyForName(const char *name)
const char *M_GetNameForJoyB(int joyb) const char *M_GetNameForJoyB(int joyb)
{ {
for (int i = 0; i < arrlen(joyb_names); ++i) if (joyb >= 0 && joyb < arrlen(joyb_names))
{ {
if (joyb_names[i].joyb == joyb) return joyb_names[joyb];
{
return joyb_names[i].name;
}
} }
return NULL; return NULL;
} }
@ -390,9 +379,9 @@ int M_GetJoyBForName(const char *name)
{ {
for (int i = 0; i < arrlen(joyb_names); ++i) for (int i = 0; i < arrlen(joyb_names); ++i)
{ {
if (strcasecmp(name, joyb_names[i].name) == 0) if (strcasecmp(name, joyb_names[i]) == 0)
{ {
return joyb_names[i].joyb; return i;
} }
} }
return -1; return -1;
@ -400,12 +389,9 @@ int M_GetJoyBForName(const char *name)
const char *M_GetNameForMouseB(int mouseb) const char *M_GetNameForMouseB(int mouseb)
{ {
for (int i = 0; i < arrlen(mouseb_names); ++i) if (mouseb >= 0 && mouseb < arrlen(mouseb_names))
{ {
if (mouseb_names[i].mouseb == mouseb) return mouseb_names[mouseb];
{
return mouseb_names[i].name;
}
} }
return NULL; return NULL;
} }
@ -414,9 +400,9 @@ int M_GetMouseBForName(const char *name)
{ {
for (int i = 0; i < arrlen(mouseb_names); ++i) for (int i = 0; i < arrlen(mouseb_names); ++i)
{ {
if (strcasecmp(name, mouseb_names[i].name) == 0) if (strcasecmp(name, mouseb_names[i]) == 0)
{ {
return mouseb_names[i].mouseb; return i;
} }
} }
return -1; return -1;