mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'glfw:master' into taskbar-progress

Browse Source
This commit is contained in:
Jan Schürkamp 2023-02-01 00:28:58 +01:00 committed by GitHub
commit 48e08616d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -3,6 +3,7 @@ on:
pull_request: pull_request:
push: push:
branches: [ ci, master, latest, 3.3-stable ] branches: [ ci, master, latest, 3.3-stable ]
workflow_dispatch:
permissions: permissions:
statuses: write statuses: write
contents: read contents: read

1
CONTRIBUTORS.md
View File

@ -8,6 +8,7 @@ video tutorials.
- Bobyshev Alexander - Bobyshev Alexander
- Laurent Aphecetche - Laurent Aphecetche
- Matt Arsenault - Matt Arsenault
- Takuro Ashie
- ashishgamedev - ashishgamedev
- David Avedissian - David Avedissian
- Luca Bacci - Luca Bacci

2
src/wl_init.c
View File

@ -394,7 +394,7 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
_glfwGetKeyScancodeWayland, _glfwGetKeyScancodeWayland,
_glfwSetClipboardStringWayland, _glfwSetClipboardStringWayland,
_glfwGetClipboardStringWayland, _glfwGetClipboardStringWayland,
#if defined(_GLFW_LINUX_JOYSTICK) #if defined(GLFW_BUILD_LINUX_JOYSTICK)
_glfwInitJoysticksLinux, _glfwInitJoysticksLinux,
_glfwTerminateJoysticksLinux, _glfwTerminateJoysticksLinux,
_glfwPollJoystickLinux, _glfwPollJoystickLinux,

3
src/wl_window.c
View File

@ -1640,7 +1640,8 @@ static void dataDeviceHandleDataOffer(void* userData,
struct wl_data_offer* offer) struct wl_data_offer* offer)
{ {
_GLFWofferWayland* offers = _GLFWofferWayland* offers =
_glfw_realloc(_glfw.wl.offers, _glfw.wl.offerCount + 1); _glfw_realloc(_glfw.wl.offers,
sizeof(_GLFWofferWayland) * (_glfw.wl.offerCount + 1));
if (!offers) if (!offers)
{ {
_glfwInputError(GLFW_OUT_OF_MEMORY, NULL); _glfwInputError(GLFW_OUT_OF_MEMORY, NULL);

2
src/x11_init.c
View File

@ -1184,7 +1184,7 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
_glfwGetKeyScancodeX11, _glfwGetKeyScancodeX11,
_glfwSetClipboardStringX11, _glfwSetClipboardStringX11,
_glfwGetClipboardStringX11, _glfwGetClipboardStringX11,
#if defined(_GLFW_LINUX_JOYSTICK) #if defined(GLFW_BUILD_LINUX_JOYSTICK)
_glfwInitJoysticksLinux, _glfwInitJoysticksLinux,
_glfwTerminateJoysticksLinux, _glfwTerminateJoysticksLinux,
_glfwPollJoystickLinux, _glfwPollJoystickLinux,

4
src/x11_window.c
View File

@ -88,7 +88,7 @@ static GLFWbool waitForAnyEvent(double* timeout)
{ _glfw.x11.emptyEventPipe[0], POLLIN } { _glfw.x11.emptyEventPipe[0], POLLIN }
}; };
#if defined(_GLFW_LINUX_JOYSTICK) #if defined(GLFW_BUILD_LINUX_JOYSTICK)
if (_glfw.joysticksInitialized) if (_glfw.joysticksInitialized)
fds[count++] = (struct pollfd) { _glfw.linjs.inotify, POLLIN }; fds[count++] = (struct pollfd) { _glfw.linjs.inotify, POLLIN };
#endif #endif
@ -2875,7 +2875,7 @@ void _glfwPollEventsX11(void)
{ {
drainEmptyEvents(); drainEmptyEvents();
#if defined(_GLFW_LINUX_JOYSTICK) #if defined(GLFW_BUILD_LINUX_JOYSTICK)
if (_glfw.joysticksInitialized) if (_glfw.joysticksInitialized)
_glfwDetectJoystickConnectionLinux(); _glfwDetectJoystickConnectionLinux();
#endif #endif