Android platform support (rebased on 3.5) #2654
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,203 @@ | ||
| //======================================================================== | ||
| // GLFW 3.5 - www.glfw.org | ||
| //------------------------------------------------------------------------ | ||
| // Copyright (c) 2024 kunitoki <kunitoki@gmail.com> | ||
| // Copyright (c) 2017 Curi0 <curi0minecraft@gmail.com> | ||
| // | ||
| // This software is provided 'as-is', without any express or implied | ||
| // warranty. In no event will the authors be held liable for any damages | ||
| // arising from the use of this software. | ||
| // | ||
| // Permission is granted to anyone to use this software for any purpose, | ||
| // including commercial applications, and to alter it and redistribute it | ||
| // freely, subject to the following restrictions: | ||
| // | ||
| // 1. The origin of this software must not be misrepresented; you must not | ||
| // claim that you wrote the original software. If you use this software | ||
| // in a product, an acknowledgment in the product documentation would | ||
| // be appreciated but is not required. | ||
| // | ||
| // 2. Altered source versions must be plainly marked as such, and must not | ||
| // be misrepresented as being the original software. | ||
| // | ||
| // 3. This notice may not be removed or altered from any source | ||
| // distribution. | ||
| // | ||
| //======================================================================== | ||
|
|
||
| #include <android_native_app_glue.h> | ||
| #include <android/native_window.h> | ||
| #include <android/log.h> | ||
|
|
||
| #include "internal.h" | ||
|
|
||
| struct android_app* _globalAndroidApp = NULL; | ||
|
|
||
| extern int main(); | ||
|
|
||
| void handleAppCmd(struct android_app* app, int32_t cmd) | ||
| { | ||
| switch (cmd) | ||
| { | ||
| case APP_CMD_START: | ||
| break; | ||
|
|
||
| case APP_CMD_RESUME: | ||
| //_glfwInputWindowIconify(_glfw.windowListHead, GLFW_FALSE); | ||
| break; | ||
|
|
||
| case APP_CMD_PAUSE: | ||
| //_glfwInputWindowIconify(_glfw.windowListHead, GLFW_TRUE); | ||
| break; | ||
|
Comment on lines
+45
to
+51
There was a problem hiding this comment. Not sure about these, but we could find a better way to notify a glfw window about being paused and resumed. |
||
|
|
||
| case APP_CMD_STOP: | ||
| break; | ||
|
|
||
| case APP_CMD_DESTROY: | ||
| break; | ||
|
|
||
| case APP_CMD_INIT_WINDOW: | ||
| break; | ||
|
|
||
| case APP_CMD_TERM_WINDOW: | ||
| //_glfwInputWindowCloseRequest(_glfw.windowListHead); | ||
| break; | ||
|
Comment on lines
+59
to
+64
There was a problem hiding this comment. When device is rotated or app is put to sleep (background) we receive TERM_WINDOW, and when the app is again usable and foreground, we receive INIT_WINDOW. Receiving again init window will do nothing here, and we should instead setup the context in the new native window which has changed in the android_app struct. |
||
|
|
||
| case APP_CMD_LOST_FOCUS: | ||
| //_glfwInputWindowFocus(_glfw.windowListHead, GLFW_FALSE); | ||
| break; | ||
|
|
||
| case APP_CMD_GAINED_FOCUS: | ||
| //_glfwInputWindowFocus(_glfw.windowListHead, GLFW_TRUE); | ||
| break; | ||
|
|
||
| case APP_CMD_WINDOW_RESIZED: | ||
| _glfwInputWindowSize(_glfw.windowListHead, ANativeWindow_getWidth(app->window), ANativeWindow_getHeight(app->window)); | ||
| break; | ||
|
|
||
| case APP_CMD_WINDOW_REDRAW_NEEDED: | ||
| _glfwInputWindowDamage(_glfw.windowListHead); | ||
| break; | ||
|
|
||
| case APP_CMD_CONTENT_RECT_CHANGED: | ||
| _glfwInputFramebufferSize(_glfw.windowListHead, ANativeWindow_getWidth(app->window), ANativeWindow_getHeight(app->window)); | ||
| break; | ||
|
|
||
| case APP_CMD_CONFIG_CHANGED: | ||
| break; | ||
|
|
||
| case APP_CMD_INPUT_CHANGED: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // Android Entry Point | ||
| void android_main(struct android_app* app) | ||
| { | ||
| app_dummy(); | ||
|
|
||
| app->> | ||
|
|
||
| _globalAndroidApp = app; | ||
|
|
||
| main(); | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////////////////////////////// | ||
| ////// GLFW platform API ////// | ||
| ////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| GLFWbool _glfwConnectAndroid(int platformID, _GLFWplatform* platform) | ||
| { | ||
| const _GLFWplatform android = | ||
| { | ||
| .platformID = GLFW_PLATFORM_ANDROID, | ||
| .init = _glfwInitAndroid, | ||
| .terminate = _glfwTerminateAndroid, | ||
| .getCursorPos = _glfwGetCursorPosAndroid, | ||
| .setCursorPos = _glfwSetCursorPosAndroid, | ||
| .setCursorMode = _glfwSetCursorModeAndroid, | ||
| .setRawMouseMotion = _glfwSetRawMouseMotionAndroid, | ||
| .rawMouseMotionSupported = _glfwRawMouseMotionSupportedAndroid, | ||
| .createCursor = _glfwCreateCursorAndroid, | ||
| .createStandardCursor = _glfwCreateStandardCursorAndroid, | ||
| .destroyCursor = _glfwDestroyCursorAndroid, | ||
| .setCursor = _glfwSetCursorAndroid, | ||
| .getScancodeName = _glfwGetScancodeNameAndroid, | ||
| .getKeyScancode = _glfwGetKeyScancodeAndroid, | ||
| .setClipboardString = _glfwSetClipboardStringAndroid, | ||
| .getClipboardString = _glfwGetClipboardStringAndroid, | ||
| .initJoysticks = _glfwInitJoysticksAndroid, | ||
| .terminateJoysticks = _glfwTerminateJoysticksAndroid, | ||
| .pollJoystick = _glfwPollJoystickAndroid, | ||
| .getMappingName = _glfwGetMappingNameAndroid, | ||
| .updateGamepadGUID = _glfwUpdateGamepadGUIDAndroid, | ||
| .freeMonitor = _glfwFreeMonitorAndroid, | ||
| .getMonitorPos = _glfwGetMonitorPosAndroid, | ||
| .getMonitorContentScale = _glfwGetMonitorContentScaleAndroid, | ||
| .getMonitorWorkarea = _glfwGetMonitorWorkareaAndroid, | ||
| .getVideoModes = _glfwGetVideoModesAndroid, | ||
| .getVideoMode = _glfwGetVideoModeAndroid, | ||
| .getGammaRamp = _glfwGetGammaRampAndroid, | ||
| .setGammaRamp = _glfwSetGammaRampAndroid, | ||
| .createWindow = _glfwCreateWindowAndroid, | ||
| .destroyWindow = _glfwDestroyWindowAndroid, | ||
| .setWindowTitle = _glfwSetWindowTitleAndroid, | ||
| .setWindowIcon = _glfwSetWindowIconAndroid, | ||
| .getWindowPos = _glfwGetWindowPosAndroid, | ||
| .setWindowPos = _glfwSetWindowPosAndroid, | ||
| .getWindowSize = _glfwGetWindowSizeAndroid, | ||
| .setWindowSize = _glfwSetWindowSizeAndroid, | ||
| .setWindowSizeLimits = _glfwSetWindowSizeLimitsAndroid, | ||
| .setWindowAspectRatio = _glfwSetWindowAspectRatioAndroid, | ||
| .getFramebufferSize = _glfwGetFramebufferSizeAndroid, | ||
| .getWindowFrameSize = _glfwGetWindowFrameSizeAndroid, | ||
| .getWindowContentScale = _glfwGetWindowContentScaleAndroid, | ||
| .iconifyWindow = _glfwIconifyWindowAndroid, | ||
| .restoreWindow = _glfwRestoreWindowAndroid, | ||
| .maximizeWindow = _glfwMaximizeWindowAndroid, | ||
| .showWindow = _glfwShowWindowAndroid, | ||
| .hideWindow = _glfwHideWindowAndroid, | ||
| .requestWindowAttention = _glfwRequestWindowAttentionAndroid, | ||
| .focusWindow = _glfwFocusWindowAndroid, | ||
| .setWindowMonitor = _glfwSetWindowMonitorAndroid, | ||
| .windowFocused = _glfwWindowFocusedAndroid, | ||
| .windowIconified = _glfwWindowIconifiedAndroid, | ||
| .windowVisible = _glfwWindowVisibleAndroid, | ||
| .windowMaximized = _glfwWindowMaximizedAndroid, | ||
| .windowHovered = _glfwWindowHoveredAndroid, | ||
| .framebufferTransparent = _glfwFramebufferTransparentAndroid, | ||
| .getWindowOpacity = _glfwGetWindowOpacityAndroid, | ||
| .setWindowResizable = _glfwSetWindowResizableAndroid, | ||
| .setWindowDecorated = _glfwSetWindowDecoratedAndroid, | ||
| .setWindowFloating = _glfwSetWindowFloatingAndroid, | ||
| .setWindowOpacity = _glfwSetWindowOpacityAndroid, | ||
| .setWindowMousePassthrough = _glfwSetWindowMousePassthroughAndroid, | ||
| .pollEvents = _glfwPollEventsAndroid, | ||
| .waitEvents = _glfwWaitEventsAndroid, | ||
| .waitEventsTimeout = _glfwWaitEventsTimeoutAndroid, | ||
| .postEmptyEvent = _glfwPostEmptyEventAndroid, | ||
| .getEGLPlatform = _glfwGetEGLPlatformAndroid, | ||
| .getEGLNativeDisplay = _glfwGetEGLNativeDisplayAndroid, | ||
| .getEGLNativeWindow = _glfwGetEGLNativeWindowAndroid, | ||
| .getRequiredInstanceExtensions = _glfwGetRequiredInstanceExtensionsAndroid, | ||
| .getPhysicalDevicePresentationSupport = _glfwGetPhysicalDevicePresentationSupportAndroid, | ||
| .createWindowSurface = _glfwCreateWindowSurfaceAndroid | ||
| }; | ||
|
|
||
| *platform = android; | ||
| return GLFW_TRUE; | ||
| } | ||
|
|
||
| int _glfwInitAndroid(void) | ||
| { | ||
| _glfw.gstate.app = _globalAndroidApp; | ||
| _glfw.gstate.source = NULL; | ||
|
|
||
| return GLFW_TRUE; | ||
| } | ||
|
|
||
| void _glfwTerminateAndroid(void) | ||
| { | ||
| _glfw.gstate.app = NULL; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| //======================================================================== | ||
| // GLFW 3.5 - www.glfw.org | ||
| //------------------------------------------------------------------------ | ||
| // Copyright (c) 2024 kunitoki <kunitoki@gmail.com> | ||
| // Copyright (c) 2017 Curi0 <curi0minecraft@gmail.com> | ||
| // | ||
| // This software is provided 'as-is', without any express or implied | ||
| // warranty. In no event will the authors be held liable for any damages | ||
| // arising from the use of this software. | ||
| // | ||
| // Permission is granted to anyone to use this software for any purpose, | ||
| // including commercial applications, and to alter it and redistribute it | ||
| // freely, subject to the following restrictions: | ||
| // | ||
| // 1. The origin of this software must not be misrepresented; you must not | ||
| // claim that you wrote the original software. If you use this software | ||
| // in a product, an acknowledgment in the product documentation would | ||
| // be appreciated but is not required. | ||
| // | ||
| // 2. Altered source versions must be plainly marked as such, and must not | ||
| // be misrepresented as being the original software. | ||
| // | ||
| // 3. This notice may not be removed or altered from any source | ||
| // distribution. | ||
| // | ||
| //======================================================================== | ||
|
|
||
| #include "internal.h" | ||
|
|
||
|
|
||
| ////////////////////////////////////////////////////////////////////////// | ||
| ////// GLFW platform API ////// | ||
| ////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| GLFWbool _glfwInitJoysticksAndroid(void) | ||
| { | ||
| return GLFW_FALSE; | ||
| } | ||
|
|
||
| void _glfwTerminateJoysticksAndroid(void) | ||
| { | ||
| } | ||
|
|
||
| GLFWbool _glfwPollJoystickAndroid(_GLFWjoystick* js, int mode) | ||
| { | ||
| return GLFW_FALSE; | ||
| } | ||
|
|
||
| const char* _glfwGetMappingNameAndroid(void) | ||
| { | ||
| return "Android"; | ||
| } | ||
|
|
||
| void _glfwUpdateGamepadGUIDAndroid(char* guid) | ||
| { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| //======================================================================== | ||
| // GLFW 3.5 - www.glfw.org | ||
| //------------------------------------------------------------------------ | ||
| // Copyright (c) 2024 kunitoki <kunitoki@gmail.com> | ||
| // Copyright (c) 2017 Curi0 <curi0minecraft@gmail.com> | ||
| // | ||
| // This software is provided 'as-is', without any express or implied | ||
| // warranty. In no event will the authors be held liable for any damages | ||
| // arising from the use of this software. | ||
| // | ||
| // Permission is granted to anyone to use this software for any purpose, | ||
| // including commercial applications, and to alter it and redistribute it | ||
| // freely, subject to the following restrictions: | ||
| // | ||
| // 1. The origin of this software must not be misrepresented; you must not | ||
| // claim that you wrote the original software. If you use this software | ||
| // in a product, an acknowledgment in the product documentation would | ||
| // be appreciated but is not required. | ||
| // | ||
| // 2. Altered source versions must be plainly marked as such, and must not | ||
| // be misrepresented as being the original software. | ||
| // | ||
| // 3. This notice may not be removed or altered from any source | ||
| // distribution. | ||
| // | ||
| //======================================================================== | ||
|
|
||
| #define GLFW_ANDROID_JOYSTICK_STATE | ||
| #define GLFW_ANDROID_LIBRARY_JOYSTICK_STATE | ||
|
|
||
| GLFWbool _glfwInitJoysticksAndroid(void); | ||
| void _glfwTerminateJoysticksAndroid(void); | ||
| GLFWbool _glfwPollJoystickAndroid(_GLFWjoystick* js, int mode); | ||
| const char* _glfwGetMappingNameAndroid(void); | ||
| void _glfwUpdateGamepadGUIDAndroid(char* guid); |
Oops, something went wrong.
Oops, something went wrong.
3A6F
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is something non standard and would need to be added to the documentation. We have 2 options:
void android_main(struct android_app* app)implementation is provided byglfwand will need to forward the realmainimplementation to the hosting app together with thestruct android_app*(here using theGLFWAPI struct android_app* glfwGetAndroidApp(GLFWwindow* window);which should also be made global, not specific to a window).void android_main(struct android_app* app)and thestruct android_app*is forwarded to glfw with a custom method. This will still allow the hosting app to be more standalone and work even without having glfw in the first place.