From 6565c8e83f1cfe694df62287455e6df14bd02334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Wed, 21 May 2025 09:15:16 +0300 Subject: [PATCH] [AccessKit] Update API to 0.16.0. --- .github/workflows/linux_builds.yml | 10 +++--- .github/workflows/macos_builds.yml | 10 +++--- .github/workflows/windows_builds.yml | 10 +++--- doc/classes/DisplayServer.xml | 31 ++++++++--------- .../accessibility_driver_accesskit.cpp | 10 ------ .../dynwrappers/accesskit-dll_wrap.c | 33 ------------------- .../dynwrappers/accesskit-dll_wrap.h | 12 ------- .../dynwrappers/accesskit-dylib_wrap.c | 33 ------------------- .../dynwrappers/accesskit-dylib_wrap.h | 12 ------- .../accesskit/dynwrappers/accesskit-so_wrap.c | 33 ------------------- .../accesskit/dynwrappers/accesskit-so_wrap.h | 12 ------- servers/display_server.cpp | 2 -- servers/display_server.h | 2 -- thirdparty/README.md | 2 +- thirdparty/accesskit/include/accesskit.h | 16 +++++---- 15 files changed, 38 insertions(+), 190 deletions(-) diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 68727f0b2ae..3707ae39f6d 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -7,7 +7,7 @@ env: SCONS_FLAGS: >- dev_mode=yes module_text_server_fb_enabled=yes - "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.15.1/" + "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.16.0/" GODOT_CPP_BRANCH: 4.4 DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true @@ -162,12 +162,12 @@ jobs: uses: dsaltares/fetch-gh-release-asset@1.1.2 with: repo: AccessKit/accesskit-c - version: tags/0.15.1 - file: accesskit-c-0.15.1.zip - target: accesskit-c-0.15.1/accesskit_c.zip + version: tags/0.16.0 + file: accesskit-c-0.16.0.zip + target: accesskit-c-0.16.0/accesskit_c.zip - name: Extract pre-built AccessKit - run: unzip -o accesskit-c-0.15.1/accesskit_c.zip + run: unzip -o accesskit-c-0.16.0/accesskit_c.zip - name: Install mold linker if: matrix.proj-test diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 64443dead21..d044f99ea84 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -7,7 +7,7 @@ env: SCONS_FLAGS: >- dev_mode=yes module_text_server_fb_enabled=yes - "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.15.1/" + "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.16.0/" jobs: build-macos: @@ -48,12 +48,12 @@ jobs: uses: dsaltares/fetch-gh-release-asset@1.1.2 with: repo: AccessKit/accesskit-c - version: tags/0.15.1 - file: accesskit-c-0.15.1.zip - target: accesskit-c-0.15.1/accesskit_c.zip + version: tags/0.16.0 + file: accesskit-c-0.16.0.zip + target: accesskit-c-0.16.0/accesskit_c.zip - name: Extract pre-built AccessKit - run: unzip -o accesskit-c-0.15.1/accesskit_c.zip + run: unzip -o accesskit-c-0.16.0/accesskit_c.zip - name: Setup Vulkan SDK id: vulkan-sdk diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index b127bcd532a..b27f252d3c0 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -10,7 +10,7 @@ env: debug_symbols=no d3d12=yes "angle_libs=${{ github.workspace }}/" - "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.15.1/" + "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.16.0/" SCONS_CACHE_MSVC_CONFIG: true PYTHONIOENCODING: utf8 @@ -90,12 +90,12 @@ jobs: uses: dsaltares/fetch-gh-release-asset@1.1.2 with: repo: AccessKit/accesskit-c - version: tags/0.15.1 - file: accesskit-c-0.15.1.zip - target: accesskit-c-0.15.1/accesskit_c.zip + version: tags/0.16.0 + file: accesskit-c-0.16.0.zip + target: accesskit-c-0.16.0/accesskit_c.zip - name: Extract pre-built AccessKit - run: unzip -o accesskit-c-0.15.1/accesskit_c.zip + run: unzip -o accesskit-c-0.16.0/accesskit_c.zip - name: Compilation uses: ./.github/actions/godot-build diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index 9b28eebf65b..0b831f117d9 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -2750,51 +2750,46 @@ Tooltip element. - - Other/unknown popup type. - - + Popup menu. - + Popup list. - + Popup tree view. - + Popup dialog. Element is hidden for accessibility tools. - - - + Element is support multiple item selection. - + Element require user input. - + Element is a visited link. - + Element content is not ready (e.g. loading). - + Element is modal window. - + Element allows touches to be passed through when a screen reader is in touch exploration mode. - + Element is text field with selectable but read-only text. - + Element is disabled. - + Element clips children. diff --git a/drivers/accesskit/accessibility_driver_accesskit.cpp b/drivers/accesskit/accessibility_driver_accesskit.cpp index bcb8b5b9185..5047ae63830 100644 --- a/drivers/accesskit/accessibility_driver_accesskit.cpp +++ b/drivers/accesskit/accessibility_driver_accesskit.cpp @@ -1056,9 +1056,6 @@ void AccessibilityDriverAccessKit::accessibility_update_set_popup_type(const RID _ensure_node(p_id, ae); switch (p_popup) { - case DisplayServer::AccessibilityPopupType::POPUP_UNKNOWN: { - accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_TRUE); - } break; case DisplayServer::AccessibilityPopupType::POPUP_MENU: { accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_MENU); } break; @@ -1280,13 +1277,6 @@ void AccessibilityDriverAccessKit::accessibility_update_set_flag(const RID &p_id accesskit_node_clear_hidden(ae->node); } } break; - case DisplayServer::AccessibilityFlags::FLAG_LINKED: { - if (p_value) { - accesskit_node_set_linked(ae->node); - } else { - accesskit_node_clear_linked(ae->node); - } - } break; case DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE: { if (p_value) { accesskit_node_set_multiselectable(ae->node); diff --git a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c index 27b23873a87..0a0eecd16ba 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c +++ b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c @@ -18,9 +18,6 @@ #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit @@ -408,9 +405,6 @@ #undef accesskit_node_is_hidden #undef accesskit_node_set_hidden #undef accesskit_node_clear_hidden -#undef accesskit_node_is_linked -#undef accesskit_node_set_linked -#undef accesskit_node_clear_linked #undef accesskit_node_is_multiselectable #undef accesskit_node_set_multiselectable #undef accesskit_node_clear_multiselectable @@ -820,9 +814,6 @@ void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct acc bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1275,30 +1266,6 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_is_linked - *(void **) (&accesskit_node_is_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_set_linked - *(void **) (&accesskit_node_set_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_clear_linked - *(void **) (&accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } // accesskit_node_is_multiselectable *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable"); if (verbose) { diff --git a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h index 1769778ff6e..88c1c26c82a 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h +++ b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h @@ -16,9 +16,6 @@ #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit @@ -406,9 +403,6 @@ #undef accesskit_node_is_hidden #undef accesskit_node_set_hidden #undef accesskit_node_clear_hidden -#undef accesskit_node_is_linked -#undef accesskit_node_set_linked -#undef accesskit_node_clear_linked #undef accesskit_node_is_multiselectable #undef accesskit_node_set_multiselectable #undef accesskit_node_clear_multiselectable @@ -798,9 +792,6 @@ extern "C" { #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit @@ -1187,9 +1178,6 @@ extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(str extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); diff --git a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c index 602a287f8cf..4cb851cac46 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c +++ b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c @@ -14,9 +14,6 @@ #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit @@ -409,9 +406,6 @@ #undef accesskit_node_is_hidden #undef accesskit_node_set_hidden #undef accesskit_node_clear_hidden -#undef accesskit_node_is_linked -#undef accesskit_node_set_linked -#undef accesskit_node_clear_linked #undef accesskit_node_is_multiselectable #undef accesskit_node_set_multiselectable #undef accesskit_node_clear_multiselectable @@ -805,9 +799,6 @@ void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct acc bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1265,30 +1256,6 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_is_linked - *(void **) (&accesskit_node_is_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_set_linked - *(void **) (&accesskit_node_set_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_clear_linked - *(void **) (&accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } // accesskit_node_is_multiselectable *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable"); if (verbose) { diff --git a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h index b5df5c088d0..cf55bb99bd8 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h +++ b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h @@ -16,9 +16,6 @@ #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit @@ -411,9 +408,6 @@ #undef accesskit_node_is_hidden #undef accesskit_node_set_hidden #undef accesskit_node_clear_hidden -#undef accesskit_node_is_linked -#undef accesskit_node_set_linked -#undef accesskit_node_clear_linked #undef accesskit_node_is_multiselectable #undef accesskit_node_set_multiselectable #undef accesskit_node_clear_multiselectable @@ -808,9 +802,6 @@ extern "C" { #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit @@ -1202,9 +1193,6 @@ extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(str extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); diff --git a/drivers/accesskit/dynwrappers/accesskit-so_wrap.c b/drivers/accesskit/dynwrappers/accesskit-so_wrap.c index e2095e345cc..87a9909af92 100644 --- a/drivers/accesskit/dynwrappers/accesskit-so_wrap.c +++ b/drivers/accesskit/dynwrappers/accesskit-so_wrap.c @@ -14,9 +14,6 @@ #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit @@ -400,9 +397,6 @@ #undef accesskit_node_is_hidden #undef accesskit_node_set_hidden #undef accesskit_node_clear_hidden -#undef accesskit_node_is_linked -#undef accesskit_node_set_linked -#undef accesskit_node_clear_linked #undef accesskit_node_is_multiselectable #undef accesskit_node_set_multiselectable #undef accesskit_node_clear_multiselectable @@ -787,9 +781,6 @@ void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct acc bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1238,30 +1229,6 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_is_linked - *(void **) (&accesskit_node_is_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_set_linked - *(void **) (&accesskit_node_set_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_clear_linked - *(void **) (&accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_linked"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } // accesskit_node_is_multiselectable *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable"); if (verbose) { diff --git a/drivers/accesskit/dynwrappers/accesskit-so_wrap.h b/drivers/accesskit/dynwrappers/accesskit-so_wrap.h index 5bad8bbd4fb..fbcb380f1b4 100644 --- a/drivers/accesskit/dynwrappers/accesskit-so_wrap.h +++ b/drivers/accesskit/dynwrappers/accesskit-so_wrap.h @@ -16,9 +16,6 @@ #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit @@ -402,9 +399,6 @@ #undef accesskit_node_is_hidden #undef accesskit_node_set_hidden #undef accesskit_node_clear_hidden -#undef accesskit_node_is_linked -#undef accesskit_node_set_linked -#undef accesskit_node_clear_linked #undef accesskit_node_is_multiselectable #undef accesskit_node_set_multiselectable #undef accesskit_node_clear_multiselectable @@ -790,9 +784,6 @@ extern "C" { #define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit #define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit -#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit #define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit #define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit @@ -1175,9 +1166,6 @@ extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(str extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); diff --git a/servers/display_server.cpp b/servers/display_server.cpp index 393eb19b527..fff048f1eb4 100644 --- a/servers/display_server.cpp +++ b/servers/display_server.cpp @@ -1705,14 +1705,12 @@ void DisplayServer::_bind_methods() { BIND_ENUM_CONSTANT(ROLE_DIALOG); BIND_ENUM_CONSTANT(ROLE_TOOLTIP); - BIND_ENUM_CONSTANT(POPUP_UNKNOWN); BIND_ENUM_CONSTANT(POPUP_MENU); BIND_ENUM_CONSTANT(POPUP_LIST); BIND_ENUM_CONSTANT(POPUP_TREE); BIND_ENUM_CONSTANT(POPUP_DIALOG); BIND_ENUM_CONSTANT(FLAG_HIDDEN); - BIND_ENUM_CONSTANT(FLAG_LINKED); BIND_ENUM_CONSTANT(FLAG_MULTISELECTABLE); BIND_ENUM_CONSTANT(FLAG_REQUIRED); BIND_ENUM_CONSTANT(FLAG_VISITED); diff --git a/servers/display_server.h b/servers/display_server.h index 973b7ea5365..7f6634ec727 100644 --- a/servers/display_server.h +++ b/servers/display_server.h @@ -602,7 +602,6 @@ public: }; enum AccessibilityPopupType { - POPUP_UNKNOWN, POPUP_MENU, POPUP_LIST, POPUP_TREE, @@ -611,7 +610,6 @@ public: enum AccessibilityFlags { FLAG_HIDDEN, - FLAG_LINKED, FLAG_MULTISELECTABLE, FLAG_REQUIRED, FLAG_VISITED, diff --git a/thirdparty/README.md b/thirdparty/README.md index 0194705f8e8..11657c1136c 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -8,7 +8,7 @@ readability. ## accesskit - Upstream: https://github.com/AccessKit/accesskit-c -- Version: 0.15.1 (0d1da94a33708041b07c61eb702c67cfa3a5f95b, 2025) +- Version: 0.16.0 (06c1779473ff4304f42ea254f77fef2e33f982b0, 2025) - License: MIT Files extracted from upstream source: diff --git a/thirdparty/accesskit/include/accesskit.h b/thirdparty/accesskit/include/accesskit.h index 5b2499a808a..3b9f43e3544 100644 --- a/thirdparty/accesskit/include/accesskit.h +++ b/thirdparty/accesskit/include/accesskit.h @@ -134,7 +134,6 @@ enum accesskit_has_popup : uint8_t #endif // __cplusplus { - ACCESSKIT_HAS_POPUP_TRUE, ACCESSKIT_HAS_POPUP_MENU, ACCESSKIT_HAS_POPUP_LISTBOX, ACCESSKIT_HAS_POPUP_TREE, @@ -989,12 +988,6 @@ void accesskit_node_set_hidden(struct accesskit_node *node); void accesskit_node_clear_hidden(struct accesskit_node *node); -bool accesskit_node_is_linked(const struct accesskit_node *node); - -void accesskit_node_set_linked(struct accesskit_node *node); - -void accesskit_node_clear_linked(struct accesskit_node *node); - bool accesskit_node_is_multiselectable(const struct accesskit_node *node); void accesskit_node_set_multiselectable(struct accesskit_node *node); @@ -2234,6 +2227,15 @@ void accesskit_unix_adapter_free(struct accesskit_unix_adapter *adapter); #if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \ defined(__NetBSD__) || defined(__OpenBSD__)) +/** + * Set the bounds of the top-level window. The outer bounds contain any + * window decoration and borders. + * + * # Caveats + * + * Since an application can not get the position of its window under + * Wayland, calling this method only makes sense under X11. + */ void accesskit_unix_adapter_set_root_window_bounds( struct accesskit_unix_adapter *adapter, struct accesskit_rect outer, struct accesskit_rect inner);