From 0fcbaeb596822e8444fc5e3f9019673daac59763 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Tue, 6 Jan 2015 01:23:10 +0100 Subject: [PATCH] Fixed broken Mir and Wayland builds. Fixes #411. --- src/linux_joystick.c | 98 ++++++++++++++++++++++---------------------- src/linux_joystick.h | 31 +++++++++----- src/mir_window.c | 6 +++ src/wl_window.c | 6 +++ src/x11_platform.h | 9 ---- 5 files changed, 82 insertions(+), 68 deletions(-) diff --git a/src/linux_joystick.c b/src/linux_joystick.c index c93184eb..486124ed 100644 --- a/src/linux_joystick.c +++ b/src/linux_joystick.c @@ -54,16 +54,16 @@ static void openJoystickDevice(const char* path) for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++) { - if (!_glfw.linux_js[joy].present) + if (!_glfw.linux_js.js[joy].present) continue; - if (strcmp(_glfw.linux_js[joy].path, path) == 0) + if (strcmp(_glfw.linux_js.js[joy].path, path) == 0) return; } for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++) { - if (!_glfw.linux_js[joy].present) + if (!_glfw.linux_js.js[joy].present) break; } @@ -74,7 +74,7 @@ static void openJoystickDevice(const char* path) if (fd == -1) return; - _glfw.linux_js[joy].fd = fd; + _glfw.linux_js.js[joy].fd = fd; // Verify that the joystick driver version is at least 1.0 ioctl(fd, JSIOCGVERSION, &version); @@ -88,19 +88,19 @@ static void openJoystickDevice(const char* path) if (ioctl(fd, JSIOCGNAME(sizeof(name)), name) < 0) strncpy(name, "Unknown", sizeof(name)); - _glfw.linux_js[joy].name = strdup(name); - _glfw.linux_js[joy].path = strdup(path); + _glfw.linux_js.js[joy].name = strdup(name); + _glfw.linux_js.js[joy].path = strdup(path); ioctl(fd, JSIOCGAXES, &axisCount); - _glfw.linux_js[joy].axisCount = (int) axisCount; + _glfw.linux_js.js[joy].axisCount = (int) axisCount; ioctl(fd, JSIOCGBUTTONS, &buttonCount); - _glfw.linux_js[joy].buttonCount = (int) buttonCount; + _glfw.linux_js.js[joy].buttonCount = (int) buttonCount; - _glfw.linux_js[joy].axes = calloc(axisCount, sizeof(float)); - _glfw.linux_js[joy].buttons = calloc(buttonCount, 1); + _glfw.linux_js.js[joy].axes = calloc(axisCount, sizeof(float)); + _glfw.linux_js.js[joy].buttons = calloc(buttonCount, 1); - _glfw.linux_js[joy].present = GL_TRUE; + _glfw.linux_js.js[joy].present = GL_TRUE; #endif // __linux__ } @@ -114,14 +114,14 @@ static void pollJoystickEvents(void) ssize_t offset = 0; char buffer[16384]; - const ssize_t size = read(_glfw.x11.inotify.fd, buffer, sizeof(buffer)); + const ssize_t size = read(_glfw.linux_js.inotify, buffer, sizeof(buffer)); while (size > offset) { regmatch_t match; const struct inotify_event* e = (struct inotify_event*) (buffer + offset); - if (regexec(&_glfw.x11.inotify.regex, e->name, 1, &match, 0) == 0) + if (regexec(&_glfw.linux_js.regex, e->name, 1, &match, 0) == 0) { char path[20]; snprintf(path, sizeof(path), "/dev/input/%s", e->name); @@ -133,25 +133,25 @@ static void pollJoystickEvents(void) for (i = 0; i <= GLFW_JOYSTICK_LAST; i++) { - if (!_glfw.linux_js[i].present) + if (!_glfw.linux_js.js[i].present) continue; // Read all queued events (non-blocking) for (;;) { errno = 0; - if (read(_glfw.linux_js[i].fd, &e, sizeof(e)) < 0) + if (read(_glfw.linux_js.js[i].fd, &e, sizeof(e)) < 0) { if (errno == ENODEV) { // The joystick was disconnected - free(_glfw.linux_js[i].axes); - free(_glfw.linux_js[i].buttons); - free(_glfw.linux_js[i].name); - free(_glfw.linux_js[i].path); + free(_glfw.linux_js.js[i].axes); + free(_glfw.linux_js.js[i].buttons); + free(_glfw.linux_js.js[i].name); + free(_glfw.linux_js.js[i].path); - memset(&_glfw.linux_js[i], 0, sizeof(_glfw.linux_js[i])); + memset(&_glfw.linux_js.js[i], 0, sizeof(_glfw.linux_js.js[i])); } break; @@ -163,12 +163,12 @@ static void pollJoystickEvents(void) switch (e.type) { case JS_EVENT_AXIS: - _glfw.linux_js[i].axes[e.number] = + _glfw.linux_js.js[i].axes[e.number] = (float) e.value / 32767.0f; break; case JS_EVENT_BUTTON: - _glfw.linux_js[i].buttons[e.number] = + _glfw.linux_js.js[i].buttons[e.number] = e.value ? GLFW_PRESS : GLFW_RELEASE; break; @@ -194,36 +194,36 @@ int _glfwInitJoysticks(void) DIR* dir; struct dirent* entry; - _glfw.x11.inotify.fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC); - if (_glfw.x11.inotify.fd == -1) + _glfw.linux_js.inotify = inotify_init1(IN_NONBLOCK | IN_CLOEXEC); + if (_glfw.linux_js.inotify == -1) { - _glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to initialize inotify"); + _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to initialize inotify"); return GL_FALSE; } // HACK: Register for IN_ATTRIB as well to get notified when udev is done // This works well in practice but the true way is libudev - _glfw.x11.inotify.wd = inotify_add_watch(_glfw.x11.inotify.fd, + _glfw.linux_js.watch = inotify_add_watch(_glfw.linux_js.inotify, dirname, IN_CREATE | IN_ATTRIB); - if (_glfw.x11.inotify.wd == -1) + if (_glfw.linux_js.watch == -1) { _glfwInputError(GLFW_PLATFORM_ERROR, - "X11: Failed to add watch to %s", dirname); + "Linux: Failed to add watch to %s", dirname); return GL_FALSE; } - if (regcomp(&_glfw.x11.inotify.regex, "^js[0-9]\\+$", 0) != 0) + if (regcomp(&_glfw.linux_js.regex, "^js[0-9]\\+$", 0) != 0) { - _glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to compile regex"); + _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex"); return GL_FALSE; } dir = opendir(dirname); if (!dir) { - _glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to open %s", dirname); + _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to open %s", dirname); return GL_FALSE; } @@ -232,7 +232,7 @@ int _glfwInitJoysticks(void) char path[20]; regmatch_t match; - if (regexec(&_glfw.x11.inotify.regex, entry->d_name, 1, &match, 0) != 0) + if (regexec(&_glfw.linux_js.regex, entry->d_name, 1, &match, 0) != 0) continue; snprintf(path, sizeof(path), "%s/%s", dirname, entry->d_name); @@ -254,23 +254,23 @@ void _glfwTerminateJoysticks(void) for (i = 0; i <= GLFW_JOYSTICK_LAST; i++) { - if (_glfw.linux_js[i].present) + if (_glfw.linux_js.js[i].present) { - close(_glfw.linux_js[i].fd); - free(_glfw.linux_js[i].axes); - free(_glfw.linux_js[i].buttons); - free(_glfw.linux_js[i].name); - free(_glfw.linux_js[i].path); + close(_glfw.linux_js.js[i].fd); + free(_glfw.linux_js.js[i].axes); + free(_glfw.linux_js.js[i].buttons); + free(_glfw.linux_js.js[i].name); + free(_glfw.linux_js.js[i].path); } } - regfree(&_glfw.x11.inotify.regex); + regfree(&_glfw.linux_js.regex); - if (_glfw.x11.inotify.wd > 0) - close(_glfw.x11.inotify.wd); + if (_glfw.linux_js.watch > 0) + close(_glfw.linux_js.watch); - if (_glfw.x11.inotify.fd > 0) - close(_glfw.x11.inotify.fd); + if (_glfw.linux_js.inotify > 0) + close(_glfw.linux_js.inotify); #endif // __linux__ } @@ -283,29 +283,29 @@ int _glfwPlatformJoystickPresent(int joy) { pollJoystickEvents(); - return _glfw.linux_js[joy].present; + return _glfw.linux_js.js[joy].present; } const float* _glfwPlatformGetJoystickAxes(int joy, int* count) { pollJoystickEvents(); - *count = _glfw.linux_js[joy].axisCount; - return _glfw.linux_js[joy].axes; + *count = _glfw.linux_js.js[joy].axisCount; + return _glfw.linux_js.js[joy].axes; } const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count) { pollJoystickEvents(); - *count = _glfw.linux_js[joy].buttonCount; - return _glfw.linux_js[joy].buttons; + *count = _glfw.linux_js.js[joy].buttonCount; + return _glfw.linux_js.js[joy].buttons; } const char* _glfwPlatformGetJoystickName(int joy) { pollJoystickEvents(); - return _glfw.linux_js[joy].name; + return _glfw.linux_js.js[joy].name; } diff --git a/src/linux_joystick.h b/src/linux_joystick.h index b74a67ef..163b07c5 100644 --- a/src/linux_joystick.h +++ b/src/linux_joystick.h @@ -27,22 +27,33 @@ #ifndef _linux_joystick_h_ #define _linux_joystick_h_ +#include + #define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE \ - _GLFWjoystickLinux linux_js[GLFW_JOYSTICK_LAST + 1] + _GLFWjoystickLinux linux_js -// Linux-specific per-joystick data +// Linux-specific joystick API data // typedef struct _GLFWjoystickLinux { - int present; - int fd; - float* axes; - int axisCount; - unsigned char* buttons; - int buttonCount; - char* name; - char* path; + struct + { + int present; + int fd; + float* axes; + int axisCount; + unsigned char* buttons; + int buttonCount; + char* name; + char* path; + } js[GLFW_JOYSTICK_LAST + 1]; + +#if defined(__linux__) + int inotify; + int watch; + regex_t regex; +#endif /*__linux__*/ } _GLFWjoystickLinux; diff --git a/src/mir_window.c b/src/mir_window.c index e972662b..2024a636 100644 --- a/src/mir_window.c +++ b/src/mir_window.c @@ -651,6 +651,12 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) "Mir: Unsupported Function %s!", __PRETTY_FUNCTION__); } +void _glfwPlatformGetCursorPos(_GLFWwindow* window, double* xpos, double* ypos) +{ + _glfwInputError(GLFW_PLATFORM_ERROR, + "Mir: Unsupported Function %s!", __PRETTY_FUNCTION__); +} + void _glfwPlatformSetCursorPos(_GLFWwindow* window, double xpos, double ypos) { _glfwInputError(GLFW_PLATFORM_ERROR, diff --git a/src/wl_window.c b/src/wl_window.c index 3ecb90f8..bb2da473 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -372,6 +372,12 @@ void _glfwPlatformPostEmptyEvent(void) wl_display_sync(_glfw.wl.display); } +void _glfwPlatformGetCursorPos(_GLFWwindow* window, double* xpos, double* ypos) +{ + // TODO + fprintf(stderr, "_glfwPlatformGetCursorPos not implemented yet\n"); +} + void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y) { // A Wayland client can not set the cursor position diff --git a/src/x11_platform.h b/src/x11_platform.h index 17503b72..81d1bef1 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -216,14 +215,6 @@ typedef struct _GLFWlibraryX11 int versionMinor; } xinerama; -#if defined(__linux__) - struct { - int fd; - int wd; - regex_t regex; - } inotify; -#endif - } _GLFWlibraryX11;