Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-21 16:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed joystick state members.

Browse Source
This commit is contained in:
Camilla Berglund
2014-04-08 16:42:14 +02:00
parent eaf3bd5ca4
commit 48619a385e
6 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linux_joystick.c
+29 -29
View File
@@ -56,7 +56,7 @@ static int openJoystickDevice(int joy, const char* path)
if (fd == -1)
return GL_FALSE;
_glfw.joystick[joy].fd = fd;
_glfw.linux_js[joy].fd = fd;
// Verify that the joystick driver version is at least 1.0
ioctl(fd, JSIOCGVERSION, &version);
@@ -70,18 +70,18 @@ static int openJoystickDevice(int joy, const char* path)
if (ioctl(fd, JSIOCGNAME(sizeof(name)), name) < 0)
strncpy(name, "Unknown", sizeof(name));
_glfw.joystick[joy].name = strdup(name);
_glfw.linux_js[joy].name = strdup(name);
ioctl(fd, JSIOCGAXES, &axisCount);
_glfw.joystick[joy].axisCount = (int) axisCount;
_glfw.linux_js[joy].axisCount = (int) axisCount;
ioctl(fd, JSIOCGBUTTONS, &buttonCount);
_glfw.joystick[joy].buttonCount = (int) buttonCount;
_glfw.linux_js[joy].buttonCount = (int) buttonCount;
_glfw.joystick[joy].axes = calloc(axisCount, sizeof(float));
_glfw.joystick[joy].buttons = calloc(buttonCount, 1);
_glfw.linux_js[joy].axes = calloc(axisCount, sizeof(float));
_glfw.linux_js[joy].buttons = calloc(buttonCount, 1);
_glfw.joystick[joy].present = GL_TRUE;
_glfw.linux_js[joy].present = GL_TRUE;
#endif // __linux__
return GL_TRUE;
@@ -98,21 +98,21 @@ static void pollJoystickEvents(void)
for (i = 0; i <= GLFW_JOYSTICK_LAST; i++)
{
if (!_glfw.joystick[i].present)
if (!_glfw.linux_js[i].present)
continue;
// Read all queued events (non-blocking)
for (;;)
{
errno = 0;
result = read(_glfw.joystick[i].fd, &e, sizeof(e));
result = read(_glfw.linux_js[i].fd, &e, sizeof(e));
if (errno == ENODEV)
{
free(_glfw.joystick[i].axes);
free(_glfw.joystick[i].buttons);
free(_glfw.joystick[i].name);
_glfw.joystick[i].present = GL_FALSE;
free(_glfw.linux_js[i].axes);
free(_glfw.linux_js[i].buttons);
free(_glfw.linux_js[i].name);
_glfw.linux_js[i].present = GL_FALSE;
}
if (result == -1)
@@ -124,12 +124,12 @@ static void pollJoystickEvents(void)
switch (e.type)
{
case JS_EVENT_AXIS:
_glfw.joystick[i].axes[e.number] =
_glfw.linux_js[i].axes[e.number] =
(float) e.value / 32767.0f;
break;
case JS_EVENT_BUTTON:
_glfw.joystick[i].buttons[e.number] =
_glfw.linux_js[i].buttons[e.number] =
e.value ? GLFW_PRESS : GLFW_RELEASE;
break;
@@ -204,14 +204,14 @@ void _glfwTerminateJoysticks(void)
for (i = 0; i <= GLFW_JOYSTICK_LAST; i++)
{
if (_glfw.joystick[i].present)
if (_glfw.linux_js[i].present)
{
close(_glfw.joystick[i].fd);
free(_glfw.joystick[i].axes);
free(_glfw.joystick[i].buttons);
free(_glfw.joystick[i].name);
close(_glfw.linux_js[i].fd);
free(_glfw.linux_js[i].axes);
free(_glfw.linux_js[i].buttons);
free(_glfw.linux_js[i].name);
_glfw.joystick[i].present = GL_FALSE;
_glfw.linux_js[i].present = GL_FALSE;
}
}
#endif // __linux__
@@ -226,35 +226,35 @@ int _glfwPlatformJoystickPresent(int joy)
{
pollJoystickEvents();
return _glfw.joystick[joy].present;
return _glfw.linux_js[joy].present;
}
const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
{
pollJoystickEvents();
if (!_glfw.joystick[joy].present)
if (!_glfw.linux_js[joy].present)
return NULL;
*count = _glfw.joystick[joy].axisCount;
return _glfw.joystick[joy].axes;
*count = _glfw.linux_js[joy].axisCount;
return _glfw.linux_js[joy].axes;
}
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
{
pollJoystickEvents();
if (!_glfw.joystick[joy].present)
if (!_glfw.linux_js[joy].present)
return NULL;
*count = _glfw.joystick[joy].buttonCount;
return _glfw.joystick[joy].buttons;
*count = _glfw.linux_js[joy].buttonCount;
return _glfw.linux_js[joy].buttons;
}
const char* _glfwPlatformGetJoystickName(int joy)
{
pollJoystickEvents();
return _glfw.joystick[joy].name;
return _glfw.linux_js[joy].name;
}