From 8acb72b9a19153d1b80c07522566f43c021d72ce Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Sat, 23 Jul 2022 21:28:35 +0200 Subject: [PATCH 01/32] Win32 Added support for taskbar progress --- include/GLFW/glfw3.h | 8 ++++++++ src/cocoa_init.m | 1 + src/cocoa_platform.h | 1 + src/cocoa_window.m | 6 ++++++ src/internal.h | 1 + src/null_init.c | 1 + src/null_platform.h | 1 + src/null_window.c | 4 ++++ src/win32_init.c | 1 + src/win32_platform.h | 5 +++++ src/win32_window.c | 36 ++++++++++++++++++++++++++++++++++++ src/window.c | 30 ++++++++++++++++++++++++++++++ src/wl_init.c | 1 + src/wl_platform.h | 1 + src/wl_window.c | 6 ++++++ src/x11_init.c | 1 + src/x11_platform.h | 1 + src/x11_window.c | 5 +++++ tests/window.c | 23 ++++++++++++++++++++++- 19 files changed, 132 insertions(+), 1 deletion(-) diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index aa6ddc33..d401fcbc 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1251,6 +1251,12 @@ extern "C" { #define GLFW_HAND_CURSOR GLFW_POINTING_HAND_CURSOR /*! @} */ +#define GLFW_TASKBAR_PROGRESS_NOPROGRESS 0x00 +#define GLFW_TASKBAR_PROGRESS_INDETERMINATE 0x01 +#define GLFW_TASKBAR_PROGRESS_NORMAL 0x02 +#define GLFW_TASKBAR_PROGRESS_ERROR 0x04 +#define GLFW_TASKBAR_PROGRESS_PAUSED 0x08 + #define GLFW_CONNECTED 0x00040001 #define GLFW_DISCONNECTED 0x00040002 @@ -3283,6 +3289,8 @@ GLFWAPI void glfwSetWindowTitle(GLFWwindow* window, const char* title); */ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* images); +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, int completed); + /*! @brief Retrieves the position of the content area of the specified window. * * This function retrieves the position, in screen coordinates, of the diff --git a/src/cocoa_init.m b/src/cocoa_init.m index aa369f9c..07ff3fc6 100644 --- a/src/cocoa_init.m +++ b/src/cocoa_init.m @@ -525,6 +525,7 @@ GLFWbool _glfwConnectCocoa(int platformID, _GLFWplatform* platform) _glfwDestroyWindowCocoa, _glfwSetWindowTitleCocoa, _glfwSetWindowIconCocoa, + _glfwSetWindowTaskbarProgressCocoa, _glfwGetWindowPosCocoa, _glfwSetWindowPosCocoa, _glfwGetWindowSizeCocoa, diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 9f7d191d..936843ad 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -218,6 +218,7 @@ GLFWbool _glfwCreateWindowCocoa(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowCocoa(_GLFWwindow* window); void _glfwSetWindowTitleCocoa(_GLFWwindow* window, const char* title); void _glfwSetWindowIconCocoa(_GLFWwindow* window, int count, const GLFWimage* images); +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int taskbarState, int completed); void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosCocoa(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeCocoa(_GLFWwindow* window, int* width, int* height); diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 5bb1289b..abb5634a 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1014,6 +1014,12 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } +void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int progressState, int completed) +{ + _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED, + "Cocoa: Window taskbar progress is not implemented"); +} + void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos) { @autoreleasepool { diff --git a/src/internal.h b/src/internal.h index 89a18628..a25629f8 100644 --- a/src/internal.h +++ b/src/internal.h @@ -708,6 +708,7 @@ struct _GLFWplatform void (*destroyWindow)(_GLFWwindow*); void (*setWindowTitle)(_GLFWwindow*,const char*); void (*setWindowIcon)(_GLFWwindow*,int,const GLFWimage*); + void (*setWindowTaskbarProgress)(_GLFWwindow*,const int,int); void (*getWindowPos)(_GLFWwindow*,int*,int*); void (*setWindowPos)(_GLFWwindow*,int,int); void (*getWindowSize)(_GLFWwindow*,int*,int*); diff --git a/src/null_init.c b/src/null_init.c index de4b28f3..d3d8c8cb 100644 --- a/src/null_init.c +++ b/src/null_init.c @@ -73,6 +73,7 @@ GLFWbool _glfwConnectNull(int platformID, _GLFWplatform* platform) _glfwDestroyWindowNull, _glfwSetWindowTitleNull, _glfwSetWindowIconNull, + _glfwSetWindowTaskbarProgressNull, _glfwGetWindowPosNull, _glfwSetWindowPosNull, _glfwGetWindowSizeNull, diff --git a/src/null_platform.h b/src/null_platform.h index b646acb3..348ded2e 100644 --- a/src/null_platform.h +++ b/src/null_platform.h @@ -89,6 +89,7 @@ GLFWbool _glfwCreateWindowNull(_GLFWwindow* window, const _GLFWwndconfig* wndcon void _glfwDestroyWindowNull(_GLFWwindow* window); void _glfwSetWindowTitleNull(_GLFWwindow* window, const char* title); void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* images); +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int taskbarState, int completed); void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate); void _glfwGetWindowPosNull(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosNull(_GLFWwindow* window, int xpos, int ypos); diff --git a/src/null_window.c b/src/null_window.c index 8a7cae41..128ae5a2 100644 --- a/src/null_window.c +++ b/src/null_window.c @@ -178,6 +178,10 @@ void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* ima { } +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int progressState, int completed) +{ +} + void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, diff --git a/src/win32_init.c b/src/win32_init.c index 8704150c..e8a11c99 100644 --- a/src/win32_init.c +++ b/src/win32_init.c @@ -636,6 +636,7 @@ GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform) _glfwDestroyWindowWin32, _glfwSetWindowTitleWin32, _glfwSetWindowIconWin32, + _glfwSetWindowTaskbarProgressWin32, _glfwGetWindowPosWin32, _glfwSetWindowPosWin32, _glfwGetWindowSizeWin32, diff --git a/src/win32_platform.h b/src/win32_platform.h index c2158943..c5316149 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -69,6 +69,7 @@ #include #include #include +#include // HACK: Define macros that some windows.h variants don't #ifndef WM_MOUSEHWHEEL @@ -432,6 +433,9 @@ typedef struct _GLFWwindowWin32 int lastCursorPosX, lastCursorPosY; // The last received high surrogate when decoding pairs of UTF-16 messages WCHAR highSurrogate; + + ITaskbarList3* TaskbarList; + UINT TaskbarListMsgID; } _GLFWwindowWin32; // Win32-specific global data @@ -541,6 +545,7 @@ GLFWbool _glfwCreateWindowWin32(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowWin32(_GLFWwindow* window); void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images); +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int taskbarState, int completed); void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWin32(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWin32(_GLFWwindow* window, int* width, int* height); diff --git a/src/win32_window.c b/src/win32_window.c index 168529e2..2fda5454 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1239,6 +1239,18 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l } } + if(uMsg == window->win32.TaskbarListMsgID) + { + HRESULT res = CoCreateInstance(&CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskbarList3, (LPVOID*)&window->win32.TaskbarList); + if (res != S_OK && window->win32.TaskbarList) + window->win32.TaskbarList->lpVtbl->Release(window->win32.TaskbarList); + else + { + window->win32.TaskbarList->lpVtbl->AddRef(window->win32.TaskbarList); + window->win32.TaskbarList->lpVtbl->HrInit(window->win32.TaskbarList); + } + } + return DefWindowProcW(hWnd, uMsg, wParam, lParam); } @@ -1348,6 +1360,10 @@ static int createNativeWindow(_GLFWwindow* window, WM_COPYDATA, MSGFLT_ALLOW, NULL); ChangeWindowMessageFilterEx(window->win32.handle, WM_COPYGLOBALDATA, MSGFLT_ALLOW, NULL); + + window->win32.TaskbarListMsgID = RegisterWindowMessageW(L"TaskbarButtonCreated"); + if (window->win32.TaskbarListMsgID) + ChangeWindowMessageFilterEx(window->win32.handle, window->win32.TaskbarListMsgID, MSGFLT_ALLOW, NULL); } window->win32.scaleToMonitor = wndconfig->scaleToMonitor; @@ -1497,6 +1513,9 @@ void _glfwDestroyWindowWin32(_GLFWwindow* window) if (_glfw.win32.disabledCursorWindow == window) _glfw.win32.disabledCursorWindow = NULL; + if (window->win32.TaskbarList) + window->win32.TaskbarList->lpVtbl->Release(window->win32.TaskbarList); + if (window->win32.handle) { RemovePropW(window->win32.handle, L"GLFW"); @@ -1559,6 +1578,23 @@ void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* im } } +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, int completed) +{ + if(!window->win32.TaskbarList) + return; + + HRESULT res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, completed, 100); + if(res != S_OK) + { + _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress value"); + return; + } + + res = window->win32.TaskbarList->lpVtbl->SetProgressState(window->win32.TaskbarList, window->win32.handle, progressState); + if (res != S_OK) + _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress state"); +} + void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos) { POINT pos = { 0, 0 }; diff --git a/src/window.c b/src/window.c index ebbc6dca..11406824 100644 --- a/src/window.c +++ b/src/window.c @@ -546,6 +546,36 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* handle, _glfw.platform.setWindowIcon(window, count, images); } +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progressState, int completed) +{ + _GLFWwindow* window = (_GLFWwindow*) handle; + + assert(window != NULL); + assert(completed >= 0); + assert(completed <= 100); + + if (completed < 0) + { + _glfwInputError(GLFW_INVALID_VALUE, "Invalid progress amount for window taskbar progress"); + return; + } + else if (completed > 100) + { + _glfwInputError(GLFW_INVALID_VALUE, "Invalid progress amount for window taskbar progress"); + return; + } + + if (progressState != GLFW_TASKBAR_PROGRESS_NOPROGRESS && progressState != GLFW_TASKBAR_PROGRESS_INDETERMINATE && + progressState != GLFW_TASKBAR_PROGRESS_NORMAL && progressState != GLFW_TASKBAR_PROGRESS_ERROR && + progressState != GLFW_TASKBAR_PROGRESS_PAUSED) + { + _glfwInputError(GLFW_INVALID_ENUM, "Invalid progress state 0x%08X", progressState); + return; + } + + _glfw.platform.setWindowTaskbarProgress(window, progressState, completed); +} + GLFWAPI void glfwGetWindowPos(GLFWwindow* handle, int* xpos, int* ypos) { _GLFWwindow* window = (_GLFWwindow*) handle; diff --git a/src/wl_init.c b/src/wl_init.c index 8cbcc6e8..d4278c75 100644 --- a/src/wl_init.c +++ b/src/wl_init.c @@ -417,6 +417,7 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform) _glfwDestroyWindowWayland, _glfwSetWindowTitleWayland, _glfwSetWindowIconWayland, + _glfwSetWindowTaskbarProgressWayland, _glfwGetWindowPosWayland, _glfwSetWindowPosWayland, _glfwGetWindowSizeWayland, diff --git a/src/wl_platform.h b/src/wl_platform.h index f65bcb11..1176c75c 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -446,6 +446,7 @@ GLFWbool _glfwCreateWindowWayland(_GLFWwindow* window, const _GLFWwndconfig* wnd void _glfwDestroyWindowWayland(_GLFWwindow* window); void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images); +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int completed); void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height); diff --git a/src/wl_window.c b/src/wl_window.c index ef935d33..9b5b4363 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1885,6 +1885,12 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } +void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int progressState, int completed) +{ + _glfwInputError(GLFW_FEATURE_UNAVAILABLE, + "Wayland: The platform does not support setting the window taskbar progress"); +} + void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos) { // A Wayland client is not aware of its position, so just warn and leave it diff --git a/src/x11_init.c b/src/x11_init.c index 11aeb9e5..29c32794 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -1207,6 +1207,7 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform) _glfwDestroyWindowX11, _glfwSetWindowTitleX11, _glfwSetWindowIconX11, + _glfwSetWindowTaskbarProgressX11, _glfwGetWindowPosX11, _glfwSetWindowPosX11, _glfwGetWindowSizeX11, diff --git a/src/x11_platform.h b/src/x11_platform.h index ecaa0fa4..052f4534 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -906,6 +906,7 @@ GLFWbool _glfwCreateWindowX11(_GLFWwindow* window, const _GLFWwndconfig* wndconf void _glfwDestroyWindowX11(_GLFWwindow* window); void _glfwSetWindowTitleX11(_GLFWwindow* window, const char* title); void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* images); +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int completed); void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosX11(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height); diff --git a/src/x11_window.c b/src/x11_window.c index 98f990b2..e447a844 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2091,6 +2091,11 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag XFlush(_glfw.x11.display); } +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int completed) +{ + _glfwInputError(GLFW_FEATURE_UNAVAILABLE, "X11: The platform does not support setting the window taskbar progress"); +} + void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos) { Window dummy; diff --git a/tests/window.c b/tests/window.c index 83baff46..53fb655f 100644 --- a/tests/window.c +++ b/tests/window.c @@ -71,7 +71,7 @@ int main(int argc, char** argv) glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); - GLFWwindow* window = glfwCreateWindow(600, 600, "Window Features", NULL, NULL); + GLFWwindow* window = glfwCreateWindow(600, 700, "Window Features", NULL, NULL); if (!window) { glfwTerminate(); @@ -411,6 +411,27 @@ int main(int argc, char** argv) nk_value_bool(nk, "Visible", glfwGetWindowAttrib(window, GLFW_VISIBLE)); nk_value_bool(nk, "Iconified", glfwGetWindowAttrib(window, GLFW_ICONIFIED)); nk_value_bool(nk, "Maximized", glfwGetWindowAttrib(window, GLFW_MAXIMIZED)); + + nk_layout_row_dynamic(nk, 30, 1); + + nk_label(nk, "Taskbar Progress", NK_TEXT_CENTERED); + + nk_layout_row_dynamic(nk, 30, 5); + + static int progress = 0; + if(nk_button_label(nk, "No progress")) + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NOPROGRESS, progress); + if (nk_button_label(nk, "Indeterminate")) + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); + if (nk_button_label(nk, "Normal")) + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, progress); + if (nk_button_label(nk, "Error")) + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_ERROR, progress); + if (nk_button_label(nk, "Paused")) + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_PAUSED, progress); + + nk_label(nk, "Progress: ", NK_TEXT_ALIGN_LEFT); + nk_slider_int(nk, 0, &progress, 100, 1); } nk_end(nk); From 827cf79f6330fd6135c0356ab1f0e07c38ecd718 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 2 Sep 2022 02:28:14 +0200 Subject: [PATCH 02/32] Linux Added support for taskbar progress (KDE & Unity) --- include/GLFW/glfw3.h | 10 ++-- src/CMakeLists.txt | 3 +- src/internal.h | 1 + src/platform.h | 4 ++ src/posix_dbus.c | 126 +++++++++++++++++++++++++++++++++++++++++ src/posix_dbus.h | 131 +++++++++++++++++++++++++++++++++++++++++++ src/win32_window.c | 23 +++++++- src/wl_init.c | 4 ++ src/wl_window.c | 90 ++++++++++++++++++++++++++++- src/x11_init.c | 4 ++ src/x11_window.c | 91 +++++++++++++++++++++++++++++- 11 files changed, 476 insertions(+), 11 deletions(-) create mode 100644 src/posix_dbus.c create mode 100644 src/posix_dbus.h diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 74c9ef5c..13eade85 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1272,11 +1272,11 @@ extern "C" { #define GLFW_HAND_CURSOR GLFW_POINTING_HAND_CURSOR /*! @} */ -#define GLFW_TASKBAR_PROGRESS_NOPROGRESS 0x00 -#define GLFW_TASKBAR_PROGRESS_INDETERMINATE 0x01 -#define GLFW_TASKBAR_PROGRESS_NORMAL 0x02 -#define GLFW_TASKBAR_PROGRESS_ERROR 0x04 -#define GLFW_TASKBAR_PROGRESS_PAUSED 0x08 +#define GLFW_TASKBAR_PROGRESS_NOPROGRESS 0 +#define GLFW_TASKBAR_PROGRESS_INDETERMINATE 1 +#define GLFW_TASKBAR_PROGRESS_NORMAL 2 +#define GLFW_TASKBAR_PROGRESS_ERROR 3 +#define GLFW_TASKBAR_PROGRESS_PAUSED 4 #define GLFW_CONNECTED 0x00040001 #define GLFW_DISCONNECTED 0x00040002 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 01f191c9..32f933ca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,8 @@ elseif (WIN32) win32_time.c win32_thread.c) else() target_sources(glfw PRIVATE posix_time.h posix_thread.h posix_module.c - posix_time.c posix_thread.c) + posix_time.c posix_thread.c posix_dbus.h + posix_dbus.c) endif() add_custom_target(update_mappings diff --git a/src/internal.h b/src/internal.h index cc977b3d..22122e81 100644 --- a/src/internal.h +++ b/src/internal.h @@ -877,6 +877,7 @@ struct _GLFWlibrary GLFW_PLATFORM_LIBRARY_WINDOW_STATE GLFW_PLATFORM_LIBRARY_CONTEXT_STATE GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE + GLFW_PLATFORM_LIBRARY_DBUS_STATE }; // Global state shared between compilation units of GLFW diff --git a/src/platform.h b/src/platform.h index 0c593676..9f664003 100644 --- a/src/platform.h +++ b/src/platform.h @@ -153,11 +153,15 @@ #if defined(_WIN32) #include "win32_time.h" #define GLFW_PLATFORM_LIBRARY_TIMER_STATE GLFW_WIN32_LIBRARY_TIMER_STATE + #define GLFW_PLATFORM_LIBRARY_DBUS_STATE #elif defined(__APPLE__) #include "cocoa_time.h" #define GLFW_PLATFORM_LIBRARY_TIMER_STATE GLFW_COCOA_LIBRARY_TIMER_STATE + #define GLFW_PLATFORM_LIBRARY_DBUS_STATE #else #include "posix_time.h" #define GLFW_PLATFORM_LIBRARY_TIMER_STATE GLFW_POSIX_LIBRARY_TIMER_STATE + #include "posix_dbus.h" + #define GLFW_PLATFORM_LIBRARY_DBUS_STATE GLFW_POSIX_LIBRARY_DBUS_STATE #endif diff --git a/src/posix_dbus.c b/src/posix_dbus.c new file mode 100644 index 00000000..0306323f --- /dev/null +++ b/src/posix_dbus.c @@ -0,0 +1,126 @@ +//======================================================================== +// GLFW 3.4 POSIX - www.glfw.org +//------------------------------------------------------------------------ +// Copyright (c) 2022 Camilla Löwy +// +// 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. +// +//======================================================================== +// It is fine to use C99 in this file because it will not be built with VS +//======================================================================== + +#define _GNU_SOURCE + +#include "internal.h" + +void _glfwInitDBusPOSIX(void) +{ + //Initialize DBus library functions + _glfw.dbus.handle = NULL; + _glfw.dbus.connection = NULL; + + _glfw.dbus.handle = _glfwPlatformLoadModule("libdbus-1.so.3"); + if (_glfw.dbus.handle) + { + _glfw.dbus.error_init = (PFN_dbus_error_init) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_error_init"); + _glfw.dbus.error_is_set = (PFN_dbus_error_is_set) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_error_is_set"); + _glfw.dbus.error_free = (PFN_dbus_error_free) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_error_free"); + _glfw.dbus.connection_unref = (PFN_dbus_connection_unref) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_connection_unref"); + _glfw.dbus.connection_send = (PFN_dbus_connection_send) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_connection_send"); + _glfw.dbus.connection_flush = (PFN_dbus_connection_flush) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_connection_flush"); + _glfw.dbus.bus_request_name = (PFN_dbus_bus_request_name) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_bus_request_name"); + _glfw.dbus.bus_get = (PFN_dbus_bus_get) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_bus_get"); + _glfw.dbus.message_unref = (PFN_dbus_message_unref) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_message_unref"); + _glfw.dbus.message_new_signal = (PFN_dbus_message_new_signal) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_message_new_signal"); + _glfw.dbus.message_iter_init_append = (PFN_dbus_message_iter_init_append) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_message_iter_init_append"); + _glfw.dbus.message_iter_append_basic = (PFN_dbus_message_iter_append_basic) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_message_iter_append_basic"); + _glfw.dbus.message_iter_open_container = (PFN_dbus_message_iter_open_container) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_message_iter_open_container"); + _glfw.dbus.message_iter_close_container = (PFN_dbus_message_iter_close_container) + _glfwPlatformGetModuleSymbol(_glfw.dbus.handle, "dbus_message_iter_close_container"); + + //Initialize DBus connection + dbus_error_init(&_glfw.dbus.error); + _glfw.dbus.connection = dbus_bus_get(DBUS_BUS_SESSION, &_glfw.dbus.error); + + //Check for errors + if(dbus_error_is_set(&_glfw.dbus.error) || !_glfw.dbus.connection) + { + if(dbus_error_is_set(&_glfw.dbus.error)) + dbus_error_free(&_glfw.dbus.error); + + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to connect to DBus"); + + dbus_connection_unref(_glfw.dbus.connection); + _glfw.dbus.connection = NULL; + } + else + { + //Request name + const int res = dbus_bus_request_name(_glfw.dbus.connection, "org.glfw", DBUS_NAME_FLAG_REPLACE_EXISTING, &_glfw.dbus.error); + + //Check for errors + if(dbus_error_is_set(&_glfw.dbus.error) || res != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) + { + if(dbus_error_is_set(&_glfw.dbus.error)) + dbus_error_free(&_glfw.dbus.error); + + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to request DBus name"); + + dbus_connection_unref(_glfw.dbus.connection); + _glfw.dbus.connection = NULL; + } + } + } + + if(_glfw.dbus.connection) + { + //Window NULL is safe here because it won't get + //used inside th eSetWindowTaskbarProgress function + _glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_NOPROGRESS, 0); + } +} + +void _glfwTerminateDBusPOSIX(void) +{ + if (_glfw.dbus.connection) + { + dbus_connection_unref(_glfw.dbus.connection); + _glfw.dbus.connection = NULL; + } + + if (_glfw.dbus.handle) + { + _glfwPlatformFreeModule(_glfw.dbus.handle); + _glfw.dbus.handle = NULL; + } +} diff --git a/src/posix_dbus.h b/src/posix_dbus.h new file mode 100644 index 00000000..58cc13ee --- /dev/null +++ b/src/posix_dbus.h @@ -0,0 +1,131 @@ +//======================================================================== +// GLFW 3.4 POSIX - www.glfw.org +//------------------------------------------------------------------------ +// Copyright (c) 2002-2006 Marcus Geelnard +// Copyright (c) 2006-2017 Camilla Löwy +// +// 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. +// +//======================================================================== + +//Taken from DBus docs (https://dbus.freedesktop.org/doc/api/html/index.html) +typedef struct DBusConnection DBusConnection; +typedef struct DBusMessage DBusMessage; +typedef unsigned int dbus_bool_t; +typedef unsigned int dbus_uint32_t; + +enum DBusBusType +{ + DBUS_BUS_SESSION, + DBUS_BUS_SYSTEM, + DBUS_BUS_STARTER +}; + +struct DBusError +{ + const char* name; + const char* message; + unsigned int dummy1 : 1; + unsigned int dummy2 : 1; + unsigned int dummy3 : 1; + unsigned int dummy4 : 1; + unsigned int dummy5 : 1; + void* padding1; +}; + +struct DBusMessageIter +{ + void* dummy1; + void* dummy2; + dbus_uint32_t dummy3; + int dummy4, dummy5, dummy6, dummy7, dummy8, dummy9, dummy10, dummy11; + int pad1; + void* pad2; + void* pad3; +}; + +#define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 +#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1 +#define DBUS_TYPE_STRING (unsigned int)'s' +#define DBUS_TYPE_ARRAY (unsigned int)'a' +#define DBUS_TYPE_DICT_ENTRY (unsigned int)'e' +#define DBUS_TYPE_VARIANT (unsigned int)'v' +#define DBUS_TYPE_BOOLEAN (unsigned int)'b' +#define DBUS_TYPE_DOUBLE (unsigned int)'d' + +typedef void (* PFN_dbus_error_init)(struct DBusError*); +typedef dbus_bool_t (* PFN_dbus_error_is_set)(const struct DBusError*); +typedef void (* PFN_dbus_error_free)(struct DBusError*); +typedef void (* PFN_dbus_connection_unref)(DBusConnection*); +typedef dbus_bool_t (* PFN_dbus_connection_send)(DBusConnection*, DBusMessage*, dbus_uint32_t*); +typedef void (* PFN_dbus_connection_flush)(DBusConnection*); +typedef int (* PFN_dbus_bus_request_name)(DBusConnection*, const char*, unsigned int, struct DBusError*); +typedef DBusConnection* (* PFN_dbus_bus_get)(enum DBusBusType, struct DBusError*); +typedef void (* PFN_dbus_message_unref)(DBusMessage*); +typedef DBusMessage* (* PFN_dbus_message_new_signal)(const char*, const char*, const char*); +typedef void (* PFN_dbus_message_iter_init_append)(DBusMessage*, struct DBusMessageIter*); +typedef dbus_bool_t (* PFN_dbus_message_iter_append_basic)(struct DBusMessageIter*, int, const void*); +typedef dbus_bool_t (* PFN_dbus_message_iter_open_container)(struct DBusMessageIter*, int, const char*, struct DBusMessageIter*); +typedef dbus_bool_t (* PFN_dbus_message_iter_close_container)(struct DBusMessageIter*, struct DBusMessageIter*); + +#define dbus_error_init _glfw.dbus.error_init +#define dbus_error_is_set _glfw.dbus.error_is_set +#define dbus_error_free _glfw.dbus.error_free +#define dbus_connection_unref _glfw.dbus.connection_unref +#define dbus_connection_send _glfw.dbus.connection_send +#define dbus_connection_flush _glfw.dbus.connection_flush +#define dbus_bus_request_name _glfw.dbus.bus_request_name +#define dbus_bus_get _glfw.dbus.bus_get +#define dbus_message_unref _glfw.dbus.message_unref +#define dbus_message_new_signal _glfw.dbus.message_new_signal +#define dbus_message_iter_init_append _glfw.dbus.message_iter_init_append +#define dbus_message_iter_append_basic _glfw.dbus.message_iter_append_basic +#define dbus_message_iter_open_container _glfw.dbus.message_iter_open_container +#define dbus_message_iter_close_container _glfw.dbus.message_iter_close_container + +#define GLFW_POSIX_LIBRARY_DBUS_STATE _GLFWDBusPOSIX dbus; + +// POSIX-specific dbus data +// +typedef struct _GLFWDBusPOSIX +{ + void* handle; + + PFN_dbus_error_init error_init; + PFN_dbus_error_is_set error_is_set; + PFN_dbus_error_free error_free; + PFN_dbus_connection_unref connection_unref; + PFN_dbus_connection_send connection_send; + PFN_dbus_connection_flush connection_flush; + PFN_dbus_bus_request_name bus_request_name; + PFN_dbus_bus_get bus_get; + PFN_dbus_message_unref message_unref; + PFN_dbus_message_new_signal message_new_signal; + PFN_dbus_message_iter_init_append message_iter_init_append; + PFN_dbus_message_iter_append_basic message_iter_append_basic; + PFN_dbus_message_iter_open_container message_iter_open_container; + PFN_dbus_message_iter_close_container message_iter_close_container; + + DBusConnection* connection; + struct DBusError error; +} _GLFWDBusPOSIX; + +void _glfwInitDBusPOSIX(void); +void _glfwTerminateDBusPOSIX(void); diff --git a/src/win32_window.c b/src/win32_window.c index 5ae05e89..47c1adb0 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1618,7 +1618,28 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressS return; } - res = window->win32.TaskbarList->lpVtbl->SetProgressState(window->win32.TaskbarList, window->win32.handle, progressState); + int32_t winProgressState = 0; + switch(progressState) + { + case 1: + winProgressState = 0x1; + break; + case 2: + winProgressState = 0x2; + break; + case 3: + winProgressState = 0x4; + break; + case 4: + winProgressState = 0x8; + break; + case 0: + default: + winProgressState = 0x0; + break; + } + + res = window->win32.TaskbarList->lpVtbl->SetProgressState(window->win32.TaskbarList, window->win32.handle, winProgressState); if (res != S_OK) _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress state"); } diff --git a/src/wl_init.c b/src/wl_init.c index d4278c75..c6a4e8c4 100644 --- a/src/wl_init.c +++ b/src/wl_init.c @@ -504,6 +504,8 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform) int _glfwInitWayland(void) { + _glfwInitDBusPOSIX(); + // These must be set before any failure checks _glfw.wl.keyRepeatTimerfd = -1; _glfw.wl.cursorTimerfd = -1; @@ -790,5 +792,7 @@ void _glfwTerminateWayland(void) close(_glfw.wl.cursorTimerfd); _glfw_free(_glfw.wl.clipboardString); + + _glfwTerminateDBusPOSIX(); } diff --git a/src/wl_window.c b/src/wl_window.c index 71d5a3e6..af7c0c14 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1901,8 +1901,94 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int progressState, int completed) { - _glfwInputError(GLFW_FEATURE_UNAVAILABLE, - "Wayland: The platform does not support setting the window taskbar progress"); + if(!_glfw.dbus.handle || !_glfw.dbus.connection) + return; + + //Signal signature: + //signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties) + + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); + const double progressValue = (double)completed / 100.0; + + struct DBusMessageIter args; + memset(&args, 0, sizeof(args)); + + //Get name of the running executable + char exeName[PATH_MAX]; + memset(exeName, 0, sizeof(char) * PATH_MAX); + if(readlink("/proc/self/exe", exeName, PATH_MAX) == -1) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); + return; + } + char* exeNameEnd = strchr(exeName, '\0'); + char* lastFound = strrchr(exeName, '/'); + if(!lastFound || !exeNameEnd) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); + return; + } + unsigned int exeNameLength = (exeNameEnd - lastFound) - 1; + + //Create our final desktop file uri + unsigned int desktopFileLength = strlen("application://") + exeNameLength + strlen(".desktop") + 1; + char desktopFile[desktopFileLength]; + memset(desktopFile, 0, sizeof(char) * desktopFileLength); + strcpy(desktopFile, "application://"); + memcpy(desktopFile + strlen("application://"), lastFound + 1, exeNameLength); + strcpy(desktopFile + strlen("application://") + (exeNameLength), ".desktop"); + desktopFile[desktopFileLength - 1] = '\0'; + + DBusMessage* msg = dbus_message_new_signal("/org/glfw", "com.canonical.Unity.LauncherEntry", "Update"); + if(!msg) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create new DBus message"); + return; + } + + dbus_message_iter_init_append(msg, &args); + + //Setup app_uri parameter + const char* desktopFileStr = desktopFile; + dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &desktopFileStr); + + //Set properties parameter + struct DBusMessageIter sub1, sub2, sub3; + memset(&sub1, 0, sizeof(sub1)); + memset(&sub2, 0, sizeof(sub2)); + memset(&sub3, 0, sizeof(sub3)); + + dbus_message_iter_open_container(&args, DBUS_TYPE_ARRAY, "{sv}", &sub1); + + //Set progress visible property + dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); + const char* progressVisibleStr = "progress-visible"; + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressVisibleStr); + dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "b", &sub3); + dbus_message_iter_append_basic(&sub3, DBUS_TYPE_BOOLEAN, &progressVisible); + dbus_message_iter_close_container(&sub2, &sub3); + dbus_message_iter_close_container(&sub1, &sub2); + + //Set progress value property + dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); + const char* progressValueStr = "progress"; + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressValueStr); + dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "d", &sub3); + dbus_message_iter_append_basic(&sub3, DBUS_TYPE_DOUBLE, &progressValue); + dbus_message_iter_close_container(&sub2, &sub3); + dbus_message_iter_close_container(&sub1, &sub2); + + dbus_message_iter_close_container(&args, &sub1); + + //Finally send the signal + unsigned int serial = 0; + if(!dbus_connection_send(_glfw.dbus.connection, msg, &serial)) + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to send DBus message"); + else + dbus_connection_flush(_glfw.dbus.connection); + + //Free the message + dbus_message_unref(msg); } void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos) diff --git a/src/x11_init.c b/src/x11_init.c index 29c32794..d66824c0 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -1320,6 +1320,8 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform) int _glfwInitX11(void) { + _glfwInitDBusPOSIX(); + _glfw.x11.xlib.AllocClassHint = (PFN_XAllocClassHint) _glfwPlatformGetModuleSymbol(_glfw.x11.xlib.handle, "XAllocClassHint"); _glfw.x11.xlib.AllocSizeHints = (PFN_XAllocSizeHints) @@ -1651,5 +1653,7 @@ void _glfwTerminateX11(void) close(_glfw.x11.emptyEventPipe[0]); close(_glfw.x11.emptyEventPipe[1]); } + + _glfwTerminateDBusPOSIX(); } diff --git a/src/x11_window.c b/src/x11_window.c index c2ab5dfa..bd842265 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2150,9 +2150,96 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag XFlush(_glfw.x11.display); } -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int completed) +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* /*window*/, const int taskbarState, int completed) { - _glfwInputError(GLFW_FEATURE_UNAVAILABLE, "X11: The platform does not support setting the window taskbar progress"); + if(!_glfw.dbus.handle || !_glfw.dbus.connection) + return; + + //Signal signature: + //signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties) + + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); + const double progressValue = (double)completed / 100.0; + + struct DBusMessageIter args; + memset(&args, 0, sizeof(args)); + + //Get name of the running executable + char exeName[PATH_MAX]; + memset(exeName, 0, sizeof(char) * PATH_MAX); + if(readlink("/proc/self/exe", exeName, PATH_MAX) == -1) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); + return; + } + char* exeNameEnd = strchr(exeName, '\0'); + char* lastFound = strrchr(exeName, '/'); + if(!lastFound || !exeNameEnd) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); + return; + } + unsigned int exeNameLength = (exeNameEnd - lastFound) - 1; + + //Create our final desktop file uri + unsigned int desktopFileLength = strlen("application://") + exeNameLength + strlen(".desktop") + 1; + char desktopFile[desktopFileLength]; + memset(desktopFile, 0, sizeof(char) * desktopFileLength); + strcpy(desktopFile, "application://"); + memcpy(desktopFile + strlen("application://"), lastFound + 1, exeNameLength); + strcpy(desktopFile + strlen("application://") + (exeNameLength), ".desktop"); + desktopFile[desktopFileLength - 1] = '\0'; + + DBusMessage* msg = dbus_message_new_signal("/org/glfw", "com.canonical.Unity.LauncherEntry", "Update"); + if(!msg) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create new DBus message"); + return; + } + + dbus_message_iter_init_append(msg, &args); + + //Setup app_uri parameter + const char* desktopFileStr = desktopFile; + dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &desktopFileStr); + + //Set properties parameter + struct DBusMessageIter sub1, sub2, sub3; + memset(&sub1, 0, sizeof(sub1)); + memset(&sub2, 0, sizeof(sub2)); + memset(&sub3, 0, sizeof(sub3)); + + dbus_message_iter_open_container(&args, DBUS_TYPE_ARRAY, "{sv}", &sub1); + + //Set progress visible property + dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); + const char* progressVisibleStr = "progress-visible"; + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressVisibleStr); + dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "b", &sub3); + dbus_message_iter_append_basic(&sub3, DBUS_TYPE_BOOLEAN, &progressVisible); + dbus_message_iter_close_container(&sub2, &sub3); + dbus_message_iter_close_container(&sub1, &sub2); + + //Set progress value property + dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); + const char* progressValueStr = "progress"; + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressValueStr); + dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "d", &sub3); + dbus_message_iter_append_basic(&sub3, DBUS_TYPE_DOUBLE, &progressValue); + dbus_message_iter_close_container(&sub2, &sub3); + dbus_message_iter_close_container(&sub1, &sub2); + + dbus_message_iter_close_container(&args, &sub1); + + //Finally send the signal + unsigned int serial = 0; + if(!dbus_connection_send(_glfw.dbus.connection, msg, &serial)) + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to send DBus message"); + else + dbus_connection_flush(_glfw.dbus.connection); + + //Free the message + dbus_message_unref(msg); } void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos) From 7d5bb13b88148742d8adbe50974d50235461ab22 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 3 Feb 2023 22:48:47 +0100 Subject: [PATCH 03/32] Enabled GitHub Action for the taskbar-progress branch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e4c72e0..d0c3dcd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: pull_request: push: - branches: [ ci, master, latest, 3.3-stable ] + branches: [ ci, master, latest, 3.3-stable, taskbar-progress ] workflow_dispatch: permissions: statuses: write From 48818fc7a9ae816ece808cf03660b3195a5217cb Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 3 Feb 2023 23:23:25 +0100 Subject: [PATCH 04/32] Unified X11/Wayland code path using _glfwUpdateTaskbarProgressDBusPOSIX() --- src/posix_dbus.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ src/posix_dbus.h | 1 + src/wl_window.c | 88 ++------------------------------------------- src/x11_window.c | 86 +------------------------------------------- 4 files changed, 97 insertions(+), 171 deletions(-) diff --git a/src/posix_dbus.c b/src/posix_dbus.c index 0306323f..701eac5e 100644 --- a/src/posix_dbus.c +++ b/src/posix_dbus.c @@ -30,6 +30,10 @@ #include "internal.h" +#include +#include +#include + void _glfwInitDBusPOSIX(void) { //Initialize DBus library functions @@ -124,3 +128,92 @@ void _glfwTerminateDBusPOSIX(void) _glfw.dbus.handle = NULL; } } + +void _glfwUpdateTaskbarProgressDBusPOSIX(dbus_bool_t progressVisible, double progressValue) +{ + if(!_glfw.dbus.handle || !_glfw.dbus.connection) + return; + + //Signal signature: + //signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties) + + struct DBusMessageIter args; + memset(&args, 0, sizeof(args)); + + //Get name of the running executable + char exeName[PATH_MAX]; + memset(exeName, 0, sizeof(char) * PATH_MAX); + if(readlink("/proc/self/exe", exeName, PATH_MAX) == -1) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); + return; + } + char* exeNameEnd = strchr(exeName, '\0'); + char* lastFound = strrchr(exeName, '/'); + if(!lastFound || !exeNameEnd) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); + return; + } + unsigned int exeNameLength = (exeNameEnd - lastFound) - 1; + + //Create our final desktop file uri + unsigned int desktopFileLength = strlen("application://") + exeNameLength + strlen(".desktop") + 1; + char desktopFile[desktopFileLength]; + memset(desktopFile, 0, sizeof(char) * desktopFileLength); + strcpy(desktopFile, "application://"); + memcpy(desktopFile + strlen("application://"), lastFound + 1, exeNameLength); + strcpy(desktopFile + strlen("application://") + (exeNameLength), ".desktop"); + desktopFile[desktopFileLength - 1] = '\0'; + + DBusMessage* msg = dbus_message_new_signal("/org/glfw", "com.canonical.Unity.LauncherEntry", "Update"); + if(!msg) + { + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create new DBus message"); + return; + } + + dbus_message_iter_init_append(msg, &args); + + //Setup app_uri parameter + const char* desktopFileStr = desktopFile; + dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &desktopFileStr); + + //Set properties parameter + struct DBusMessageIter sub1, sub2, sub3; + memset(&sub1, 0, sizeof(sub1)); + memset(&sub2, 0, sizeof(sub2)); + memset(&sub3, 0, sizeof(sub3)); + + dbus_message_iter_open_container(&args, DBUS_TYPE_ARRAY, "{sv}", &sub1); + + //Set progress visible property + dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); + const char* progressVisibleStr = "progress-visible"; + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressVisibleStr); + dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "b", &sub3); + dbus_message_iter_append_basic(&sub3, DBUS_TYPE_BOOLEAN, &progressVisible); + dbus_message_iter_close_container(&sub2, &sub3); + dbus_message_iter_close_container(&sub1, &sub2); + + //Set progress value property + dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); + const char* progressValueStr = "progress"; + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressValueStr); + dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "d", &sub3); + dbus_message_iter_append_basic(&sub3, DBUS_TYPE_DOUBLE, &progressValue); + dbus_message_iter_close_container(&sub2, &sub3); + dbus_message_iter_close_container(&sub1, &sub2); + + dbus_message_iter_close_container(&args, &sub1); + + //Finally send the signal + unsigned int serial = 0; + if(!dbus_connection_send(_glfw.dbus.connection, msg, &serial)) + _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to send DBus message"); + else + dbus_connection_flush(_glfw.dbus.connection); + + //Free the message + dbus_message_unref(msg); +} diff --git a/src/posix_dbus.h b/src/posix_dbus.h index 58cc13ee..82d81bbb 100644 --- a/src/posix_dbus.h +++ b/src/posix_dbus.h @@ -129,3 +129,4 @@ typedef struct _GLFWDBusPOSIX void _glfwInitDBusPOSIX(void); void _glfwTerminateDBusPOSIX(void); +void _glfwUpdateTaskbarProgressDBusPOSIX(dbus_bool_t progressVisible, double progressValue); diff --git a/src/wl_window.c b/src/wl_window.c index c25058aa..97232140 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1902,96 +1902,12 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } -void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int progressState, int completed) +void _glfwSetWindowTaskbarProgress(_GLFWwindow* /*window*/, const int progressState, int completed) { - if(!_glfw.dbus.handle || !_glfw.dbus.connection) - return; - - //Signal signature: - //signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties) - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; - struct DBusMessageIter args; - memset(&args, 0, sizeof(args)); - - //Get name of the running executable - char exeName[PATH_MAX]; - memset(exeName, 0, sizeof(char) * PATH_MAX); - if(readlink("/proc/self/exe", exeName, PATH_MAX) == -1) - { - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); - return; - } - char* exeNameEnd = strchr(exeName, '\0'); - char* lastFound = strrchr(exeName, '/'); - if(!lastFound || !exeNameEnd) - { - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); - return; - } - unsigned int exeNameLength = (exeNameEnd - lastFound) - 1; - - //Create our final desktop file uri - unsigned int desktopFileLength = strlen("application://") + exeNameLength + strlen(".desktop") + 1; - char desktopFile[desktopFileLength]; - memset(desktopFile, 0, sizeof(char) * desktopFileLength); - strcpy(desktopFile, "application://"); - memcpy(desktopFile + strlen("application://"), lastFound + 1, exeNameLength); - strcpy(desktopFile + strlen("application://") + (exeNameLength), ".desktop"); - desktopFile[desktopFileLength - 1] = '\0'; - - DBusMessage* msg = dbus_message_new_signal("/org/glfw", "com.canonical.Unity.LauncherEntry", "Update"); - if(!msg) - { - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create new DBus message"); - return; - } - - dbus_message_iter_init_append(msg, &args); - - //Setup app_uri parameter - const char* desktopFileStr = desktopFile; - dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &desktopFileStr); - - //Set properties parameter - struct DBusMessageIter sub1, sub2, sub3; - memset(&sub1, 0, sizeof(sub1)); - memset(&sub2, 0, sizeof(sub2)); - memset(&sub3, 0, sizeof(sub3)); - - dbus_message_iter_open_container(&args, DBUS_TYPE_ARRAY, "{sv}", &sub1); - - //Set progress visible property - dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); - const char* progressVisibleStr = "progress-visible"; - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressVisibleStr); - dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "b", &sub3); - dbus_message_iter_append_basic(&sub3, DBUS_TYPE_BOOLEAN, &progressVisible); - dbus_message_iter_close_container(&sub2, &sub3); - dbus_message_iter_close_container(&sub1, &sub2); - - //Set progress value property - dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); - const char* progressValueStr = "progress"; - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressValueStr); - dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "d", &sub3); - dbus_message_iter_append_basic(&sub3, DBUS_TYPE_DOUBLE, &progressValue); - dbus_message_iter_close_container(&sub2, &sub3); - dbus_message_iter_close_container(&sub1, &sub2); - - dbus_message_iter_close_container(&args, &sub1); - - //Finally send the signal - unsigned int serial = 0; - if(!dbus_connection_send(_glfw.dbus.connection, msg, &serial)) - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to send DBus message"); - else - dbus_connection_flush(_glfw.dbus.connection); - - //Free the message - dbus_message_unref(msg); + _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos) diff --git a/src/x11_window.c b/src/x11_window.c index 41f51f9c..0a5e8dfc 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2154,94 +2154,10 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* /*window*/, const int taskbarState, int completed) { - if(!_glfw.dbus.handle || !_glfw.dbus.connection) - return; - - //Signal signature: - //signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties) - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; - struct DBusMessageIter args; - memset(&args, 0, sizeof(args)); - - //Get name of the running executable - char exeName[PATH_MAX]; - memset(exeName, 0, sizeof(char) * PATH_MAX); - if(readlink("/proc/self/exe", exeName, PATH_MAX) == -1) - { - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); - return; - } - char* exeNameEnd = strchr(exeName, '\0'); - char* lastFound = strrchr(exeName, '/'); - if(!lastFound || !exeNameEnd) - { - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable"); - return; - } - unsigned int exeNameLength = (exeNameEnd - lastFound) - 1; - - //Create our final desktop file uri - unsigned int desktopFileLength = strlen("application://") + exeNameLength + strlen(".desktop") + 1; - char desktopFile[desktopFileLength]; - memset(desktopFile, 0, sizeof(char) * desktopFileLength); - strcpy(desktopFile, "application://"); - memcpy(desktopFile + strlen("application://"), lastFound + 1, exeNameLength); - strcpy(desktopFile + strlen("application://") + (exeNameLength), ".desktop"); - desktopFile[desktopFileLength - 1] = '\0'; - - DBusMessage* msg = dbus_message_new_signal("/org/glfw", "com.canonical.Unity.LauncherEntry", "Update"); - if(!msg) - { - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create new DBus message"); - return; - } - - dbus_message_iter_init_append(msg, &args); - - //Setup app_uri parameter - const char* desktopFileStr = desktopFile; - dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &desktopFileStr); - - //Set properties parameter - struct DBusMessageIter sub1, sub2, sub3; - memset(&sub1, 0, sizeof(sub1)); - memset(&sub2, 0, sizeof(sub2)); - memset(&sub3, 0, sizeof(sub3)); - - dbus_message_iter_open_container(&args, DBUS_TYPE_ARRAY, "{sv}", &sub1); - - //Set progress visible property - dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); - const char* progressVisibleStr = "progress-visible"; - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressVisibleStr); - dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "b", &sub3); - dbus_message_iter_append_basic(&sub3, DBUS_TYPE_BOOLEAN, &progressVisible); - dbus_message_iter_close_container(&sub2, &sub3); - dbus_message_iter_close_container(&sub1, &sub2); - - //Set progress value property - dbus_message_iter_open_container(&sub1, DBUS_TYPE_DICT_ENTRY, NULL, &sub2); - const char* progressValueStr = "progress"; - dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &progressValueStr); - dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "d", &sub3); - dbus_message_iter_append_basic(&sub3, DBUS_TYPE_DOUBLE, &progressValue); - dbus_message_iter_close_container(&sub2, &sub3); - dbus_message_iter_close_container(&sub1, &sub2); - - dbus_message_iter_close_container(&args, &sub1); - - //Finally send the signal - unsigned int serial = 0; - if(!dbus_connection_send(_glfw.dbus.connection, msg, &serial)) - _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to send DBus message"); - else - dbus_connection_flush(_glfw.dbus.connection); - - //Free the message - dbus_message_unref(msg); + _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos) From 8b1b11c3c4e62a0270fd851966583f7e102bd563 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 3 Feb 2023 23:27:45 +0100 Subject: [PATCH 05/32] Fixed GitHub Action errors --- src/wl_window.c | 4 +++- src/x11_window.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wl_window.c b/src/wl_window.c index 97232140..5c9158f2 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1902,8 +1902,10 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } -void _glfwSetWindowTaskbarProgress(_GLFWwindow* /*window*/, const int progressState, int completed) +void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int taskbarState, int completed) { + (void)window; + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; diff --git a/src/x11_window.c b/src/x11_window.c index 0a5e8dfc..e54c2c9d 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2152,8 +2152,10 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag XFlush(_glfw.x11.display); } -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* /*window*/, const int taskbarState, int completed) +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int completed) { + (void)window; + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; From efac3722133be07a5c40b925a6b4c937863896f6 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 3 Feb 2023 23:31:02 +0100 Subject: [PATCH 06/32] Fixed Wayland linker error --- src/wl_window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wl_window.c b/src/wl_window.c index 5c9158f2..dd00d5d3 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1902,7 +1902,7 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } -void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int taskbarState, int completed) +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int completed) { (void)window; From fb6826c9341e2a97f4128218f37886512574b0aa Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 3 Feb 2023 23:35:29 +0100 Subject: [PATCH 07/32] Fixed Cocoa linker error --- src/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 60bebbed..76d84c14 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1032,7 +1032,7 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } -void _glfwSetWindowTaskbarProgress(_GLFWwindow* window, const int progressState, int completed) +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, int completed) { _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED, "Cocoa: Window taskbar progress is not implemented"); From c8fd71c7e7a671ba942a1ec6659c668965180f81 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Fri, 3 Feb 2023 23:38:45 +0100 Subject: [PATCH 08/32] Added credit --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 47301dae..d7f9174a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -202,6 +202,7 @@ video tutorials. - Riku Salminen - Brandon Schaefer - Sebastian Schuberth + - Jan Schuerkamp - Christian Sdunek - Matt Sealey - Steve Sexton From 19f9247a681963f1fae86c0aa43f108c22287c6b Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Sun, 5 Feb 2023 02:50:53 +0100 Subject: [PATCH 09/32] Added documentation --- docs/window.dox | 5 +++ include/GLFW/glfw3.h | 81 ++++++++++++++++++++++++++++++++++++++++++++ src/win32_window.c | 6 ++-- src/window.c | 4 +-- 4 files changed, 92 insertions(+), 4 deletions(-) diff --git a/docs/window.dox b/docs/window.dox index 3cec6358..f464d3c9 100644 --- a/docs/window.dox +++ b/docs/window.dox @@ -1159,6 +1159,11 @@ not supported, the application as a whole. Once the user has given it attention, the system will automatically end the request. +@subsection window_taskbar_progress Window taskbar progress + +TBD + + @subsection window_refresh Window damage and refresh If you wish to be notified when the contents of a window is damaged and needs diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 62cc0056..6ac16c82 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1272,11 +1272,56 @@ extern "C" { #define GLFW_HAND_CURSOR GLFW_POINTING_HAND_CURSOR /*! @} */ +/*! @addtogroup window + * @{ */ +/*! @brief Disable the progress bar. + * + * Disable the progress bar. + * + * Used by @ref window_taskbar_progress. + */ #define GLFW_TASKBAR_PROGRESS_NOPROGRESS 0 +/*! @brief Display the progress bar in an indeterminate state. + * + * Display the progress bar in an indeterminate state. + * + * @remark @win32 This displays the progress bar animation cycling repeatedly. + * + * @remark @x11 @wayland This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. + * + * Used by @ref window_taskbar_progress. + */ #define GLFW_TASKBAR_PROGRESS_INDETERMINATE 1 +/*! @brief Display the normal progress bar. + * + * Display the normal progress bar. + * + * Used by @ref window_taskbar_progress. + */ #define GLFW_TASKBAR_PROGRESS_NORMAL 2 +/*! @brief Display the progress bar in an error state. + * + * Display the progress bar in an error state. + * + * @remark @win32 This displays a red progress bar with 100% progress. + * + * @remark @x11 @wayland This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. + * + * Used by @ref window_taskbar_progress. + */ #define GLFW_TASKBAR_PROGRESS_ERROR 3 +/*! @brief Display the progress bar in a paused state. + * + * Display the progress bar in a paused state. + * + * @remark @win32 This displays a yellow filled progress bar. + * + * @remark @x11 @wayland This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. + * + * Used by @ref window_taskbar_progress. + */ #define GLFW_TASKBAR_PROGRESS_PAUSED 4 +/*! @} */ #define GLFW_CONNECTED 0x00040001 #define GLFW_DISCONNECTED 0x00040002 @@ -1321,6 +1366,7 @@ extern "C" { * * Hint value for @ref GLFW_PLATFORM that enables automatic platform selection. */ + #define GLFW_ANY_PLATFORM 0x00060000 #define GLFW_PLATFORM_WIN32 0x00060001 #define GLFW_PLATFORM_COCOA 0x00060002 @@ -3310,6 +3356,41 @@ GLFWAPI void glfwSetWindowTitle(GLFWwindow* window, const char* title); */ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* images); +/*! @brief Sets the taskbar progress for the specified window. + * + * This function sets the taskbar progress of the specified window. + * + * @param[in] window The window whose taskbar progress to set. + * @param[in] progressState State of the progress to be displayed in the taskbar. Valid values are: + * @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, + * @ref GLFW_TASKBAR_PROGRESS_NORMAL, @ref GLFW_TASKBAR_PROGRESS_ERROR + * and @ref GLFW_TASKBAR_PROGRESS_PAUSED. + * @param[in] completed The amount of completed progress to set. Valid range is 0 to 100. + * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS. + * + * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref + * GLFW_INVALID_VALUE, @ref GLFW_INVALID_ENUM, @ref GLFW_PLATFORM_ERROR, + * @ref GLFW_FEATURE_UNIMPLEMENTED and @ref GLFW_FEATURE_UNAVAILABLE (see remarks). + * + * @remark @win32 On Windows Vista and earlier, this function will emit @ref GLFW_FEATURE_UNAVAILABLE. + * + * @remark @macos This function will emit @ref GLFW_FEATURE_UNIMPLEMENTED. + * + * @remark @x11 @wayland Requires a valid application desktop file with the same name + * as the compiled executable. Due to limitations in the Unity Launcher API + * @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, @ref GLFW_TASKBAR_PROGRESS_ERROR and @ref GLFW_TASKBAR_PROGRESS_PAUSED + * have the same behaviour as @ref GLFW_TASKBAR_PROGRESS_NORMAL. The Unity Launcher API is only known + * to be supported on the Unity and KDE desktop environments, on other desktop environments this + * function may do nothing. + * + * @thread_safety This function must only be called from the main thread. + * + * @sa @ref window_taskbar_progress + * + * @since Added in version 3.4. + * + * @ingroup window + */ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, int completed); /*! @brief Retrieves the position of the content area of the specified window. diff --git a/src/win32_window.c b/src/win32_window.c index 05f12bda..28f60b52 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1598,17 +1598,19 @@ void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* im void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, int completed) { + HRESULT res = S_OK; + int32_t winProgressState = 0; + if(!window->win32.TaskbarList) return; - HRESULT res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, completed, 100); + res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, completed, 100); if(res != S_OK) { _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress value"); return; } - int32_t winProgressState = 0; switch(progressState) { case 1: diff --git a/src/window.c b/src/window.c index 82807ef2..f74cb521 100644 --- a/src/window.c +++ b/src/window.c @@ -563,8 +563,8 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress _GLFWwindow* window = (_GLFWwindow*) handle; assert(window != NULL); - assert(completed >= 0); - assert(completed <= 100); + + _GLFW_REQUIRE_INIT(); if (completed < 0) { From f590075121204e70cc1e1adbcfa4572a2779dff0 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Sun, 5 Feb 2023 02:53:47 +0100 Subject: [PATCH 10/32] Removed taskbar-progress from branch local GH Actions workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0c3dcd3..4e4c72e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: pull_request: push: - branches: [ ci, master, latest, 3.3-stable, taskbar-progress ] + branches: [ ci, master, latest, 3.3-stable ] workflow_dispatch: permissions: statuses: write From 74dac5cfb45c6a07688d22fd573bac6524aef3ec Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Sun, 5 Feb 2023 03:03:54 +0100 Subject: [PATCH 11/32] Win32: glfwSetWindowTaskbarProgress now emits GLFW_FEATURE_UNAVAILABLE on Windows Vista and older --- src/win32_window.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/win32_window.c b/src/win32_window.c index 28f60b52..0d393f4b 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1601,6 +1601,12 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressS HRESULT res = S_OK; int32_t winProgressState = 0; + if(!IsWindows7OrGreater()) + { + _glfwInputErrorWin32(GLFW_FEATURE_UNAVAILABLE, "Win32: Taskbar progress is only supported on Windows 7 or newer"); + return; + } + if(!window->win32.TaskbarList) return; From 4a66bf3b60ef268ae9414888548be88c07e69d77 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Sun, 5 Feb 2023 04:19:15 +0100 Subject: [PATCH 12/32] Added documentation to window.dox --- docs/window.dox | 17 ++++++++++++++++- src/win32_window.c | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/window.dox b/docs/window.dox index f464d3c9..fc8bf8ad 100644 --- a/docs/window.dox +++ b/docs/window.dox @@ -1161,7 +1161,22 @@ attention, the system will automatically end the request. @subsection window_taskbar_progress Window taskbar progress -TBD +If you whish to display the progress of some action on the taskbar, you can +do this with @ref glfwSetWindowTaskbarProgress. + +@code +glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, 50); +@endcode + +There are different taskbar progress states available for you to use: + - @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS + - @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE + - @ref GLFW_TASKBAR_PROGRESS_NORMAL + - @ref GLFW_TASKBAR_PROGRESS_ERROR + - @ref GLFW_TASKBAR_PROGRESS_PAUSED + +The last argument is the progress percentage to display. +It has a valid range of 0 to 100. @subsection window_refresh Window damage and refresh diff --git a/src/win32_window.c b/src/win32_window.c index 0d393f4b..fe4c2b56 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1603,7 +1603,7 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressS if(!IsWindows7OrGreater()) { - _glfwInputErrorWin32(GLFW_FEATURE_UNAVAILABLE, "Win32: Taskbar progress is only supported on Windows 7 or newer"); + _glfwInputError(GLFW_FEATURE_UNAVAILABLE, "Win32: Taskbar progress is only supported on Windows 7 or newer"); return; } From 1071cf1950d359b25f1a188bc27ff60db65f2d1e Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Wed, 1 Mar 2023 17:25:58 +0100 Subject: [PATCH 13/32] win32_platform.h Removed ShObjIdl_core.h include dependency --- src/win32_platform.h | 75 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/src/win32_platform.h b/src/win32_platform.h index a1a0b138..44b8006a 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -69,7 +69,6 @@ #include #include #include -#include // HACK: Define macros that some windows.h variants don't #ifndef WM_MOUSEHWHEEL @@ -367,6 +366,79 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)( #define GLFW_WGL_CONTEXT_STATE _GLFWcontextWGL wgl; #define GLFW_WGL_LIBRARY_CONTEXT_STATE _GLFWlibraryWGL wgl; +typedef enum +{ + TBPF_NOPROGRESS = 0x0, + TBPF_INDETERMINATE = 0x1, + TBPF_NORMAL = 0x2, + TBPF_ERROR = 0x4, + TBPF_PAUSED = 0x8 +} TBPFLAG; + +static const IID IID_ITaskbarList3 = { 0xea1afb91, 0x9e28, 0x4b86, {0x90, 0xe9, 0x9e, 0x9f, 0x8a, 0x5e, 0xef, 0xaf} }; +static const IID CLSID_TaskbarList = { 0x56fdf344, 0xfd6d, 0x11d0, {0x95, 0x8a, 0x00, 0x60, 0x97, 0xc9, 0xa0, 0x90} }; + +typedef enum THUMBBUTTONMASK +{ + THB_BITMAP = 0x1, + THB_ICON = 0x2, + THB_TOOLTIP = 0x4, + THB_FLAGS = 0x8 +} THUMBBUTTONMASK; + +typedef enum THUMBBUTTONFLAGS +{ + THBF_ENABLED = 0, + THBF_DISABLED = 0x1, + THBF_DISMISSONCLICK = 0x2, + THBF_NOBACKGROUND = 0x4, + THBF_HIDDEN = 0x8, + THBF_NONINTERACTIVE = 0x10 +} THUMBBUTTONFLAGS; + +typedef struct THUMBBUTTON { + THUMBBUTTONMASK dwMask; + UINT iId; + UINT iBitmap; + HICON hIcon; + WCHAR szTip[260]; + THUMBBUTTONFLAGS dwFlags; +} THUMBBUTTON, * LPTHUMBBUTTON; + +struct _IMAGELIST; +typedef struct _IMAGELIST* HIMAGELIST; + +typedef struct ITaskbarList3 ITaskbarList3; + +typedef struct ITaskbarList3Vtbl +{ + HRESULT(WINAPI* QueryInterface)(struct ITaskbarList3*, const IID* const, void**); + ULONG(WINAPI* AddRef)(struct ITaskbarList3*); + ULONG(WINAPI* Release)(struct ITaskbarList3*); + HRESULT(WINAPI* HrInit)(struct ITaskbarList3*); + HRESULT(WINAPI* AddTab)(struct ITaskbarList3*, HWND); + HRESULT(WINAPI* DeleteTab)(struct ITaskbarList3*, HWND); + HRESULT(WINAPI* ActivateTab)(struct ITaskbarList3*, HWND); + HRESULT(WINAPI* SetActiveAlt)(struct ITaskbarList3*, HWND); + HRESULT(WINAPI* MarkFullscreenWindow)(struct ITaskbarList3*, HWND, BOOL); + HRESULT(WINAPI* SetProgressValue)(struct ITaskbarList3*, HWND, ULONGLONG, ULONGLONG); + HRESULT(WINAPI* SetProgressState)(struct ITaskbarList3*, HWND, TBPFLAG); + HRESULT(WINAPI* RegisterTab)(struct ITaskbarList3*, HWND, HWND); + HRESULT(WINAPI* UnregisterTab)(struct ITaskbarList3*, HWND); + HRESULT(WINAPI* SetTabOrder)(struct ITaskbarList3*, HWND, HWND); + HRESULT(WINAPI* SetTabActive)(struct ITaskbarList3*, HWND, HWND, DWORD); + HRESULT(WINAPI* ThumbBarAddButtons)(struct ITaskbarList3*, HWND, UINT, LPTHUMBBUTTON); + HRESULT(WINAPI* ThumbBarUpdateButtons)(struct ITaskbarList3*, HWND, UINT, LPTHUMBBUTTON); + HRESULT(WINAPI* ThumbBarSetImageList)(struct ITaskbarList3*, HWND, HIMAGELIST); + HRESULT(WINAPI* SetOverlayIcon)(struct ITaskbarList3*, HWND, HICON, LPCWSTR); + HRESULT(WINAPI* SetThumbnailTooltip)(struct ITaskbarList3*, HWND, LPCWSTR); + HRESULT(WINAPI* SetThumbnailClip)(struct ITaskbarList3*, HWND, RECT*); +} ITaskbarList3Vtbl; + +struct ITaskbarList3 +{ + struct ITaskbarList3Vtbl* lpVtbl; +}; // WGL-specific per-context data // @@ -526,7 +598,6 @@ typedef struct _GLFWcursorWin32 HCURSOR handle; } _GLFWcursorWin32; - GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform); int _glfwInitWin32(void); void _glfwTerminateWin32(void); From 3e7b016a00a8e643a5925b0565e02bcf0d1a41f5 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Wed, 1 Mar 2023 22:22:01 +0100 Subject: [PATCH 14/32] Renamed GLFW_TASKBAR_PROGRESS_NOPROGRESS to GLFW_TASKBAR_PROGRESS_DISABLED --- docs/window.dox | 2 +- include/GLFW/glfw3.h | 7 +++---- src/posix_dbus.c | 4 ++-- src/window.c | 3 +-- src/wl_window.c | 3 +-- src/x11_window.c | 3 +-- tests/window.c | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/window.dox b/docs/window.dox index fc8bf8ad..e3915a3f 100644 --- a/docs/window.dox +++ b/docs/window.dox @@ -1169,7 +1169,7 @@ glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, 50); @endcode There are different taskbar progress states available for you to use: - - @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS + - @ref GLFW_TASKBAR_PROGRESS_DISABLED - @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE - @ref GLFW_TASKBAR_PROGRESS_NORMAL - @ref GLFW_TASKBAR_PROGRESS_ERROR diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 6ac16c82..8854af9c 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1280,7 +1280,7 @@ extern "C" { * * Used by @ref window_taskbar_progress. */ -#define GLFW_TASKBAR_PROGRESS_NOPROGRESS 0 +#define GLFW_TASKBAR_PROGRESS_DISABLED 0 /*! @brief Display the progress bar in an indeterminate state. * * Display the progress bar in an indeterminate state. @@ -3362,11 +3362,11 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * * @param[in] window The window whose taskbar progress to set. * @param[in] progressState State of the progress to be displayed in the taskbar. Valid values are: - * @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, + * @ref GLFW_TASKBAR_PROGRESS_DISABLED, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, * @ref GLFW_TASKBAR_PROGRESS_NORMAL, @ref GLFW_TASKBAR_PROGRESS_ERROR * and @ref GLFW_TASKBAR_PROGRESS_PAUSED. * @param[in] completed The amount of completed progress to set. Valid range is 0 to 100. - * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_NOPROGRESS. + * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_DISABLED. * * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref * GLFW_INVALID_VALUE, @ref GLFW_INVALID_ENUM, @ref GLFW_PLATFORM_ERROR, @@ -6510,4 +6510,3 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window #endif #endif /* _glfw3_h_ */ - diff --git a/src/posix_dbus.c b/src/posix_dbus.c index 701eac5e..ba494ffd 100644 --- a/src/posix_dbus.c +++ b/src/posix_dbus.c @@ -109,8 +109,8 @@ void _glfwInitDBusPOSIX(void) if(_glfw.dbus.connection) { //Window NULL is safe here because it won't get - //used inside th eSetWindowTaskbarProgress function - _glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_NOPROGRESS, 0); + //used inside the SetWindowTaskbarProgress function + _glfw.platform.setWindowTaskbarProgress(NULL, GLFW_TASKBAR_PROGRESS_DISABLED, 0); } } diff --git a/src/window.c b/src/window.c index f74cb521..aeeb45f8 100644 --- a/src/window.c +++ b/src/window.c @@ -577,7 +577,7 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress return; } - if (progressState != GLFW_TASKBAR_PROGRESS_NOPROGRESS && progressState != GLFW_TASKBAR_PROGRESS_INDETERMINATE && + if (progressState != GLFW_TASKBAR_PROGRESS_DISABLED && progressState != GLFW_TASKBAR_PROGRESS_INDETERMINATE && progressState != GLFW_TASKBAR_PROGRESS_NORMAL && progressState != GLFW_TASKBAR_PROGRESS_ERROR && progressState != GLFW_TASKBAR_PROGRESS_PAUSED) { @@ -1182,4 +1182,3 @@ GLFWAPI void glfwPostEmptyEvent(void) _GLFW_REQUIRE_INIT(); _glfw.platform.postEmptyEvent(); } - diff --git a/src/wl_window.c b/src/wl_window.c index dd00d5d3..dacecfcb 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1906,8 +1906,8 @@ void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbar { (void)window; - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } @@ -2901,4 +2901,3 @@ GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* handle) } #endif // _GLFW_WAYLAND - diff --git a/src/x11_window.c b/src/x11_window.c index e54c2c9d..e95cf588 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2156,8 +2156,8 @@ void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarStat { (void)window; - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_NOPROGRESS); const double progressValue = (double)completed / 100.0; + const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } @@ -3362,4 +3362,3 @@ GLFWAPI const char* glfwGetX11SelectionString(void) } #endif // _GLFW_X11 - diff --git a/tests/window.c b/tests/window.c index 53fb655f..c7631246 100644 --- a/tests/window.c +++ b/tests/window.c @@ -420,7 +420,7 @@ int main(int argc, char** argv) static int progress = 0; if(nk_button_label(nk, "No progress")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NOPROGRESS, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_DISABLED, progress); if (nk_button_label(nk, "Indeterminate")) glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); if (nk_button_label(nk, "Normal")) From a480de9b1dbca62bcd9d15891b1086676c4a07cd Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Wed, 1 Mar 2023 22:27:52 +0100 Subject: [PATCH 15/32] glfwSetWindowTaskbarProgress Renamed parameter completed to value --- include/GLFW/glfw3.h | 5 +++-- src/cocoa_platform.h | 2 +- src/cocoa_window.m | 2 +- src/null_platform.h | 2 +- src/null_window.c | 2 +- src/win32_platform.h | 2 +- src/win32_window.c | 4 ++-- src/window.c | 12 ++++-------- src/wl_platform.h | 2 +- src/wl_window.c | 5 +++-- src/x11_platform.h | 2 +- src/x11_window.c | 5 +++-- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 8854af9c..3b622d35 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -3365,7 +3365,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * @ref GLFW_TASKBAR_PROGRESS_DISABLED, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, * @ref GLFW_TASKBAR_PROGRESS_NORMAL, @ref GLFW_TASKBAR_PROGRESS_ERROR * and @ref GLFW_TASKBAR_PROGRESS_PAUSED. - * @param[in] completed The amount of completed progress to set. Valid range is 0 to 100. + * @param[in] value The amount of completed progress to set. Valid range is 0 to 100. * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_DISABLED. * * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref @@ -3391,7 +3391,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * * @ingroup window */ -GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, int completed); +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, int value); /*! @brief Retrieves the position of the content area of the specified window. * @@ -6510,3 +6510,4 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window #endif #endif /* _glfw3_h_ */ + diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 936843ad..9ebfbda9 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -218,7 +218,7 @@ GLFWbool _glfwCreateWindowCocoa(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowCocoa(_GLFWwindow* window); void _glfwSetWindowTitleCocoa(_GLFWwindow* window, const char* title); void _glfwSetWindowIconCocoa(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int taskbarState, int completed); +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int taskbarState, int value); void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosCocoa(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeCocoa(_GLFWwindow* window, int* width, int* height); diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 76d84c14..3b2c6dae 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1032,7 +1032,7 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } -void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, int completed) +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, int value) { _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED, "Cocoa: Window taskbar progress is not implemented"); diff --git a/src/null_platform.h b/src/null_platform.h index 348ded2e..80e2946f 100644 --- a/src/null_platform.h +++ b/src/null_platform.h @@ -89,7 +89,7 @@ GLFWbool _glfwCreateWindowNull(_GLFWwindow* window, const _GLFWwndconfig* wndcon void _glfwDestroyWindowNull(_GLFWwindow* window); void _glfwSetWindowTitleNull(_GLFWwindow* window, const char* title); void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int taskbarState, int completed); +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int taskbarState, int value); void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate); void _glfwGetWindowPosNull(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosNull(_GLFWwindow* window, int xpos, int ypos); diff --git a/src/null_window.c b/src/null_window.c index f7dafbc2..bbb30e68 100644 --- a/src/null_window.c +++ b/src/null_window.c @@ -187,7 +187,7 @@ void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* ima { } -void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int progressState, int completed) +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int progressState, int value) { } diff --git a/src/win32_platform.h b/src/win32_platform.h index 44b8006a..9ec1174b 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -618,7 +618,7 @@ GLFWbool _glfwCreateWindowWin32(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowWin32(_GLFWwindow* window); void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int taskbarState, int completed); +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int taskbarState, int value); void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWin32(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWin32(_GLFWwindow* window, int* width, int* height); diff --git a/src/win32_window.c b/src/win32_window.c index fe4c2b56..2f8d7a0e 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1596,7 +1596,7 @@ void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* im } } -void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, int completed) +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, int value) { HRESULT res = S_OK; int32_t winProgressState = 0; @@ -1610,7 +1610,7 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressS if(!window->win32.TaskbarList) return; - res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, completed, 100); + res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, value, 100); if(res != S_OK) { _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress value"); diff --git a/src/window.c b/src/window.c index aeeb45f8..46dff20c 100644 --- a/src/window.c +++ b/src/window.c @@ -558,7 +558,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* handle, _glfw.platform.setWindowIcon(window, count, images); } -GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progressState, int completed) +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progressState, int value) { _GLFWwindow* window = (_GLFWwindow*) handle; @@ -566,12 +566,7 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress _GLFW_REQUIRE_INIT(); - if (completed < 0) - { - _glfwInputError(GLFW_INVALID_VALUE, "Invalid progress amount for window taskbar progress"); - return; - } - else if (completed > 100) + if (value < 0 || value > 100) { _glfwInputError(GLFW_INVALID_VALUE, "Invalid progress amount for window taskbar progress"); return; @@ -585,7 +580,7 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress return; } - _glfw.platform.setWindowTaskbarProgress(window, progressState, completed); + _glfw.platform.setWindowTaskbarProgress(window, progressState, value); } GLFWAPI void glfwGetWindowPos(GLFWwindow* handle, int* xpos, int* ypos) @@ -1182,3 +1177,4 @@ GLFWAPI void glfwPostEmptyEvent(void) _GLFW_REQUIRE_INIT(); _glfw.platform.postEmptyEvent(); } + diff --git a/src/wl_platform.h b/src/wl_platform.h index c5152af3..eaa29d87 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -446,7 +446,7 @@ GLFWbool _glfwCreateWindowWayland(_GLFWwindow* window, const _GLFWwndconfig* wnd void _glfwDestroyWindowWayland(_GLFWwindow* window); void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int completed); +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int value); void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height); diff --git a/src/wl_window.c b/src/wl_window.c index dacecfcb..df7339bf 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1902,12 +1902,12 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } -void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int completed) +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int value) { (void)window; - const double progressValue = (double)completed / 100.0; const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); + const double progressValue = (double)value / 100.0; _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } @@ -2901,3 +2901,4 @@ GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* handle) } #endif // _GLFW_WAYLAND + diff --git a/src/x11_platform.h b/src/x11_platform.h index f49867c0..20766834 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -905,7 +905,7 @@ GLFWbool _glfwCreateWindowX11(_GLFWwindow* window, const _GLFWwndconfig* wndconf void _glfwDestroyWindowX11(_GLFWwindow* window); void _glfwSetWindowTitleX11(_GLFWwindow* window, const char* title); void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int completed); +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int value); void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosX11(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height); diff --git a/src/x11_window.c b/src/x11_window.c index e95cf588..d2583608 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2152,12 +2152,12 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag XFlush(_glfw.x11.display); } -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int completed) +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int value) { (void)window; - const double progressValue = (double)completed / 100.0; const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); + const double progressValue = (double)value / 100.0; _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); } @@ -3362,3 +3362,4 @@ GLFWAPI const char* glfwGetX11SelectionString(void) } #endif // _GLFW_X11 + From e387ef3fdf31f9e7037d1b6359fdcf7955288cc8 Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Wed, 1 Mar 2023 22:28:02 +0100 Subject: [PATCH 16/32] Added changelog entry to readme --- README.md | 1 + src/win32_window.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8b4a1546..96e92609 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ information on what to include when reporting a bug. ## Changelog + - Added `glfwSetWindowTaskbarProgress` allowing to display progress on the taskbar (#2286,#1183) - Added `GLFW_PLATFORM` init hint for runtime platform selection (#1958) - Added `GLFW_ANY_PLATFORM`, `GLFW_PLATFORM_WIN32`, `GLFW_PLATFORM_COCOA`, `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` and `GLFW_PLATFORM_NULL` symbols to diff --git a/src/win32_window.c b/src/win32_window.c index 2f8d7a0e..2123934d 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1620,20 +1620,20 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressS switch(progressState) { case 1: - winProgressState = 0x1; + winProgressState = TBPF_INDETERMINATE; break; case 2: - winProgressState = 0x2; + winProgressState = TBPF_NORMAL; break; case 3: - winProgressState = 0x4; + winProgressState = TBPF_ERROR; break; case 4: - winProgressState = 0x8; + winProgressState = TBPF_PAUSED; break; - case 0: + default: - winProgressState = 0x0; + winProgressState = TBPF_NOPROGRESS; break; } From 34ee36c08893710a1c574ab547303b9dc9177c37 Mon Sep 17 00:00:00 2001 From: ws909 <37029098+ws909@users.noreply.github.com> Date: Thu, 2 Mar 2023 05:20:05 +0100 Subject: [PATCH 17/32] Initial shared overridable Dock progress bar for all windows in Cocoa --- src/cocoa_window.m | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 3b2c6dae..ead90dea 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1032,10 +1032,79 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } +// TODO: potential enhancement: use float or double for higher precision than int. +// TODO: potential enhancement: also specify the source's weight. Used for calculating the combined progress. +// TODO: move static progressIndicator to _glfw.ns. Remove/release in glfwTerminate. +// TODO: allow multiple windows to set values. Use the combined progress for all of them; example: [35%, 70%, 90%] => 65%. +// FIXME: Switching from INDETERMINATE to NORMAL, PAUSED or ERROR requires 2 invocations. void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, int value) { + static NSProgressIndicator* progressIndicator; + _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED, "Cocoa: Window taskbar progress is not implemented"); + + NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile]; + + if (progressIndicator == nil) + { + if ([dockTile contentView] == nil) + { + NSImageView *iconView = [[NSImageView alloc] init]; + [iconView setImage:[[NSApplication sharedApplication] applicationIconImage]]; + [dockTile setContentView:iconView]; + } + NSView* contentView = [dockTile contentView]; + + //progressIndicator = [[NSProgressIndicator alloc] init]; + progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, contentView.frame.size.width, 15.0f)]; + [progressIndicator setStyle:NSProgressIndicatorStyleBar]; + [progressIndicator setControlSize:NSControlSizeLarge]; + [progressIndicator setMinValue:0.0f]; + [progressIndicator setMaxValue:100.0f]; + + [progressIndicator setAccessibilityLabel:@"LABEL"]; + [progressIndicator setAccessibilityHelp:@"HELP"]; + [progressIndicator setToolTip:@"TOOLTIP"]; + + [contentView addSubview:progressIndicator]; + + /* + NSLayoutConstraint* constraint = [NSLayoutConstraint constraintWithItem:progressIndicator + attribute:NSLayoutAttributeWidth + relatedBy:NSLayoutRelationEqual + toItem:contentView + attribute:NSLayoutAttributeWidth + multiplier:1.0f + constant:0.0f]; + + [contentView addConstraint:constraint];*/ + + [progressIndicator release]; + } + + + switch (progressState) + { + case GLFW_TASKBAR_PROGRESS_DISABLED: + [progressIndicator setIndeterminate:NO]; + [progressIndicator setHidden:YES]; + break; + case GLFW_TASKBAR_PROGRESS_INDETERMINATE: + [progressIndicator setIndeterminate:YES]; + [progressIndicator setHidden:NO]; + break; + case GLFW_TASKBAR_PROGRESS_NORMAL: + case GLFW_TASKBAR_PROGRESS_PAUSED: + case GLFW_TASKBAR_PROGRESS_ERROR: + [progressIndicator setIndeterminate:NO]; + [progressIndicator setHidden:NO]; + break; + } + + [progressIndicator setDoubleValue:value]; + + [dockTile display]; } void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos) From 78e4f9bd679fcc48187917afabbe8db381fd4259 Mon Sep 17 00:00:00 2001 From: ws909 <37029098+ws909@users.noreply.github.com> Date: Thu, 2 Mar 2023 05:20:32 +0100 Subject: [PATCH 18/32] Make progress bar slider in window test program responsive --- tests/window.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/window.c b/tests/window.c index c7631246..5526c592 100644 --- a/tests/window.c +++ b/tests/window.c @@ -418,20 +418,22 @@ int main(int argc, char** argv) nk_layout_row_dynamic(nk, 30, 5); + static int state = GLFW_TASKBAR_PROGRESS_DISABLED; static int progress = 0; if(nk_button_label(nk, "No progress")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_DISABLED, progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_DISABLED, progress); if (nk_button_label(nk, "Indeterminate")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); if (nk_button_label(nk, "Normal")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_NORMAL, progress); if (nk_button_label(nk, "Error")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_ERROR, progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_ERROR, progress); if (nk_button_label(nk, "Paused")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_PAUSED, progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_PAUSED, progress); nk_label(nk, "Progress: ", NK_TEXT_ALIGN_LEFT); - nk_slider_int(nk, 0, &progress, 100, 1); + if (nk_slider_int(nk, 0, &progress, 100, 1)) + glfwSetWindowTaskbarProgress(window, state, progress); } nk_end(nk); From 0f142e3a1a7689677c98c047d5c2f906c309e9eb Mon Sep 17 00:00:00 2001 From: GamesTrap Date: Thu, 2 Mar 2023 13:50:16 +0100 Subject: [PATCH 19/32] glfwSetWindowTaskbarProgress Changed value type from int to double --- docs/window.dox | 2 +- include/GLFW/glfw3.h | 4 ++-- src/cocoa_platform.h | 2 +- src/cocoa_window.m | 2 +- src/internal.h | 2 +- src/null_platform.h | 2 +- src/null_window.c | 2 +- src/win32_platform.h | 2 +- src/win32_window.c | 7 ++++--- src/window.c | 4 ++-- src/wl_platform.h | 2 +- src/wl_window.c | 5 ++--- src/x11_platform.h | 2 +- src/x11_window.c | 5 ++--- tests/window.c | 14 +++++++------- 15 files changed, 28 insertions(+), 29 deletions(-) diff --git a/docs/window.dox b/docs/window.dox index e3915a3f..6a51ac58 100644 --- a/docs/window.dox +++ b/docs/window.dox @@ -1176,7 +1176,7 @@ There are different taskbar progress states available for you to use: - @ref GLFW_TASKBAR_PROGRESS_PAUSED The last argument is the progress percentage to display. -It has a valid range of 0 to 100. +It has a valid range of 0.0 to 1.0. @subsection window_refresh Window damage and refresh diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 3b622d35..b7826263 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -3365,7 +3365,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * @ref GLFW_TASKBAR_PROGRESS_DISABLED, @ref GLFW_TASKBAR_PROGRESS_INDETERMINATE, * @ref GLFW_TASKBAR_PROGRESS_NORMAL, @ref GLFW_TASKBAR_PROGRESS_ERROR * and @ref GLFW_TASKBAR_PROGRESS_PAUSED. - * @param[in] value The amount of completed progress to set. Valid range is 0 to 100. + * @param[in] value The amount of completed progress to set. Valid range is 0.0 to 1.0. * This is ignored if progressState is set to @ref GLFW_TASKBAR_PROGRESS_DISABLED. * * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref @@ -3391,7 +3391,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * * @ingroup window */ -GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, int value); +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, double value); /*! @brief Retrieves the position of the content area of the specified window. * diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 9ebfbda9..4323a874 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -218,7 +218,7 @@ GLFWbool _glfwCreateWindowCocoa(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowCocoa(_GLFWwindow* window); void _glfwSetWindowTitleCocoa(_GLFWwindow* window, const char* title); void _glfwSetWindowIconCocoa(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int taskbarState, int value); +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int taskbarState, double value); void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosCocoa(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeCocoa(_GLFWwindow* window, int* width, int* height); diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 3b2c6dae..a7ba3030 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1032,7 +1032,7 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } -void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, int value) +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, double value) { _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED, "Cocoa: Window taskbar progress is not implemented"); diff --git a/src/internal.h b/src/internal.h index 7f74e293..3766294b 100644 --- a/src/internal.h +++ b/src/internal.h @@ -706,7 +706,7 @@ struct _GLFWplatform void (*destroyWindow)(_GLFWwindow*); void (*setWindowTitle)(_GLFWwindow*,const char*); void (*setWindowIcon)(_GLFWwindow*,int,const GLFWimage*); - void (*setWindowTaskbarProgress)(_GLFWwindow*,const int,int); + void (*setWindowTaskbarProgress)(_GLFWwindow*,const int,double); void (*getWindowPos)(_GLFWwindow*,int*,int*); void (*setWindowPos)(_GLFWwindow*,int,int); void (*getWindowSize)(_GLFWwindow*,int*,int*); diff --git a/src/null_platform.h b/src/null_platform.h index 80e2946f..a4e5e4ad 100644 --- a/src/null_platform.h +++ b/src/null_platform.h @@ -89,7 +89,7 @@ GLFWbool _glfwCreateWindowNull(_GLFWwindow* window, const _GLFWwndconfig* wndcon void _glfwDestroyWindowNull(_GLFWwindow* window); void _glfwSetWindowTitleNull(_GLFWwindow* window, const char* title); void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int taskbarState, int value); +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int taskbarState, double value); void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate); void _glfwGetWindowPosNull(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosNull(_GLFWwindow* window, int xpos, int ypos); diff --git a/src/null_window.c b/src/null_window.c index bbb30e68..2638827e 100644 --- a/src/null_window.c +++ b/src/null_window.c @@ -187,7 +187,7 @@ void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* ima { } -void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int progressState, int value) +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int progressState, double value) { } diff --git a/src/win32_platform.h b/src/win32_platform.h index 9ec1174b..34847e81 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -618,7 +618,7 @@ GLFWbool _glfwCreateWindowWin32(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowWin32(_GLFWwindow* window); void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int taskbarState, int value); +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int taskbarState, double value); void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWin32(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWin32(_GLFWwindow* window, int* width, int* height); diff --git a/src/win32_window.c b/src/win32_window.c index 2123934d..44a2ae00 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1596,10 +1596,11 @@ void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* im } } -void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, int value) +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, double value) { HRESULT res = S_OK; - int32_t winProgressState = 0; + int winProgressState = 0; + int progressValue = (int)(value * 100.0); if(!IsWindows7OrGreater()) { @@ -1610,7 +1611,7 @@ void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressS if(!window->win32.TaskbarList) return; - res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, value, 100); + res = window->win32.TaskbarList->lpVtbl->SetProgressValue(window->win32.TaskbarList, window->win32.handle, progressValue, 100); if(res != S_OK) { _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, "Win32: Failed to set taskbar progress value"); diff --git a/src/window.c b/src/window.c index 46dff20c..c68b7fd6 100644 --- a/src/window.c +++ b/src/window.c @@ -558,7 +558,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* handle, _glfw.platform.setWindowIcon(window, count, images); } -GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progressState, int value) +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progressState, double value) { _GLFWwindow* window = (_GLFWwindow*) handle; @@ -566,7 +566,7 @@ GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progress _GLFW_REQUIRE_INIT(); - if (value < 0 || value > 100) + if (value < 0.0 || value > 1.0) { _glfwInputError(GLFW_INVALID_VALUE, "Invalid progress amount for window taskbar progress"); return; diff --git a/src/wl_platform.h b/src/wl_platform.h index eaa29d87..fabc90a2 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -446,7 +446,7 @@ GLFWbool _glfwCreateWindowWayland(_GLFWwindow* window, const _GLFWwndconfig* wnd void _glfwDestroyWindowWayland(_GLFWwindow* window); void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int value); +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, double value); void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height); diff --git a/src/wl_window.c b/src/wl_window.c index df7339bf..f35072d5 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1902,14 +1902,13 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } -void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, int value) +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, double value) { (void)window; const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); - const double progressValue = (double)value / 100.0; - _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); + _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value); } void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos) diff --git a/src/x11_platform.h b/src/x11_platform.h index 20766834..6eeeab4e 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -905,7 +905,7 @@ GLFWbool _glfwCreateWindowX11(_GLFWwindow* window, const _GLFWwndconfig* wndconf void _glfwDestroyWindowX11(_GLFWwindow* window); void _glfwSetWindowTitleX11(_GLFWwindow* window, const char* title); void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int value); +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, double value); void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosX11(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height); diff --git a/src/x11_window.c b/src/x11_window.c index d2583608..236ecc45 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2152,14 +2152,13 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag XFlush(_glfw.x11.display); } -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, int value) +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, double value) { (void)window; const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); - const double progressValue = (double)value / 100.0; - _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, progressValue); + _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value); } void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos) diff --git a/tests/window.c b/tests/window.c index c7631246..69975aee 100644 --- a/tests/window.c +++ b/tests/window.c @@ -418,20 +418,20 @@ int main(int argc, char** argv) nk_layout_row_dynamic(nk, 30, 5); - static int progress = 0; + static float progress = 0; if(nk_button_label(nk, "No progress")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_DISABLED, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_DISABLED, (double)progress); if (nk_button_label(nk, "Indeterminate")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, (double)progress); if (nk_button_label(nk, "Normal")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, (double)progress); if (nk_button_label(nk, "Error")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_ERROR, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_ERROR, (double)progress); if (nk_button_label(nk, "Paused")) - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_PAUSED, progress); + glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_PAUSED, (double)progress); nk_label(nk, "Progress: ", NK_TEXT_ALIGN_LEFT); - nk_slider_int(nk, 0, &progress, 100, 1); + nk_slider_float(nk, 0.0f, &progress, 1.0f, 0.05f); } nk_end(nk); From a9b36d48d7677fded52356def8920dcd828b5abd Mon Sep 17 00:00:00 2001 From: ws909 <37029098+ws909@users.noreply.github.com> Date: Thu, 2 Mar 2023 15:51:10 +0100 Subject: [PATCH 20/32] Simplify _glfwSetWindowTaskbarProgressCocoa Fix merge issues Rename taskbarState to progressState Remove const qualifier from progressState parameter --- CONTRIBUTORS.md | 1 + include/GLFW/glfw3.h | 2 +- src/cocoa_init.m | 6 ++++ src/cocoa_platform.h | 4 ++- src/cocoa_window.m | 83 +++++++++++++++++--------------------------- src/null_platform.h | 2 +- src/null_window.c | 2 +- src/win32_platform.h | 2 +- src/win32_window.c | 2 +- src/window.c | 2 +- src/wl_platform.h | 2 +- src/wl_window.c | 4 +-- src/x11_platform.h | 2 +- src/x11_window.c | 4 +-- tests/window.c | 21 ++++------- 15 files changed, 61 insertions(+), 78 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d7f9174a..60898844 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -98,6 +98,7 @@ video tutorials. - IntellectualKitty - Aaron Jacobs - JannikGM + - Andreas O. Jansen - Erik S. V. Jansson - jjYBdx4IL - Toni Jovanoski diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index b7826263..a03e7d72 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -3391,7 +3391,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * * @ingroup window */ -GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, const int progressState, double value); +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* window, int progressState, double value); /*! @brief Retrieves the position of the content area of the specified window. * diff --git a/src/cocoa_init.m b/src/cocoa_init.m index 2eff6a9a..cabc6424 100644 --- a/src/cocoa_init.m +++ b/src/cocoa_init.m @@ -649,6 +649,12 @@ int _glfwInitCocoa(void) void _glfwTerminateCocoa(void) { @autoreleasepool { + + if (_glfw.ns.dockProgressIndicator != nil) + { + [_glfw.ns.dockProgressIndicator removeFromSuperview]; + [_glfw.ns.dockProgressIndicator release]; + } if (_glfw.ns.inputSource) { diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 4323a874..59a958a5 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -189,6 +189,8 @@ typedef struct _GLFWlibraryNS PFN_LMGetKbdType GetKbdType; CFStringRef kPropertyUnicodeKeyLayoutData; } tis; + + id dockProgressIndicator; } _GLFWlibraryNS; // Cocoa-specific per-monitor data @@ -218,7 +220,7 @@ GLFWbool _glfwCreateWindowCocoa(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowCocoa(_GLFWwindow* window); void _glfwSetWindowTitleCocoa(_GLFWwindow* window, const char* title); void _glfwSetWindowIconCocoa(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int taskbarState, double value); +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, int progressState, double value); void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosCocoa(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeCocoa(_GLFWwindow* window, int* width, int* height); diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 7eaaf503..b86256ab 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1032,77 +1032,58 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } -// TODO: potential enhancement: use float or double for higher precision than int. -// TODO: potential enhancement: also specify the source's weight. Used for calculating the combined progress. -// TODO: move static progressIndicator to _glfw.ns. Remove/release in glfwTerminate. // TODO: allow multiple windows to set values. Use the combined progress for all of them; example: [35%, 70%, 90%] => 65%. -// FIXME: Switching from INDETERMINATE to NORMAL, PAUSED or ERROR requires 2 invocations. -void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, const int progressState, double value) +// TODO: documentation remarks for MacOS +void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, int progressState, double value) { - static NSProgressIndicator* progressIndicator; - - _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED, - "Cocoa: Window taskbar progress is not implemented"); + NSProgressIndicator* indicator = _glfw.ns.dockProgressIndicator; NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile]; - if (progressIndicator == nil) + if (indicator == nil) { if ([dockTile contentView] == nil) { NSImageView *iconView = [[NSImageView alloc] init]; [iconView setImage:[[NSApplication sharedApplication] applicationIconImage]]; [dockTile setContentView:iconView]; + [iconView release]; } NSView* contentView = [dockTile contentView]; - //progressIndicator = [[NSProgressIndicator alloc] init]; - progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, contentView.frame.size.width, 15.0f)]; - [progressIndicator setStyle:NSProgressIndicatorStyleBar]; - [progressIndicator setControlSize:NSControlSizeLarge]; - [progressIndicator setMinValue:0.0f]; - [progressIndicator setMaxValue:100.0f]; + indicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, contentView.frame.size.width, 15.0f)]; + [indicator setStyle:NSProgressIndicatorStyleBar]; + [indicator setControlSize:NSControlSizeLarge]; + [indicator setMinValue:0.0f]; + [indicator setMaxValue:1.0f]; - [progressIndicator setAccessibilityLabel:@"LABEL"]; - [progressIndicator setAccessibilityHelp:@"HELP"]; - [progressIndicator setToolTip:@"TOOLTIP"]; + [contentView addSubview:indicator]; - [contentView addSubview:progressIndicator]; - - /* - NSLayoutConstraint* constraint = [NSLayoutConstraint constraintWithItem:progressIndicator - attribute:NSLayoutAttributeWidth - relatedBy:NSLayoutRelationEqual - toItem:contentView - attribute:NSLayoutAttributeWidth - multiplier:1.0f - constant:0.0f]; - - [contentView addConstraint:constraint];*/ - - [progressIndicator release]; + _glfw.ns.dockProgressIndicator = indicator; } + // FIXME: Switching from INDETERMINATE to NORMAL, PAUSED or ERROR requires 2 invocations in different frames. + // In MacOS 12 (and probably other versions), an indeterminate progress bar is rendered as a normal bar + // with 0.0 progress. So when calling [progressIndicator setIndeterminate:YES], the indicator actually + // sets its doubleValue to 0.0. + // The bug is caused by NSProgressIndicator not immediately updating its value when it's increasing. + // This code illustrates the exact same problem, but this time from NORMAL, PAUSED and ERROR to INDETERMINATE: + // + // if (progressState == GLFW_TASKBAR_PROGRESS_INDETERMINATE) + // [progressIndicator setDoubleValue:0.75]; + // else + // [progressIndicator setDoubleValue:0.25]; + // + // This is likely a bug in Cocoa. + // + // FIXME: Progress increments are delayed + // What this also means, is that each time the progress increments, the bar's progress will be 1 frame delayed, + // and only updated once a higher or similar value is again set the next frame. - switch (progressState) - { - case GLFW_TASKBAR_PROGRESS_DISABLED: - [progressIndicator setIndeterminate:NO]; - [progressIndicator setHidden:YES]; - break; - case GLFW_TASKBAR_PROGRESS_INDETERMINATE: - [progressIndicator setIndeterminate:YES]; - [progressIndicator setHidden:NO]; - break; - case GLFW_TASKBAR_PROGRESS_NORMAL: - case GLFW_TASKBAR_PROGRESS_PAUSED: - case GLFW_TASKBAR_PROGRESS_ERROR: - [progressIndicator setIndeterminate:NO]; - [progressIndicator setHidden:NO]; - break; - } - [progressIndicator setDoubleValue:value]; + [indicator setIndeterminate:progressState == GLFW_TASKBAR_PROGRESS_INDETERMINATE]; + [indicator setHidden:progressState == GLFW_TASKBAR_PROGRESS_DISABLED]; + [indicator setDoubleValue:value]; [dockTile display]; } diff --git a/src/null_platform.h b/src/null_platform.h index a4e5e4ad..c430eb37 100644 --- a/src/null_platform.h +++ b/src/null_platform.h @@ -89,7 +89,7 @@ GLFWbool _glfwCreateWindowNull(_GLFWwindow* window, const _GLFWwndconfig* wndcon void _glfwDestroyWindowNull(_GLFWwindow* window); void _glfwSetWindowTitleNull(_GLFWwindow* window, const char* title); void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int taskbarState, double value); +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, int progressState, double value); void _glfwSetWindowMonitorNull(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate); void _glfwGetWindowPosNull(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosNull(_GLFWwindow* window, int xpos, int ypos); diff --git a/src/null_window.c b/src/null_window.c index 2638827e..812c7ab3 100644 --- a/src/null_window.c +++ b/src/null_window.c @@ -187,7 +187,7 @@ void _glfwSetWindowIconNull(_GLFWwindow* window, int count, const GLFWimage* ima { } -void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, const int progressState, double value) +void _glfwSetWindowTaskbarProgressNull(_GLFWwindow* window, int progressState, double value) { } diff --git a/src/win32_platform.h b/src/win32_platform.h index 34847e81..b84d46a3 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -618,7 +618,7 @@ GLFWbool _glfwCreateWindowWin32(_GLFWwindow* window, const _GLFWwndconfig* wndco void _glfwDestroyWindowWin32(_GLFWwindow* window); void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int taskbarState, double value); +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, int progressState, double value); void _glfwGetWindowPosWin32(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWin32(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWin32(_GLFWwindow* window, int* width, int* height); diff --git a/src/win32_window.c b/src/win32_window.c index 44a2ae00..e68d2839 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1596,7 +1596,7 @@ void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* im } } -void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, const int progressState, double value) +void _glfwSetWindowTaskbarProgressWin32(_GLFWwindow* window, int progressState, double value) { HRESULT res = S_OK; int winProgressState = 0; diff --git a/src/window.c b/src/window.c index c68b7fd6..c7aca29d 100644 --- a/src/window.c +++ b/src/window.c @@ -558,7 +558,7 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* handle, _glfw.platform.setWindowIcon(window, count, images); } -GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, const int progressState, double value) +GLFWAPI void glfwSetWindowTaskbarProgress(GLFWwindow* handle, int progressState, double value) { _GLFWwindow* window = (_GLFWwindow*) handle; diff --git a/src/wl_platform.h b/src/wl_platform.h index fabc90a2..918f232d 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -446,7 +446,7 @@ GLFWbool _glfwCreateWindowWayland(_GLFWwindow* window, const _GLFWwndconfig* wnd void _glfwDestroyWindowWayland(_GLFWwindow* window); void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title); void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, double value); +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, int progressState, double value); void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height); diff --git a/src/wl_window.c b/src/wl_window.c index f35072d5..a4460e93 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1902,11 +1902,11 @@ void _glfwSetWindowIconWayland(_GLFWwindow* window, "Wayland: The platform does not support setting the window icon"); } -void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int taskbarState, double value) +void _glfwSetWindowTaskbarProgressWayland(_GLFWwindow* window, const int progressState, double value) { (void)window; - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); + const dbus_bool_t progressVisible = (progressState != GLFW_TASKBAR_PROGRESS_DISABLED); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value); } diff --git a/src/x11_platform.h b/src/x11_platform.h index 6eeeab4e..96280653 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -905,7 +905,7 @@ GLFWbool _glfwCreateWindowX11(_GLFWwindow* window, const _GLFWwndconfig* wndconf void _glfwDestroyWindowX11(_GLFWwindow* window); void _glfwSetWindowTitleX11(_GLFWwindow* window, const char* title); void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* images); -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, double value); +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, int progressState, double value); void _glfwGetWindowPosX11(_GLFWwindow* window, int* xpos, int* ypos); void _glfwSetWindowPosX11(_GLFWwindow* window, int xpos, int ypos); void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height); diff --git a/src/x11_window.c b/src/x11_window.c index 236ecc45..6c2297ef 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2152,11 +2152,11 @@ void _glfwSetWindowIconX11(_GLFWwindow* window, int count, const GLFWimage* imag XFlush(_glfw.x11.display); } -void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, const int taskbarState, double value) +void _glfwSetWindowTaskbarProgressX11(_GLFWwindow* window, int progressState, double value) { (void)window; - const dbus_bool_t progressVisible = (taskbarState != GLFW_TASKBAR_PROGRESS_DISABLED); + const dbus_bool_t progressVisible = (progressState != GLFW_TASKBAR_PROGRESS_DISABLED); _glfwUpdateTaskbarProgressDBusPOSIX(progressVisible, value); } diff --git a/tests/window.c b/tests/window.c index da096f12..f36a1dda 100644 --- a/tests/window.c +++ b/tests/window.c @@ -419,28 +419,21 @@ int main(int argc, char** argv) nk_layout_row_dynamic(nk, 30, 5); static int state = GLFW_TASKBAR_PROGRESS_DISABLED; - static int progress = 0; static float progress = 0; if(nk_button_label(nk, "No progress")) - glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_DISABLED, progress); - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_DISABLED, (double)progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_DISABLED, (double) progress); if (nk_button_label(nk, "Indeterminate")) - glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_INDETERMINATE, progress); - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_INDETERMINATE, (double)progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_INDETERMINATE, (double) progress); if (nk_button_label(nk, "Normal")) - glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_NORMAL, progress); - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_NORMAL, (double)progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_NORMAL, (double) progress); if (nk_button_label(nk, "Error")) - glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_ERROR, progress); - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_ERROR, (double)progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_ERROR, (double) progress); if (nk_button_label(nk, "Paused")) - glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_PAUSED, progress); - glfwSetWindowTaskbarProgress(window, GLFW_TASKBAR_PROGRESS_PAUSED, (double)progress); + glfwSetWindowTaskbarProgress(window, state = GLFW_TASKBAR_PROGRESS_PAUSED, (double) progress); nk_label(nk, "Progress: ", NK_TEXT_ALIGN_LEFT); - if (nk_slider_int(nk, 0, &progress, 100, 1)) - glfwSetWindowTaskbarProgress(window, state, progress); - nk_slider_float(nk, 0.0f, &progress, 1.0f, 0.05f); + if (nk_slider_float(nk, 0.0f, &progress, 1.0f, 0.05f)) + glfwSetWindowTaskbarProgress(window, state, (double) progress); } nk_end(nk); From 2244051453b882f313a50a2bf08b005d2b8f72ce Mon Sep 17 00:00:00 2001 From: ws909 <37029098+ws909@users.noreply.github.com> Date: Thu, 2 Mar 2023 18:43:27 +0100 Subject: [PATCH 21/32] Per-window progress indicator states and values for the MacOS Dock icon --- include/GLFW/glfw3.h | 9 ++- src/cocoa_init.m | 6 +- src/cocoa_platform.h | 12 +++- src/cocoa_window.m | 159 +++++++++++++++++++++++++++++++------------ 4 files changed, 135 insertions(+), 51 deletions(-) diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index a03e7d72..39ebf7f5 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1289,6 +1289,8 @@ extern "C" { * * @remark @x11 @wayland This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. * + * @remark @macos This displays a standard indeterminate `NSProgressIndicator`. + * * Used by @ref window_taskbar_progress. */ #define GLFW_TASKBAR_PROGRESS_INDETERMINATE 1 @@ -1305,7 +1307,7 @@ extern "C" { * * @remark @win32 This displays a red progress bar with 100% progress. * - * @remark @x11 @wayland This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. + * @remark @x11 @wayland @macos This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. * * Used by @ref window_taskbar_progress. */ @@ -1316,7 +1318,7 @@ extern "C" { * * @remark @win32 This displays a yellow filled progress bar. * - * @remark @x11 @wayland This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. + * @remark @x11 @wayland @macos This behaves like @ref GLFW_TASKBAR_PROGRESS_NORMAL. * * Used by @ref window_taskbar_progress. */ @@ -3374,7 +3376,8 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i * * @remark @win32 On Windows Vista and earlier, this function will emit @ref GLFW_FEATURE_UNAVAILABLE. * - * @remark @macos This function will emit @ref GLFW_FEATURE_UNIMPLEMENTED. + * @remark @macos There exists only one Dock icon progress bar, and this + * displays the combined values of all the windows. * * @remark @x11 @wayland Requires a valid application desktop file with the same name * as the compiled executable. Due to limitations in the Unity Launcher API diff --git a/src/cocoa_init.m b/src/cocoa_init.m index cabc6424..5d199170 100644 --- a/src/cocoa_init.m +++ b/src/cocoa_init.m @@ -650,10 +650,10 @@ void _glfwTerminateCocoa(void) { @autoreleasepool { - if (_glfw.ns.dockProgressIndicator != nil) + if (_glfw.ns.dockProgressIndicator.view != nil) { - [_glfw.ns.dockProgressIndicator removeFromSuperview]; - [_glfw.ns.dockProgressIndicator release]; + [_glfw.ns.dockProgressIndicator.view removeFromSuperview]; + [_glfw.ns.dockProgressIndicator.view release]; } if (_glfw.ns.inputSource) diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 59a958a5..aeda201b 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -156,6 +156,11 @@ typedef struct _GLFWwindowNS // since the last cursor motion event was processed // This is kept to counteract Cocoa doing the same internally double cursorWarpDeltaX, cursorWarpDeltaY; + + struct { + int state; + double value; + } dockProgressIndicator; } _GLFWwindowNS; // Cocoa-specific global data @@ -190,7 +195,12 @@ typedef struct _GLFWlibraryNS CFStringRef kPropertyUnicodeKeyLayoutData; } tis; - id dockProgressIndicator; + struct { + id view; + int windowCount; + int indeterminateCount; + double totalValue; + } dockProgressIndicator; } _GLFWlibraryNS; // Cocoa-specific per-monitor data diff --git a/src/cocoa_window.m b/src/cocoa_window.m index b86256ab..ff2e8f9a 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -197,6 +197,75 @@ static NSUInteger translateKeyToModifierFlag(int key) // static const NSRange kEmptyRange = { NSNotFound, 0 }; +static NSProgressIndicator* createProgressIndicator(const NSDockTile* dockTile) +{ + NSView* contentView = [dockTile contentView]; + + NSProgressIndicator* indicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, contentView.frame.size.width, 15.0f)]; + [indicator setStyle:NSProgressIndicatorStyleBar]; + [indicator setControlSize:NSControlSizeLarge]; + [indicator setMinValue:0.0f]; + [indicator setMaxValue:1.0f]; + + [contentView addSubview:indicator]; + + _glfw.ns.dockProgressIndicator.view = indicator; + + return indicator; +} + +static void setDockProgressIndicator(int progressState, double value) +{ + NSProgressIndicator* indicator = _glfw.ns.dockProgressIndicator.view; + + NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile]; + + if (indicator == nil) + { + if ([dockTile contentView] == nil) + { + NSImageView *iconView = [[NSImageView alloc] init]; + [iconView setImage:[[NSApplication sharedApplication] applicationIconImage]]; + [dockTile setContentView:iconView]; + [iconView release]; + } + + indicator = createProgressIndicator(dockTile); + } + + // ### Switching from INDETERMINATE to NORMAL, PAUSED or ERROR requires 2 invocations in different frames. + // In MacOS 12 (and probably other versions), an indeterminate progress bar is rendered as a normal bar + // with 0.0 progress. So when calling [progressIndicator setIndeterminate:YES], the indicator actually + // sets its doubleValue to 0.0. + // The bug is caused by NSProgressIndicator not immediately updating its value when it's increasing. + // This code illustrates the exact same problem, but this time from NORMAL, PAUSED and ERROR to INDETERMINATE: + // + // if (progressState == GLFW_TASKBAR_PROGRESS_INDETERMINATE) + // [progressIndicator setDoubleValue:0.75]; + // else + // [progressIndicator setDoubleValue:0.25]; + // + // This is likely a bug in Cocoa. + // + // ### Progress increments are delayed + // What this also means, is that each time the progress increments, the bar's progress will be 1 frame delayed, + // and only updated once a higher or similar value is again set the next frame. + + // Workaround for the aforementioned issues. If there's any versions of MacOS where + // this issue is not present, this should be ommitted in those versions. + if ([indicator isIndeterminate] || [indicator doubleValue] < value) + { + [indicator removeFromSuperview]; + [indicator release]; + indicator = createProgressIndicator(dockTile); + } + + [indicator setIndeterminate:progressState == GLFW_TASKBAR_PROGRESS_INDETERMINATE]; + [indicator setHidden:progressState == GLFW_TASKBAR_PROGRESS_DISABLED]; + [indicator setDoubleValue:value]; + + [dockTile display]; +} //------------------------------------------------------------------------ // Delegate for window related notifications @@ -986,6 +1055,8 @@ GLFWbool _glfwCreateWindowCocoa(_GLFWwindow* window, void _glfwDestroyWindowCocoa(_GLFWwindow* window) { @autoreleasepool { + + _glfwSetWindowTaskbarProgressCocoa(window, GLFW_TASKBAR_PROGRESS_DISABLED, 0.0); if (_glfw.ns.disabledCursorWindow == window) _glfw.ns.disabledCursorWindow = NULL; @@ -1032,60 +1103,60 @@ void _glfwSetWindowIconCocoa(_GLFWwindow* window, "Cocoa: Regular windows do not have icons on macOS"); } -// TODO: allow multiple windows to set values. Use the combined progress for all of them; example: [35%, 70%, 90%] => 65%. -// TODO: documentation remarks for MacOS void _glfwSetWindowTaskbarProgressCocoa(_GLFWwindow* window, int progressState, double value) { - NSProgressIndicator* indicator = _glfw.ns.dockProgressIndicator; + if (progressState == GLFW_TASKBAR_PROGRESS_ERROR || progressState == GLFW_TASKBAR_PROGRESS_PAUSED) + progressState = GLFW_TASKBAR_PROGRESS_NORMAL; + + const int oldState = window->ns.dockProgressIndicator.state; + const int state = progressState; - NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile]; + const double oldValue = window->ns.dockProgressIndicator.value; - if (indicator == nil) + if (oldState == state) { - if ([dockTile contentView] == nil) - { - NSImageView *iconView = [[NSImageView alloc] init]; - [iconView setImage:[[NSApplication sharedApplication] applicationIconImage]]; - [dockTile setContentView:iconView]; - [iconView release]; - } - NSView* contentView = [dockTile contentView]; - - indicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, contentView.frame.size.width, 15.0f)]; - [indicator setStyle:NSProgressIndicatorStyleBar]; - [indicator setControlSize:NSControlSizeLarge]; - [indicator setMinValue:0.0f]; - [indicator setMaxValue:1.0f]; - - [contentView addSubview:indicator]; - - _glfw.ns.dockProgressIndicator = indicator; + if (state == GLFW_TASKBAR_PROGRESS_DISABLED || + state == GLFW_TASKBAR_PROGRESS_INDETERMINATE || + oldValue == value) + return; } - // FIXME: Switching from INDETERMINATE to NORMAL, PAUSED or ERROR requires 2 invocations in different frames. - // In MacOS 12 (and probably other versions), an indeterminate progress bar is rendered as a normal bar - // with 0.0 progress. So when calling [progressIndicator setIndeterminate:YES], the indicator actually - // sets its doubleValue to 0.0. - // The bug is caused by NSProgressIndicator not immediately updating its value when it's increasing. - // This code illustrates the exact same problem, but this time from NORMAL, PAUSED and ERROR to INDETERMINATE: - // - // if (progressState == GLFW_TASKBAR_PROGRESS_INDETERMINATE) - // [progressIndicator setDoubleValue:0.75]; - // else - // [progressIndicator setDoubleValue:0.25]; - // - // This is likely a bug in Cocoa. - // - // FIXME: Progress increments are delayed - // What this also means, is that each time the progress increments, the bar's progress will be 1 frame delayed, - // and only updated once a higher or similar value is again set the next frame. + if (oldState != state) + { + // Reset + if (oldState == GLFW_TASKBAR_PROGRESS_INDETERMINATE) + --_glfw.ns.dockProgressIndicator.indeterminateCount; + if (oldState != GLFW_TASKBAR_PROGRESS_DISABLED) + { + --_glfw.ns.dockProgressIndicator.windowCount; + _glfw.ns.dockProgressIndicator.totalValue -= oldValue; + } + + // Set + if (state == GLFW_TASKBAR_PROGRESS_INDETERMINATE) + ++_glfw.ns.dockProgressIndicator.indeterminateCount; + if (state != GLFW_TASKBAR_PROGRESS_DISABLED) + { + ++_glfw.ns.dockProgressIndicator.windowCount; + _glfw.ns.dockProgressIndicator.totalValue += value; + } + } + else if (state != GLFW_TASKBAR_PROGRESS_DISABLED) + _glfw.ns.dockProgressIndicator.totalValue += (value - oldValue); - [indicator setIndeterminate:progressState == GLFW_TASKBAR_PROGRESS_INDETERMINATE]; - [indicator setHidden:progressState == GLFW_TASKBAR_PROGRESS_DISABLED]; - [indicator setDoubleValue:value]; + if (_glfw.ns.dockProgressIndicator.windowCount > _glfw.ns.dockProgressIndicator.indeterminateCount) + { + const double finalValue = _glfw.ns.dockProgressIndicator.totalValue / _glfw.ns.dockProgressIndicator.windowCount; + setDockProgressIndicator(GLFW_TASKBAR_PROGRESS_NORMAL, finalValue); + } + else if (_glfw.ns.dockProgressIndicator.indeterminateCount > 0) + setDockProgressIndicator(GLFW_TASKBAR_PROGRESS_INDETERMINATE, 0.0f); + else + setDockProgressIndicator(GLFW_TASKBAR_PROGRESS_DISABLED, 0.0f); - [dockTile display]; + window->ns.dockProgressIndicator.state = state; + window->ns.dockProgressIndicator.value = value; } void _glfwGetWindowPosCocoa(_GLFWwindow* window, int* xpos, int* ypos) From 5301a924c42e6e0a1a18020282e2fdf9d45741ea Mon Sep 17 00:00:00 2001 From: ws909 <37029098+ws909@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:10:17 +0100 Subject: [PATCH 22/32] Enclose [indicator setControlSize] in availability check --- src/cocoa_window.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index ff2e8f9a..7ec251e0 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -202,10 +202,18 @@ static NSProgressIndicator* createProgressIndicator(const NSDockTile* dockTile) NSView* contentView = [dockTile contentView]; NSProgressIndicator* indicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, contentView.frame.size.width, 15.0f)]; + [indicator setStyle:NSProgressIndicatorStyleBar]; - [indicator setControlSize:NSControlSizeLarge]; + + if (@available(macOS 11.0, *)) + { + [indicator setControlSize:NSControlSizeLarge]; + } + [indicator setMinValue:0.0f]; [indicator setMaxValue:1.0f]; + + [indicator sizeToFit]; [contentView addSubview:indicator]; From 8618927ef90026b717ff172b2e9d3e9a23e192ee Mon Sep 17 00:00:00 2001 From: ws909 <37029098+ws909@users.noreply.github.com> Date: Fri, 3 Mar 2023 15:48:33 +0100 Subject: [PATCH 23/32] Delete unintentionally added build files --- build-static/docs/Doxyfile | 2707 ------------ build-static/docs/html/bc_s.png | Bin 676 -> 0 bytes build-static/docs/html/bc_sd.png | Bin 635 -> 0 bytes build-static/docs/html/bdwn.png | Bin 147 -> 0 bytes build-static/docs/html/build_8dox.html | 81 - build-static/docs/html/build_guide.html | 195 - build-static/docs/html/closed.png | Bin 132 -> 0 bytes build-static/docs/html/compat_8dox.html | 81 - build-static/docs/html/compat_guide.html | 153 - build-static/docs/html/compile_8dox.html | 81 - build-static/docs/html/compile_guide.html | 228 - build-static/docs/html/context_8dox.html | 81 - build-static/docs/html/context_guide.html | 257 -- build-static/docs/html/deprecated.html | 88 - .../dir_49e56c817e5e54854c35e136979f97ca.html | 85 - .../dir_7d046523570a4bf058ddf3b10b545b6c.html | 95 - .../dir_d44c64559bbebec7f509842c48db8b23.html | 91 - build-static/docs/html/doc.png | Bin 746 -> 0 bytes build-static/docs/html/docd.png | Bin 756 -> 0 bytes build-static/docs/html/doxygen.css | 1665 -------- build-static/docs/html/doxygen.svg | 26 - build-static/docs/html/dynsections.js | 123 - build-static/docs/html/extra.css | 2 - build-static/docs/html/files.html | 90 - build-static/docs/html/folderclosed.png | Bin 616 -> 0 bytes build-static/docs/html/folderopen.png | Bin 597 -> 0 bytes build-static/docs/html/glfw3_8h.html | 1883 --------- build-static/docs/html/glfw3_8h_source.html | 1244 ------ build-static/docs/html/glfw3native_8h.html | 167 - .../docs/html/glfw3native_8h_source.html | 298 -- build-static/docs/html/group__buttons.html | 282 -- build-static/docs/html/group__context.html | 302 -- build-static/docs/html/group__errors.html | 384 -- .../docs/html/group__gamepad__axes.html | 202 - .../docs/html/group__gamepad__buttons.html | 410 -- build-static/docs/html/group__hat__state.html | 234 -- build-static/docs/html/group__init.html | 984 ----- build-static/docs/html/group__input.html | 2264 ---------- build-static/docs/html/group__joysticks.html | 362 -- build-static/docs/html/group__keys.html | 2050 --------- build-static/docs/html/group__mods.html | 198 - build-static/docs/html/group__monitor.html | 848 ---- build-static/docs/html/group__native.html | 812 ---- build-static/docs/html/group__shapes.html | 337 -- build-static/docs/html/group__vulkan.html | 361 -- build-static/docs/html/group__window.html | 3698 ----------------- build-static/docs/html/index.html | 100 - build-static/docs/html/input_8dox.html | 81 - build-static/docs/html/input_guide.html | 575 --- build-static/docs/html/internal_8dox.html | 81 - build-static/docs/html/internals_guide.html | 135 - build-static/docs/html/intro_8dox.html | 81 - build-static/docs/html/intro_guide.html | 420 -- build-static/docs/html/jquery.js | 34 - build-static/docs/html/main_8dox.html | 81 - build-static/docs/html/menu.js | 136 - build-static/docs/html/menudata.js | 30 - build-static/docs/html/modules.html | 101 - build-static/docs/html/monitor_8dox.html | 81 - build-static/docs/html/monitor_guide.html | 229 - build-static/docs/html/moving_8dox.html | 81 - build-static/docs/html/moving_guide.html | 374 -- build-static/docs/html/nav_f.png | Bin 153 -> 0 bytes build-static/docs/html/nav_fd.png | Bin 169 -> 0 bytes build-static/docs/html/nav_g.png | Bin 95 -> 0 bytes build-static/docs/html/nav_h.png | Bin 98 -> 0 bytes build-static/docs/html/nav_hd.png | Bin 114 -> 0 bytes build-static/docs/html/news.html | 271 -- build-static/docs/html/news_8dox.html | 81 - build-static/docs/html/open.png | Bin 123 -> 0 bytes build-static/docs/html/pages.html | 99 - build-static/docs/html/quick_8dox.html | 81 - build-static/docs/html/quick_guide.html | 406 -- build-static/docs/html/search/all_0.js | 5 - build-static/docs/html/search/all_1.js | 8 - build-static/docs/html/search/all_10.js | 4 - build-static/docs/html/search/all_11.js | 6 - build-static/docs/html/search/all_12.js | 7 - build-static/docs/html/search/all_2.js | 9 - build-static/docs/html/search/all_3.js | 5 - build-static/docs/html/search/all_4.js | 4 - build-static/docs/html/search/all_5.js | 526 --- build-static/docs/html/search/all_6.js | 4 - build-static/docs/html/search/all_7.js | 11 - build-static/docs/html/search/all_8.js | 5 - build-static/docs/html/search/all_9.js | 4 - build-static/docs/html/search/all_a.js | 11 - build-static/docs/html/search/all_b.js | 6 - build-static/docs/html/search/all_c.js | 4 - build-static/docs/html/search/all_d.js | 4 - build-static/docs/html/search/all_e.js | 8 - build-static/docs/html/search/all_f.js | 6 - build-static/docs/html/search/classes_0.js | 8 - build-static/docs/html/search/close.svg | 31 - build-static/docs/html/search/defines_0.js | 41 - build-static/docs/html/search/files_0.js | 4 - build-static/docs/html/search/files_1.js | 6 - build-static/docs/html/search/files_2.js | 5 - build-static/docs/html/search/files_3.js | 6 - build-static/docs/html/search/files_4.js | 6 - build-static/docs/html/search/files_5.js | 4 - build-static/docs/html/search/files_6.js | 4 - build-static/docs/html/search/files_7.js | 4 - build-static/docs/html/search/files_8.js | 4 - build-static/docs/html/search/functions_0.js | 151 - build-static/docs/html/search/groups_0.js | 4 - build-static/docs/html/search/groups_1.js | 4 - build-static/docs/html/search/groups_2.js | 5 - build-static/docs/html/search/groups_3.js | 5 - build-static/docs/html/search/groups_4.js | 5 - build-static/docs/html/search/groups_5.js | 4 - build-static/docs/html/search/groups_6.js | 6 - build-static/docs/html/search/groups_7.js | 4 - build-static/docs/html/search/groups_8.js | 4 - build-static/docs/html/search/groups_9.js | 4 - build-static/docs/html/search/groups_a.js | 4 - build-static/docs/html/search/mag.svg | 37 - build-static/docs/html/search/mag_d.svg | 37 - build-static/docs/html/search/mag_sel.svg | 74 - build-static/docs/html/search/mag_seld.svg | 74 - build-static/docs/html/search/pages_0.js | 4 - build-static/docs/html/search/pages_1.js | 5 - build-static/docs/html/search/pages_2.js | 4 - build-static/docs/html/search/pages_3.js | 4 - build-static/docs/html/search/pages_4.js | 6 - build-static/docs/html/search/pages_5.js | 5 - build-static/docs/html/search/pages_6.js | 4 - build-static/docs/html/search/pages_7.js | 4 - build-static/docs/html/search/pages_8.js | 4 - build-static/docs/html/search/pages_9.js | 4 - build-static/docs/html/search/pages_a.js | 4 - build-static/docs/html/search/search.css | 291 -- build-static/docs/html/search/search.js | 816 ---- build-static/docs/html/search/searchdata.js | 39 - build-static/docs/html/search/typedefs_0.js | 36 - build-static/docs/html/search/variables_0.js | 5 - build-static/docs/html/search/variables_1.js | 6 - build-static/docs/html/search/variables_2.js | 4 - build-static/docs/html/search/variables_3.js | 5 - build-static/docs/html/search/variables_4.js | 4 - build-static/docs/html/search/variables_5.js | 4 - build-static/docs/html/search/variables_6.js | 7 - build-static/docs/html/search/variables_7.js | 4 - build-static/docs/html/search/variables_8.js | 4 - build-static/docs/html/search/variables_9.js | 4 - build-static/docs/html/spaces.svg | 877 ---- build-static/docs/html/splitbar.png | Bin 314 -> 0 bytes build-static/docs/html/splitbard.png | Bin 282 -> 0 bytes .../docs/html/struct_g_l_f_wallocator.html | 160 - .../docs/html/struct_g_l_f_wgamepadstate.html | 134 - .../docs/html/struct_g_l_f_wgammaramp.html | 170 - .../docs/html/struct_g_l_f_wimage.html | 151 - .../docs/html/struct_g_l_f_wvidmode.html | 204 - build-static/docs/html/sync_off.png | Bin 853 -> 0 bytes build-static/docs/html/sync_on.png | Bin 845 -> 0 bytes build-static/docs/html/tab_a.png | Bin 142 -> 0 bytes build-static/docs/html/tab_ad.png | Bin 135 -> 0 bytes build-static/docs/html/tab_b.png | Bin 169 -> 0 bytes build-static/docs/html/tab_bd.png | Bin 173 -> 0 bytes build-static/docs/html/tab_h.png | Bin 177 -> 0 bytes build-static/docs/html/tab_hd.png | Bin 180 -> 0 bytes build-static/docs/html/tab_s.png | Bin 184 -> 0 bytes build-static/docs/html/tab_sd.png | Bin 188 -> 0 bytes build-static/docs/html/tabs.css | 1 - build-static/docs/html/vulkan_8dox.html | 81 - build-static/docs/html/vulkan_guide.html | 206 - build-static/docs/html/window_8dox.html | 81 - build-static/docs/html/window_guide.html | 809 ---- build-static/docs/warnings.txt | 0 .../examples/boing.app/Contents/Info.plist | 38 - .../examples/boing.app/Contents/MacOS/boing | Bin 386144 -> 0 bytes .../boing.app/Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../examples/gears.app/Contents/Info.plist | 38 - .../examples/gears.app/Contents/MacOS/gears | Bin 384496 -> 0 bytes .../gears.app/Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../heightmap.app/Contents/Info.plist | 38 - .../heightmap.app/Contents/MacOS/heightmap | Bin 384824 -> 0 bytes .../Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes build-static/examples/offscreen | Bin 420872 -> 0 bytes .../particles.app/Contents/Info.plist | 38 - .../particles.app/Contents/MacOS/particles | Bin 405032 -> 0 bytes .../Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../examples/sharing.app/Contents/Info.plist | 38 - .../sharing.app/Contents/MacOS/sharing | Bin 384248 -> 0 bytes .../sharing.app/Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../splitview.app/Contents/Info.plist | 38 - .../splitview.app/Contents/MacOS/splitview | Bin 384984 -> 0 bytes .../Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../triangle-opengl.app/Contents/Info.plist | 38 - .../Contents/MacOS/triangle-opengl | Bin 384400 -> 0 bytes .../Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../triangle-opengles.app/Contents/Info.plist | 38 - .../Contents/MacOS/triangle-opengles | Bin 318040 -> 0 bytes .../Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../examples/wave.app/Contents/Info.plist | 38 - .../examples/wave.app/Contents/MacOS/wave | Bin 385256 -> 0 bytes .../wave.app/Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes .../examples/windows.app/Contents/Info.plist | 38 - .../windows.app/Contents/MacOS/windows | Bin 383920 -> 0 bytes .../windows.app/Contents/Resources/glfw.icns | Bin 27988 -> 0 bytes build-static/src/glfw3.pc | 13 - build-static/src/glfw3Config.cmake | 3 - build-static/src/glfw3ConfigVersion.cmake | 70 - build-static/src/libglfw3 2.a | Bin 402176 -> 0 bytes build-static/src/libglfw3 3.a | Bin 402176 -> 0 bytes build-static/src/libglfw3 4.a | Bin 405816 -> 0 bytes build-static/src/libglfw3 5.a | Bin 406256 -> 0 bytes build-static/src/libglfw3 6.a | Bin 406104 -> 0 bytes build-static/src/libglfw3 7.a | Bin 406520 -> 0 bytes build-static/src/libglfw3 8.a | Bin 406400 -> 0 bytes build-static/src/libglfw3 9.a | Bin 406744 -> 0 bytes build-static/src/libglfw3.a | Bin 394024 -> 0 bytes build-static/tests/allocator | Bin 384160 -> 0 bytes build-static/tests/clipboard | Bin 384608 -> 0 bytes build-static/tests/cursor | Bin 384904 -> 0 bytes .../tests/empty.app/Contents/Info.plist | 38 - .../tests/empty.app/Contents/MacOS/empty | Bin 386608 -> 0 bytes build-static/tests/events | Bin 402192 -> 0 bytes .../tests/gamma.app/Contents/Info.plist | 38 - .../tests/gamma.app/Contents/MacOS/gamma | Bin 802752 -> 0 bytes build-static/tests/glfwinfo | Bin 435184 -> 0 bytes .../tests/icon.app/Contents/Info.plist | 38 - .../tests/icon.app/Contents/MacOS/icon | Bin 384136 -> 0 bytes build-static/tests/iconify | Bin 385160 -> 0 bytes .../tests/inputlag.app/Contents/Info.plist | 38 - .../inputlag.app/Contents/MacOS/inputlag | Bin 820488 -> 0 bytes .../tests/joysticks.app/Contents/Info.plist | 38 - .../joysticks.app/Contents/MacOS/joysticks | Bin 819568 -> 0 bytes build-static/tests/monitors | Bin 384968 -> 0 bytes build-static/tests/msaa | Bin 385056 -> 0 bytes build-static/tests/reopen | Bin 384640 -> 0 bytes .../tests/tearing.app/Contents/Info.plist | 38 - .../tests/tearing.app/Contents/MacOS/tearing | Bin 384728 -> 0 bytes .../tests/theming.app/Contents/Info.plist | 38 - .../tests/theming.app/Contents/MacOS/theming | Bin 386528 -> 0 bytes .../tests/threads.app/Contents/Info.plist | 38 - .../tests/threads.app/Contents/MacOS/threads | Bin 386488 -> 0 bytes .../tests/timeout.app/Contents/Info.plist | 38 - .../tests/timeout.app/Contents/MacOS/timeout | Bin 384176 -> 0 bytes .../tests/title.app/Contents/Info.plist | 38 - .../tests/title.app/Contents/MacOS/title | Bin 383992 -> 0 bytes build-static/tests/triangle-vulkan | Bin 360360 -> 0 bytes .../tests/window.app/Contents/Info.plist | 38 - .../tests/window.app/Contents/MacOS/window | Bin 818960 -> 0 bytes html/bc_s.png | Bin 676 -> 0 bytes html/bc_sd.png | Bin 635 -> 0 bytes html/bdwn.png | Bin 147 -> 0 bytes html/closed.png | Bin 132 -> 0 bytes html/doc.png | Bin 746 -> 0 bytes html/docd.png | Bin 756 -> 0 bytes html/doxygen.css | 2007 --------- html/doxygen.svg | 26 - html/dynsections.js | 123 - html/folderclosed.png | Bin 616 -> 0 bytes html/folderopen.png | Bin 597 -> 0 bytes html/index.html | 81 - html/jquery.js | 34 - html/md__c_o_n_t_r_i_b_u_t_o_r_s.html | 343 -- html/md__l_i_c_e_n_s_e.html | 91 - html/md__r_e_a_d_m_e.html | 343 -- html/menu.js | 136 - html/menudata.js | 27 - html/nav_f.png | Bin 153 -> 0 bytes html/nav_fd.png | Bin 169 -> 0 bytes html/nav_g.png | Bin 95 -> 0 bytes html/nav_h.png | Bin 98 -> 0 bytes html/nav_hd.png | Bin 114 -> 0 bytes html/open.png | Bin 123 -> 0 bytes html/pages.html | 88 - html/search/all_0.js | 4 - html/search/all_1.js | 4 - html/search/all_2.js | 4 - html/search/close.svg | 31 - html/search/mag.svg | 37 - html/search/mag_d.svg | 37 - html/search/mag_sel.svg | 74 - html/search/mag_seld.svg | 74 - html/search/pages_0.js | 4 - html/search/pages_1.js | 4 - html/search/pages_2.js | 4 - html/search/search.css | 291 -- html/search/search.js | 816 ---- html/search/searchdata.js | 18 - html/splitbar.png | Bin 314 -> 0 bytes html/splitbard.png | Bin 282 -> 0 bytes html/sync_off.png | Bin 853 -> 0 bytes html/sync_on.png | Bin 845 -> 0 bytes html/tab_a.png | Bin 142 -> 0 bytes html/tab_ad.png | Bin 135 -> 0 bytes html/tab_b.png | Bin 169 -> 0 bytes html/tab_bd.png | Bin 173 -> 0 bytes html/tab_h.png | Bin 177 -> 0 bytes html/tab_hd.png | Bin 180 -> 0 bytes html/tab_s.png | Bin 184 -> 0 bytes html/tab_sd.png | Bin 188 -> 0 bytes html/tabs.css | 1 - 296 files changed, 37926 deletions(-) delete mode 100644 build-static/docs/Doxyfile delete mode 100644 build-static/docs/html/bc_s.png delete mode 100644 build-static/docs/html/bc_sd.png delete mode 100644 build-static/docs/html/bdwn.png delete mode 100644 build-static/docs/html/build_8dox.html delete mode 100644 build-static/docs/html/build_guide.html delete mode 100644 build-static/docs/html/closed.png delete mode 100644 build-static/docs/html/compat_8dox.html delete mode 100644 build-static/docs/html/compat_guide.html delete mode 100644 build-static/docs/html/compile_8dox.html delete mode 100644 build-static/docs/html/compile_guide.html delete mode 100644 build-static/docs/html/context_8dox.html delete mode 100644 build-static/docs/html/context_guide.html delete mode 100644 build-static/docs/html/deprecated.html delete mode 100644 build-static/docs/html/dir_49e56c817e5e54854c35e136979f97ca.html delete mode 100644 build-static/docs/html/dir_7d046523570a4bf058ddf3b10b545b6c.html delete mode 100644 build-static/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html delete mode 100644 build-static/docs/html/doc.png delete mode 100644 build-static/docs/html/docd.png delete mode 100644 build-static/docs/html/doxygen.css delete mode 100644 build-static/docs/html/doxygen.svg delete mode 100644 build-static/docs/html/dynsections.js delete mode 100644 build-static/docs/html/extra.css delete mode 100644 build-static/docs/html/files.html delete mode 100644 build-static/docs/html/folderclosed.png delete mode 100644 build-static/docs/html/folderopen.png delete mode 100644 build-static/docs/html/glfw3_8h.html delete mode 100644 build-static/docs/html/glfw3_8h_source.html delete mode 100644 build-static/docs/html/glfw3native_8h.html delete mode 100644 build-static/docs/html/glfw3native_8h_source.html delete mode 100644 build-static/docs/html/group__buttons.html delete mode 100644 build-static/docs/html/group__context.html delete mode 100644 build-static/docs/html/group__errors.html delete mode 100644 build-static/docs/html/group__gamepad__axes.html delete mode 100644 build-static/docs/html/group__gamepad__buttons.html delete mode 100644 build-static/docs/html/group__hat__state.html delete mode 100644 build-static/docs/html/group__init.html delete mode 100644 build-static/docs/html/group__input.html delete mode 100644 build-static/docs/html/group__joysticks.html delete mode 100644 build-static/docs/html/group__keys.html delete mode 100644 build-static/docs/html/group__mods.html delete mode 100644 build-static/docs/html/group__monitor.html delete mode 100644 build-static/docs/html/group__native.html delete mode 100644 build-static/docs/html/group__shapes.html delete mode 100644 build-static/docs/html/group__vulkan.html delete mode 100644 build-static/docs/html/group__window.html delete mode 100644 build-static/docs/html/index.html delete mode 100644 build-static/docs/html/input_8dox.html delete mode 100644 build-static/docs/html/input_guide.html delete mode 100644 build-static/docs/html/internal_8dox.html delete mode 100644 build-static/docs/html/internals_guide.html delete mode 100644 build-static/docs/html/intro_8dox.html delete mode 100644 build-static/docs/html/intro_guide.html delete mode 100644 build-static/docs/html/jquery.js delete mode 100644 build-static/docs/html/main_8dox.html delete mode 100644 build-static/docs/html/menu.js delete mode 100644 build-static/docs/html/menudata.js delete mode 100644 build-static/docs/html/modules.html delete mode 100644 build-static/docs/html/monitor_8dox.html delete mode 100644 build-static/docs/html/monitor_guide.html delete mode 100644 build-static/docs/html/moving_8dox.html delete mode 100644 build-static/docs/html/moving_guide.html delete mode 100644 build-static/docs/html/nav_f.png delete mode 100644 build-static/docs/html/nav_fd.png delete mode 100644 build-static/docs/html/nav_g.png delete mode 100644 build-static/docs/html/nav_h.png delete mode 100644 build-static/docs/html/nav_hd.png delete mode 100644 build-static/docs/html/news.html delete mode 100644 build-static/docs/html/news_8dox.html delete mode 100644 build-static/docs/html/open.png delete mode 100644 build-static/docs/html/pages.html delete mode 100644 build-static/docs/html/quick_8dox.html delete mode 100644 build-static/docs/html/quick_guide.html delete mode 100644 build-static/docs/html/search/all_0.js delete mode 100644 build-static/docs/html/search/all_1.js delete mode 100644 build-static/docs/html/search/all_10.js delete mode 100644 build-static/docs/html/search/all_11.js delete mode 100644 build-static/docs/html/search/all_12.js delete mode 100644 build-static/docs/html/search/all_2.js delete mode 100644 build-static/docs/html/search/all_3.js delete mode 100644 build-static/docs/html/search/all_4.js delete mode 100644 build-static/docs/html/search/all_5.js delete mode 100644 build-static/docs/html/search/all_6.js delete mode 100644 build-static/docs/html/search/all_7.js delete mode 100644 build-static/docs/html/search/all_8.js delete mode 100644 build-static/docs/html/search/all_9.js delete mode 100644 build-static/docs/html/search/all_a.js delete mode 100644 build-static/docs/html/search/all_b.js delete mode 100644 build-static/docs/html/search/all_c.js delete mode 100644 build-static/docs/html/search/all_d.js delete mode 100644 build-static/docs/html/search/all_e.js delete mode 100644 build-static/docs/html/search/all_f.js delete mode 100644 build-static/docs/html/search/classes_0.js delete mode 100644 build-static/docs/html/search/close.svg delete mode 100644 build-static/docs/html/search/defines_0.js delete mode 100644 build-static/docs/html/search/files_0.js delete mode 100644 build-static/docs/html/search/files_1.js delete mode 100644 build-static/docs/html/search/files_2.js delete mode 100644 build-static/docs/html/search/files_3.js delete mode 100644 build-static/docs/html/search/files_4.js delete mode 100644 build-static/docs/html/search/files_5.js delete mode 100644 build-static/docs/html/search/files_6.js delete mode 100644 build-static/docs/html/search/files_7.js delete mode 100644 build-static/docs/html/search/files_8.js delete mode 100644 build-static/docs/html/search/functions_0.js delete mode 100644 build-static/docs/html/search/groups_0.js delete mode 100644 build-static/docs/html/search/groups_1.js delete mode 100644 build-static/docs/html/search/groups_2.js delete mode 100644 build-static/docs/html/search/groups_3.js delete mode 100644 build-static/docs/html/search/groups_4.js delete mode 100644 build-static/docs/html/search/groups_5.js delete mode 100644 build-static/docs/html/search/groups_6.js delete mode 100644 build-static/docs/html/search/groups_7.js delete mode 100644 build-static/docs/html/search/groups_8.js delete mode 100644 build-static/docs/html/search/groups_9.js delete mode 100644 build-static/docs/html/search/groups_a.js delete mode 100644 build-static/docs/html/search/mag.svg delete mode 100644 build-static/docs/html/search/mag_d.svg delete mode 100644 build-static/docs/html/search/mag_sel.svg delete mode 100644 build-static/docs/html/search/mag_seld.svg delete mode 100644 build-static/docs/html/search/pages_0.js delete mode 100644 build-static/docs/html/search/pages_1.js delete mode 100644 build-static/docs/html/search/pages_2.js delete mode 100644 build-static/docs/html/search/pages_3.js delete mode 100644 build-static/docs/html/search/pages_4.js delete mode 100644 build-static/docs/html/search/pages_5.js delete mode 100644 build-static/docs/html/search/pages_6.js delete mode 100644 build-static/docs/html/search/pages_7.js delete mode 100644 build-static/docs/html/search/pages_8.js delete mode 100644 build-static/docs/html/search/pages_9.js delete mode 100644 build-static/docs/html/search/pages_a.js delete mode 100644 build-static/docs/html/search/search.css delete mode 100644 build-static/docs/html/search/search.js delete mode 100644 build-static/docs/html/search/searchdata.js delete mode 100644 build-static/docs/html/search/typedefs_0.js delete mode 100644 build-static/docs/html/search/variables_0.js delete mode 100644 build-static/docs/html/search/variables_1.js delete mode 100644 build-static/docs/html/search/variables_2.js delete mode 100644 build-static/docs/html/search/variables_3.js delete mode 100644 build-static/docs/html/search/variables_4.js delete mode 100644 build-static/docs/html/search/variables_5.js delete mode 100644 build-static/docs/html/search/variables_6.js delete mode 100644 build-static/docs/html/search/variables_7.js delete mode 100644 build-static/docs/html/search/variables_8.js delete mode 100644 build-static/docs/html/search/variables_9.js delete mode 100644 build-static/docs/html/spaces.svg delete mode 100644 build-static/docs/html/splitbar.png delete mode 100644 build-static/docs/html/splitbard.png delete mode 100644 build-static/docs/html/struct_g_l_f_wallocator.html delete mode 100644 build-static/docs/html/struct_g_l_f_wgamepadstate.html delete mode 100644 build-static/docs/html/struct_g_l_f_wgammaramp.html delete mode 100644 build-static/docs/html/struct_g_l_f_wimage.html delete mode 100644 build-static/docs/html/struct_g_l_f_wvidmode.html delete mode 100644 build-static/docs/html/sync_off.png delete mode 100644 build-static/docs/html/sync_on.png delete mode 100644 build-static/docs/html/tab_a.png delete mode 100644 build-static/docs/html/tab_ad.png delete mode 100644 build-static/docs/html/tab_b.png delete mode 100644 build-static/docs/html/tab_bd.png delete mode 100644 build-static/docs/html/tab_h.png delete mode 100644 build-static/docs/html/tab_hd.png delete mode 100644 build-static/docs/html/tab_s.png delete mode 100644 build-static/docs/html/tab_sd.png delete mode 100644 build-static/docs/html/tabs.css delete mode 100644 build-static/docs/html/vulkan_8dox.html delete mode 100644 build-static/docs/html/vulkan_guide.html delete mode 100644 build-static/docs/html/window_8dox.html delete mode 100644 build-static/docs/html/window_guide.html delete mode 100644 build-static/docs/warnings.txt delete mode 100644 build-static/examples/boing.app/Contents/Info.plist delete mode 100755 build-static/examples/boing.app/Contents/MacOS/boing delete mode 100644 build-static/examples/boing.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/gears.app/Contents/Info.plist delete mode 100755 build-static/examples/gears.app/Contents/MacOS/gears delete mode 100644 build-static/examples/gears.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/heightmap.app/Contents/Info.plist delete mode 100755 build-static/examples/heightmap.app/Contents/MacOS/heightmap delete mode 100644 build-static/examples/heightmap.app/Contents/Resources/glfw.icns delete mode 100755 build-static/examples/offscreen delete mode 100644 build-static/examples/particles.app/Contents/Info.plist delete mode 100755 build-static/examples/particles.app/Contents/MacOS/particles delete mode 100644 build-static/examples/particles.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/sharing.app/Contents/Info.plist delete mode 100755 build-static/examples/sharing.app/Contents/MacOS/sharing delete mode 100644 build-static/examples/sharing.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/splitview.app/Contents/Info.plist delete mode 100755 build-static/examples/splitview.app/Contents/MacOS/splitview delete mode 100644 build-static/examples/splitview.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/triangle-opengl.app/Contents/Info.plist delete mode 100755 build-static/examples/triangle-opengl.app/Contents/MacOS/triangle-opengl delete mode 100644 build-static/examples/triangle-opengl.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/triangle-opengles.app/Contents/Info.plist delete mode 100755 build-static/examples/triangle-opengles.app/Contents/MacOS/triangle-opengles delete mode 100644 build-static/examples/triangle-opengles.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/wave.app/Contents/Info.plist delete mode 100755 build-static/examples/wave.app/Contents/MacOS/wave delete mode 100644 build-static/examples/wave.app/Contents/Resources/glfw.icns delete mode 100644 build-static/examples/windows.app/Contents/Info.plist delete mode 100755 build-static/examples/windows.app/Contents/MacOS/windows delete mode 100644 build-static/examples/windows.app/Contents/Resources/glfw.icns delete mode 100644 build-static/src/glfw3.pc delete mode 100644 build-static/src/glfw3Config.cmake delete mode 100644 build-static/src/glfw3ConfigVersion.cmake delete mode 100644 build-static/src/libglfw3 2.a delete mode 100644 build-static/src/libglfw3 3.a delete mode 100644 build-static/src/libglfw3 4.a delete mode 100644 build-static/src/libglfw3 5.a delete mode 100644 build-static/src/libglfw3 6.a delete mode 100644 build-static/src/libglfw3 7.a delete mode 100644 build-static/src/libglfw3 8.a delete mode 100644 build-static/src/libglfw3 9.a delete mode 100644 build-static/src/libglfw3.a delete mode 100755 build-static/tests/allocator delete mode 100755 build-static/tests/clipboard delete mode 100755 build-static/tests/cursor delete mode 100644 build-static/tests/empty.app/Contents/Info.plist delete mode 100755 build-static/tests/empty.app/Contents/MacOS/empty delete mode 100755 build-static/tests/events delete mode 100644 build-static/tests/gamma.app/Contents/Info.plist delete mode 100755 build-static/tests/gamma.app/Contents/MacOS/gamma delete mode 100755 build-static/tests/glfwinfo delete mode 100644 build-static/tests/icon.app/Contents/Info.plist delete mode 100755 build-static/tests/icon.app/Contents/MacOS/icon delete mode 100755 build-static/tests/iconify delete mode 100644 build-static/tests/inputlag.app/Contents/Info.plist delete mode 100755 build-static/tests/inputlag.app/Contents/MacOS/inputlag delete mode 100644 build-static/tests/joysticks.app/Contents/Info.plist delete mode 100755 build-static/tests/joysticks.app/Contents/MacOS/joysticks delete mode 100755 build-static/tests/monitors delete mode 100755 build-static/tests/msaa delete mode 100755 build-static/tests/reopen delete mode 100644 build-static/tests/tearing.app/Contents/Info.plist delete mode 100755 build-static/tests/tearing.app/Contents/MacOS/tearing delete mode 100644 build-static/tests/theming.app/Contents/Info.plist delete mode 100755 build-static/tests/theming.app/Contents/MacOS/theming delete mode 100644 build-static/tests/threads.app/Contents/Info.plist delete mode 100755 build-static/tests/threads.app/Contents/MacOS/threads delete mode 100644 build-static/tests/timeout.app/Contents/Info.plist delete mode 100755 build-static/tests/timeout.app/Contents/MacOS/timeout delete mode 100644 build-static/tests/title.app/Contents/Info.plist delete mode 100755 build-static/tests/title.app/Contents/MacOS/title delete mode 100755 build-static/tests/triangle-vulkan delete mode 100644 build-static/tests/window.app/Contents/Info.plist delete mode 100755 build-static/tests/window.app/Contents/MacOS/window delete mode 100644 html/bc_s.png delete mode 100644 html/bc_sd.png delete mode 100644 html/bdwn.png delete mode 100644 html/closed.png delete mode 100644 html/doc.png delete mode 100644 html/docd.png delete mode 100644 html/doxygen.css delete mode 100644 html/doxygen.svg delete mode 100644 html/dynsections.js delete mode 100644 html/folderclosed.png delete mode 100644 html/folderopen.png delete mode 100644 html/index.html delete mode 100644 html/jquery.js delete mode 100644 html/md__c_o_n_t_r_i_b_u_t_o_r_s.html delete mode 100644 html/md__l_i_c_e_n_s_e.html delete mode 100644 html/md__r_e_a_d_m_e.html delete mode 100644 html/menu.js delete mode 100644 html/menudata.js delete mode 100644 html/nav_f.png delete mode 100644 html/nav_fd.png delete mode 100644 html/nav_g.png delete mode 100644 html/nav_h.png delete mode 100644 html/nav_hd.png delete mode 100644 html/open.png delete mode 100644 html/pages.html delete mode 100644 html/search/all_0.js delete mode 100644 html/search/all_1.js delete mode 100644 html/search/all_2.js delete mode 100644 html/search/close.svg delete mode 100644 html/search/mag.svg delete mode 100644 html/search/mag_d.svg delete mode 100644 html/search/mag_sel.svg delete mode 100644 html/search/mag_seld.svg delete mode 100644 html/search/pages_0.js delete mode 100644 html/search/pages_1.js delete mode 100644 html/search/pages_2.js delete mode 100644 html/search/search.css delete mode 100644 html/search/search.js delete mode 100644 html/search/searchdata.js delete mode 100644 html/splitbar.png delete mode 100644 html/splitbard.png delete mode 100644 html/sync_off.png delete mode 100644 html/sync_on.png delete mode 100644 html/tab_a.png delete mode 100644 html/tab_ad.png delete mode 100644 html/tab_b.png delete mode 100644 html/tab_bd.png delete mode 100644 html/tab_h.png delete mode 100644 html/tab_hd.png delete mode 100644 html/tab_s.png delete mode 100644 html/tab_sd.png delete mode 100644 html/tabs.css diff --git a/build-static/docs/Doxyfile b/build-static/docs/Doxyfile deleted file mode 100644 index 0e9d7a47..00000000 --- a/build-static/docs/Doxyfile +++ /dev/null @@ -1,2707 +0,0 @@ -# Doxyfile 1.9.5 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). -# -# Note: -# -# Use doxygen to compare the used configuration file with the template -# configuration file: -# doxygen -x [configFile] -# Use doxygen to compare the used configuration file with the template -# configuration file without replacing the environment variables or CMake type -# replacement variables: -# doxygen -x_noenv [configFile] - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the configuration -# file that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# https://www.gnu.org/software/libiconv/ for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "GLFW" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = 3.4.0 - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = "A multi-platform library for OpenGL, window and input" - -# With the PROJECT_LOGO tag one can specify a logo or an icon that is included -# in the documentation. The maximum height of the logo should not exceed 55 -# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy -# the logo to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/build-static/docs" - -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 -# sub-directories (in 2 levels) under the output directory of each output format -# and will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to -# control the number of sub-directories. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# Controls the number of sub-directories that will be created when -# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every -# level increment doubles the number of directories, resulting in 4096 -# directories at level 8 which is the default and also the maximum value. The -# sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. -# Minimum value: 0, maximum value: 8, default value: 8. -# This tag requires that the tag CREATE_SUBDIRS is set to YES. - -CREATE_SUBDIRS_LEVEL = 8 - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, -# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English -# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, -# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with -# English messages), Korean, Korean-en (Korean with English messages), Latvian, -# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, -# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, -# Swedish, Turkish, Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = NO - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = YES - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = NO - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line -# such as -# /*************** -# as being the beginning of a Javadoc-style comment "banner". If set to NO, the -# Javadoc-style will behave just like regular comments and it will not be -# interpreted by doxygen. -# The default value is: NO. - -JAVADOC_BANNER = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# By default Python docstrings are displayed as preformatted text and doxygen's -# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the -# doxygen's special commands can be used and the contents of the docstring -# documentation blocks is shown as doxygen documentation. -# The default value is: YES. - -PYTHON_DOCSTRING = YES - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new -# page for each member. If set to NO, the documentation of a member will be part -# of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:^^" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". Note that you cannot put \n's in the value part of an alias -# to insert newlines (in the resulting output). You can put ^^ in the value part -# of an alias to insert a newline as if a physical newline was in the original -# file. When you need a literal { or } or , in the value part of an alias you -# have to escape them by means of a backslash (\), this can lead to conflicts -# with the commands \{ and \} for these it is advised to use the version @{ and -# @} or use a double escape (\\{ and \\}) - -ALIASES = "thread_safety=@par Thread safety^^" \ - "pointer_lifetime=@par Pointer lifetime^^" \ - "analysis=@par Analysis^^" \ - "reentrancy=@par Reentrancy^^" \ - "errors=@par Errors^^" \ - "callback_signature=@par Callback signature^^" \ - "glfw3=__GLFW 3:__" \ - "x11=__X11:__" \ - "wayland=__Wayland:__" \ - "win32=__Windows:__" \ - "macos=__macOS:__" \ - "linux=__Linux:__" - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = YES - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice -# sources only. Doxygen will then generate output that is more tailored for that -# language. For instance, namespaces will be presented as modules, types will be -# separated into more groups, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_SLICE = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, -# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice, -# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: -# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser -# tries to guess whether the code is fixed or free formatted code, this is the -# default for Fortran type files). For instance to make doxygen treat .inc files -# as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. -# -# Note: For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. When specifying no_extension you should add -# * to the FILE_PATTERNS. -# -# Note see also the list of default file extension mappings. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See https://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 5. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 5 - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = NO - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# If one adds a struct or class to a group and this option is enabled, then also -# any nested class or struct is added to the same group. By default this option -# is disabled and one has to add nested compounds explicitly via \ingroup. -# The default value is: NO. - -GROUP_NESTED_COMPOUNDS = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use -# during processing. When set to 0 doxygen will based this on the number of -# cores available in the system. You can set it explicitly to a value larger -# than 0 to get more control over the balance between CPU load and processing -# speed. At this moment only the input processing can be done using multiple -# threads. Since this is still an experimental feature the default is set to 1, -# which effectively disables parallel processing. Please report any issues you -# encounter. Generating dot graphs in parallel is controlled by the -# DOT_NUM_THREADS setting. -# Minimum value: 0, maximum value: 32, default value: 1. - -NUM_PROC_THREADS = 1 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual -# methods of a class will be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIV_VIRTUAL = NO - -# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO, -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. If set to YES, local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO, only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If this flag is set to YES, the name of an unnamed parameter in a declaration -# will be determined by the corresponding definition. By default unnamed -# parameters remain unnamed in the output. -# The default value is: YES. - -RESOLVE_UNNAMED_PARAMS = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# declarations. If set to NO, these declarations will be included in the -# documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO, these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# With the correct setting of option CASE_SENSE_NAMES doxygen will better be -# able to match the capabilities of the underlying filesystem. In case the -# filesystem is case sensitive (i.e. it supports files in the same directory -# whose names only differ in casing), the option must be set to YES to properly -# deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be set to NO to properly deal with -# output files written for symbols that only differ in casing, such as for two -# classes, one named CLASS and the other named Class, and to also support -# references to files without having to specify the exact matching casing. On -# Windows (including Cygwin) and MacOS, users should typically set this option -# to NO, whereas on Linux or other Unix flavors it should typically be set to -# YES. -# Possible values are: SYSTEM, NO and YES. -# The default value is: SYSTEM. - -CASE_SENSE_NAMES = SYSTEM - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES, the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will -# append additional text to a page's title, such as Class Reference. If set to -# YES the compound reference will be hidden. -# The default value is: NO. - -HIDE_COMPOUND_REFERENCE= NO - -# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class -# will show which file needs to be included to use the class. -# The default value is: YES. - -SHOW_HEADERFILE = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = NO - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = NO - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = YES - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo -# list. This list is created by putting \todo commands in the documentation. -# The default value is: YES. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test -# list. This list is created by putting \test commands in the documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES, the -# list will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = NO - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. See also section "Changing the -# layout of pages" for information. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/DoxygenLayout.xml" - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = YES - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as documenting some parameters in -# a documented function twice, or documenting parameters that don't exist or -# using markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete -# function parameter documentation. If set to NO, doxygen will accept that some -# parameters have no documentation without warning. -# The default value is: YES. - -WARN_IF_INCOMPLETE_DOC = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO, doxygen will only warn about wrong parameter -# documentation, but not about the absence of documentation. If EXTRACT_ALL is -# set to YES then this flag will automatically be disabled. See also -# WARN_IF_INCOMPLETE_DOC -# The default value is: NO. - -WARN_NO_PARAMDOC = YES - -# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when -# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS -# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but -# at the end of the doxygen process doxygen will return with a non-zero status. -# Possible values are: NO, YES and FAIL_ON_WARNINGS. -# The default value is: NO. - -WARN_AS_ERROR = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# See also: WARN_LINE_FORMAT -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# In the $text part of the WARN_FORMAT command it is possible that a reference -# to a more specific place is given. To make it easier to jump to this place -# (outside of doxygen) the user can define a custom "cut" / "paste" string. -# Example: -# WARN_LINE_FORMAT = "'vi $file +$line'" -# See also: WARN_FORMAT -# The default value is: at line $line of file $file. - -WARN_LINE_FORMAT = "at line $line of file $file" - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). In case the file specified cannot be opened for writing the -# warning and error messages are written to standard error. When as file - is -# specified the warning and error messages are written to standard output -# (stdout). - -WARN_LOGFILE = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/build-static/docs/warnings.txt" - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING -# Note: If this tag is empty the current directory is searched. - -INPUT = \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/include/GLFW/glfw3.h" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/include/GLFW/glfw3native.h" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/main.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/news.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/quick.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/moving.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/compile.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/build.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/intro.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/context.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/monitor.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/window.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/input.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/vulkan.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/compat.dox" \ -"/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/internal.dox" - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: -# https://www.gnu.org/software/libiconv/) for the list of possible encodings. -# See also: INPUT_FILE_ENCODING -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify -# character encoding on a per file pattern basis. Doxygen will compare the file -# name with each pattern and apply the encoding instead of the default -# INPUT_ENCODING) if there is a match. The character encodings are a list of the -# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding -# "INPUT_ENCODING" for further information on supported encodings. - -INPUT_FILE_ENCODING = - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# read by doxygen. -# -# Note the list of default checked file patterns might differ from the list of -# default file extension mappings. -# -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, -# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C -# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, -# *.vhdl, *.ucf, *.qsf and *.ice. - -FILE_PATTERNS = *.h *.dox - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# ANamespace::AClass, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = APIENTRY GLFWAPI - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/examples" - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. -# -# Note that doxygen will use the data processed and written to standard output -# for further processing, therefore nothing else, like debug statements or used -# commands (so in case of a Windows batch file always use @echo OFF), should be -# written to standard output. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -# The Fortran standard specifies that for fixed formatted Fortran code all -# characters from position 72 are to be considered as comment. A common -# extension is to allow longer lines before the automatic comment starts. The -# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can -# be processed before the automatic comment starts. -# Minimum value: 7, maximum value: 10000, default value: 72. - -FORTRAN_COMMENT_AFTER = 72 - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# entity all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see https://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = YES - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = glfw GLFW_ - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/header.html" - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/footer.html" - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefore more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra style sheet files is of importance (e.g. the last -# style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/extra.css" - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = "/Users/andrjans/Library/Mobile Documents/com~apple~CloudDocs/Xcode projects/glfw/docs/spaces.svg" - -# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. -# The default value is: AUTO_LIGHT. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE = LIGHT - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the style sheet and background images according to -# this color. Hue is specified as an angle on a color-wheel, see -# https://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use gray-scales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = YES - -# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML -# documentation will contain a main index with vertical navigation menus that -# are dynamically created via JavaScript. If disabled, the navigation index will -# consists of multiple levels of tabs that are statically embedded in every HTML -# page. Disable this option to support browsers that do not have JavaScript, -# like the Qt help browser. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_MENUS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: -# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To -# create a documentation set, doxygen will generate a Makefile in the HTML -# output directory. Running make will produce the docset in that directory and -# running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy -# genXcode/_index.html for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag determines the URL of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDURL = - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# on Windows. In the beginning of 2021 Microsoft took the original page, with -# a.o. the download links, offline the HTML help workshop was already many years -# in maintenance mode). You can download the HTML help workshop from the web -# archives at Installation executable (see: -# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo -# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe). -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler (hhc.exe). If non-empty, -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the main .chm file (NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated -# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location (absolute path -# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to -# run qhelpgenerator on the generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can -# further fine tune the look of the index (see "Fine-tuning the output"). As an -# example, the default style sheet generated by doxygen has an example that -# shows how to put an image at the root of the tree instead of the PROJECT_NAME. -# Since the tree basically has the same information as the tab index, you could -# consider setting DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = NO - -# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the -# FULL_SIDEBAR option determines if the side bar is limited to only the treeview -# area (value NO) or if it should extend to the full height of the window (value -# YES). Setting this to YES gives a layout similar to -# https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATE_TREEVIEW or -# DISABLE_INDEX is set to NO, this option has no effect. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FULL_SIDEBAR = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 300 - -# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email -# addresses. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -OBFUSCATE_EMAILS = YES - -# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg -# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see -# https://inkscape.org) to generate formulas as SVG images instead of PNGs for -# the HTML output. These images will generally look nicer at scaled resolutions. -# Possible values are: png (the default) and svg (looks nicer but requires the -# pdf2svg or inkscape tool). -# The default value is: png. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FORMULA_FORMAT = png - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands -# to create new LaTeX commands to be used in formulas as building blocks. See -# the section "Including formulas" for details. - -FORMULA_MACROFILE = - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# https://www.mathjax.org) which uses client side JavaScript for the rendering -# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# With MATHJAX_VERSION it is possible to specify the MathJax version to be used. -# Note that the different versions of MathJax have different requirements with -# regards to the different settings, so it is possible that also other MathJax -# settings have to be changed when switching between the different MathJax -# versions. -# Possible values are: MathJax_2 and MathJax_3. -# The default value is: MathJax_2. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_VERSION = MathJax_2 - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. For more details about the output format see MathJax -# version 2 (see: -# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3 -# (see: -# http://docs.mathjax.org/en/latest/web/components/output.html). -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility. This is the name for Mathjax version 2, for MathJax version 3 -# this will be translated into chtml), NativeMML (i.e. MathML. Only supported -# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This -# is the name for Mathjax version 3, for MathJax version 2 this will be -# translated into HTML-CSS) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from https://www.mathjax.org before deployment. The default value is: -# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2 -# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3 -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# for MathJax version 2 (see -# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions): -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# For example for MathJax version 3 (see -# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html): -# MATHJAX_EXTENSIONS = ams -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: -# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /