mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update bundled glfw

Browse Source
This commit is contained in:
Kovid Goyal
2017-11-26 11:50:55 +05:30
parent 0296d1f9a2
commit fb41ecb2e5
12 changed files with 363 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
glfw/cocoa_joystick.m
View File

@@ -247,9 +247,9 @@ static void matchCallback(void* context,
compareElements, NULL);
js = _glfwAllocJoystick(name, guid,
CFArrayGetCount(axes),
CFArrayGetCount(buttons),
CFArrayGetCount(hats));
(int) CFArrayGetCount(axes),
(int) CFArrayGetCount(buttons),
(int) CFArrayGetCount(hats));
js->ns.device = device;
js->ns.axes = axes;
@@ -399,11 +399,11 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
const long delta = axis->maximum - axis->minimum;
if (delta == 0)
_glfwInputJoystickAxis(js, i, 0.f);
_glfwInputJoystickAxis(js, (int) i, 0.f);
else
{
const float value = (2.f * (raw - axis->minimum) / delta) - 1.f;
_glfwInputJoystickAxis(js, i, value);
_glfwInputJoystickAxis(js, (int) i, value);
}
}
}
@@ -417,7 +417,7 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
_GLFWjoyelementNS* button = (_GLFWjoyelementNS*)
CFArrayGetValueAtIndex(js->ns.buttons, i);
const char value = getElementValue(js, button) - button->minimum;
_glfwInputJoystickButton(js, i, value);
_glfwInputJoystickButton(js, (int) i, value);
}
for (i = 0; i < CFArrayGetCount(js->ns.hats); i++)
@@ -441,7 +441,7 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
if (state < 0 || state > 8)
state = 8;
_glfwInputJoystickHat(js, i, states[state]);
_glfwInputJoystickHat(js, (int) i, states[state]);
}
}