diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index f3bbe3d333a2..388ce5287ee8 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -8,7 +8,7 @@ env: SCONS_FLAGS: >- dev_mode=yes module_text_server_fb_enabled=yes - "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/" + "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/" GODOT_CPP_BRANCH: 4.5 DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true @@ -161,13 +161,13 @@ jobs: - name: Download pre-built AccessKit uses: dsaltares/fetch-gh-release-asset@1.1.2 with: - repo: AccessKit/accesskit-c - version: tags/0.18.0 - file: accesskit-c-0.18.0.zip - target: accesskit-c-0.18.0/accesskit_c.zip + repo: godotengine/godot-accesskit-c-static + version: tags/0.21.2 + file: accesskit-c-0.21.2.zip + target: accesskit-c-0.21.2/accesskit_c.zip - name: Extract pre-built AccessKit - run: unzip -o accesskit-c-0.18.0/accesskit_c.zip + run: unzip -o accesskit-c-0.21.2/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 815f59c89445..82478fb6706f 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -8,7 +8,7 @@ env: SCONS_FLAGS: >- dev_mode=yes module_text_server_fb_enabled=yes - "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/" + "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/" jobs: build-macos: @@ -53,13 +53,13 @@ jobs: - name: Download pre-built AccessKit uses: dsaltares/fetch-gh-release-asset@1.1.2 with: - repo: AccessKit/accesskit-c - version: tags/0.18.0 - file: accesskit-c-0.18.0.zip - target: accesskit-c-0.18.0/accesskit_c.zip + repo: godotengine/godot-accesskit-c-static + version: tags/0.21.2 + file: accesskit-c-0.21.2.zip + target: accesskit-c-0.21.2/accesskit_c.zip - name: Extract pre-built AccessKit - run: unzip -o accesskit-c-0.18.0/accesskit_c.zip + run: unzip -o accesskit-c-0.21.2/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 5de2f023fdde..b57637c09918 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -10,7 +10,7 @@ env: module_text_server_fb_enabled=yes debug_symbols=no "angle_libs=${{ github.workspace }}/" - "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/" + "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/" SCONS_CACHE_MSVC_CONFIG: true PYTHONIOENCODING: utf8 @@ -98,13 +98,13 @@ jobs: - name: Download pre-built AccessKit uses: dsaltares/fetch-gh-release-asset@1.1.2 with: - repo: AccessKit/accesskit-c - version: tags/0.18.0 - file: accesskit-c-0.18.0.zip - target: accesskit-c-0.18.0/accesskit_c.zip + repo: godotengine/godot-accesskit-c-static + version: tags/0.21.2 + file: accesskit-c-0.21.2.zip + target: accesskit-c-0.21.2/accesskit_c.zip - name: Extract pre-built AccessKit - run: unzip -o accesskit-c-0.18.0/accesskit_c.zip + run: unzip -o accesskit-c-0.21.2/accesskit_c.zip - name: Compilation uses: ./.github/actions/godot-build diff --git a/doc/classes/TextServer.xml b/doc/classes/TextServer.xml index a6ff9cb8321e..4d66c1981258 100644 --- a/doc/classes/TextServer.xml +++ b/doc/classes/TextServer.xml @@ -1269,6 +1269,14 @@ Returns the font size of the [param index] text run (in visual order). + + + + + + Returns the glyph range of the [param index] text run (in visual order). + + diff --git a/doc/classes/TextServerExtension.xml b/doc/classes/TextServerExtension.xml index 65dbb212e888..92bc8170275c 100644 --- a/doc/classes/TextServerExtension.xml +++ b/doc/classes/TextServerExtension.xml @@ -1241,6 +1241,14 @@ Returns the font size of the [param index] text run (in visual order). + + + + + + Returns the glyph range of the [param index] text run (in visual order). + + diff --git a/drivers/accesskit/accessibility_driver_accesskit.cpp b/drivers/accesskit/accessibility_driver_accesskit.cpp index c1e6792c1709..f0dfc5e056c4 100644 --- a/drivers/accesskit/accessibility_driver_accesskit.cpp +++ b/drivers/accesskit/accessibility_driver_accesskit.cpp @@ -129,7 +129,7 @@ void AccessibilityDriverAccessKit::_accessibility_action_callback(struct accessk DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data; ERR_FAIL_COND(!singleton->windows.has(window_id)); - RID rid = RID::from_uint64(p_request->target); + RID rid = RID::from_uint64(p_request->target_node); AccessibilityElement *ae = singleton->rid_owner.get_or_null(rid); ERR_FAIL_NULL(ae); @@ -342,8 +342,6 @@ RID AccessibilityDriverAccessKit::accessibility_create_sub_text_edit_elements(co Vector words; int64_t run_count = 0; // Note: runs in visual order. const Glyph *gl = nullptr; - int64_t gl_count = 0; - int64_t gl_index = 0; float run_off_x = 0.0; Vector2i full_range; @@ -353,7 +351,6 @@ RID AccessibilityDriverAccessKit::accessibility_create_sub_text_edit_elements(co words = TS->shaped_text_get_word_breaks(p_shaped_text); run_count = TS->shaped_get_run_count(p_shaped_text); gl = TS->shaped_text_get_glyphs(p_shaped_text); - gl_count = TS->shaped_text_get_glyph_count(p_shaped_text); full_range = TS->shaped_text_get_range(p_shaped_text); } @@ -368,125 +365,155 @@ RID AccessibilityDriverAccessKit::accessibility_create_sub_text_edit_elements(co Vector text_elements; for (int64_t i = 0; i < run_count; i++) { const Vector2i range = TS->shaped_get_run_range(p_shaped_text, i); - String t = TS->shaped_get_run_text(p_shaped_text, i); + const Vector2i gl_range = TS->shaped_get_run_glyph_range(p_shaped_text, i); + String run_t = TS->shaped_get_run_text(p_shaped_text, i); + TextServer::Direction dir = TS->shaped_get_run_direction(p_shaped_text, i); - if (t.is_empty()) { + if (run_t.is_empty()) { continue; } - AccessibilityElement *ae = memnew(AccessibilityElement); - ae->role = ACCESSKIT_ROLE_TEXT_RUN; - ae->window_id = parent_ae->window_id; - ae->parent = root_rid; - ae->run = Vector3i(range.x, range.y, i); - ae->node = accesskit_node_new(ae->role); - - text_elements.push_back(ae); - - // UTF-8 text and char lengths. - Vector char_lengths; - CharString text = t.utf8(&char_lengths); - - accesskit_node_set_value(ae->node, text.ptr()); - accesskit_node_set_character_lengths(ae->node, char_lengths.size(), char_lengths.ptr()); - - // Word sizes. - Vector word_lengths; + // Split long runs in to < 254 char subruns due to AccessKit limitation. + Vector subrun_ranges; + Vector> subrun_word_starts; + { + Vector2i cur_range = range; + bool slice = false; + do { + // Word starts. + Vector word_starts; + word_starts.push_back(0); + + slice = false; + for (int j = 0; j < words.size(); j += 2) { + if (words[j] <= cur_range.x) { + continue; + } + if (words[j] >= cur_range.y) { + break; + } + int32_t wstart = words[j] - cur_range.x; + int32_t wend = words[j + 1] - cur_range.x; + if (wend >= 254) { + cur_range.y = words[j]; + slice = true; + break; + } + word_starts.push_back(wstart); + } + subrun_ranges.push_back(cur_range); + subrun_word_starts.push_back(word_starts); + if (slice) { + cur_range.x = cur_range.y; + cur_range.y = range.y; + } + } while (slice); + } - int32_t prev = ae->run.x; - int32_t total = 0; - for (int j = 0; j < words.size(); j += 2) { - if (words[j] < ae->run.x) { + // Process subruns. + int start, end, delta; + if (dir == TextServer::DIRECTION_LTR) { + start = 0; + end = subrun_ranges.size(); + delta = +1; + } else { + start = subrun_ranges.size() - 1; + end = -1; + delta = -1; + } + for (int rr = start; rr != end; rr += delta) { + // Word starts. + const Vector &word_starts = subrun_word_starts[rr]; + const Vector2i &cur_range = subrun_ranges[rr]; + + AccessibilityElement *ae = memnew(AccessibilityElement); + ae->role = ACCESSKIT_ROLE_TEXT_RUN; + ae->window_id = parent_ae->window_id; + ae->parent = root_rid; + ae->run = Vector3i(cur_range.x, cur_range.y, i); + ae->node = accesskit_node_new(ae->role); + + text_elements.push_back(ae); + + String sub_t = run_t.substr(cur_range.x - range.x, cur_range.y - cur_range.x); + if (sub_t.is_empty()) { continue; } - if (words[j] >= ae->run.y) { - break; - } - int32_t wlen = words[j] - prev; - while (wlen > 255) { - word_lengths.push_back(255); - wlen -= 255; - total += 255; - } - if (wlen > 0) { - word_lengths.push_back(wlen); - total += wlen; - } - prev = words[j]; - } - if (total < t.length()) { - word_lengths.push_back(t.length() - total); - } - accesskit_node_set_word_lengths(ae->node, word_lengths.size(), word_lengths.ptr()); - // Char widths and positions. - Vector char_positions; - Vector char_widths; + // UTF-8 text and char lengths. + Vector char_lengths; + CharString text = sub_t.utf8(&char_lengths); - char_positions.resize_initialized(t.length()); - float *positions_ptr = char_positions.ptrw(); + accesskit_node_set_value(ae->node, text.ptr()); + accesskit_node_set_character_lengths(ae->node, char_lengths.size(), char_lengths.ptr()); - char_widths.resize_initialized(t.length()); - float *widths_ptr = char_widths.ptrw(); + accesskit_node_set_word_starts(ae->node, word_starts.size(), word_starts.ptr()); - float size_x = 0.0; - for (int j = gl_index; j < gl_count; j += gl[j].count) { - if (gl[j].start >= ae->run.y) { - gl_index = j; - break; - } + // Char widths and positions. + Vector char_positions; + Vector char_widths; - float advance = 0.0; // Graphame advance. - for (int k = 0; k < gl[j].count; k++) { - advance += gl[j + k].advance; - } - int chars = gl[j].end - gl[j].start; - float adv_per_char = advance / (float)chars; - - for (int k = 0; k < chars; k++) { - int index = gl[j].start + k - ae->run.x; - ERR_CONTINUE(index < 0 || index >= t.length()); - positions_ptr[index] = size_x + adv_per_char * k; - widths_ptr[index] = adv_per_char; - } - size_x += advance * gl[j].repeat; - } - positions_ptr[t.length() - 1] = size_x; - widths_ptr[t.length() - 1] = 1.0; + char_positions.resize_initialized(sub_t.length()); + float *positions_ptr = char_positions.ptrw(); - accesskit_node_set_character_positions(ae->node, char_positions.size(), char_positions.ptr()); - accesskit_node_set_character_widths(ae->node, char_widths.size(), char_widths.ptr()); + char_widths.resize_initialized(sub_t.length()); + float *widths_ptr = char_widths.ptrw(); - RID font_rid = TS->shaped_get_run_font_rid(p_shaped_text, i); - if (font_rid != RID()) { - CharString font_name = TS->font_get_name(font_rid).utf8(); - if (font_name.length() > 0) { - accesskit_node_set_font_family(ae->node, font_name.ptr()); + float size_x = 0.0; + for (int j = gl_range.x; j <= gl_range.y; j += gl[j].count) { + if (gl[j].start >= ae->run.y || gl[j].start < ae->run.x) { + continue; + } + float advance = 0.0; // Graphame advance. + for (int k = 0; k < gl[j].count; k++) { + advance += gl[j + k].advance; + } + int chars = gl[j].end - gl[j].start; + float adv_per_char = advance / (float)chars; + + for (int k = 0; k < chars; k++) { + int index = gl[j].start + k - ae->run.x; + ERR_CONTINUE(index < 0 || index >= sub_t.length()); + positions_ptr[index] = size_x + adv_per_char * k; + widths_ptr[index] = adv_per_char; + } + size_x += advance * gl[j].repeat; } - if (TS->font_get_style(font_rid).has_flag(TextServer::FONT_BOLD)) { - accesskit_node_set_bold(ae->node); + positions_ptr[sub_t.length() - 1] = size_x; + widths_ptr[sub_t.length() - 1] = 1.0; + + accesskit_node_set_character_positions(ae->node, char_positions.size(), char_positions.ptr()); + accesskit_node_set_character_widths(ae->node, char_widths.size(), char_widths.ptr()); + + RID font_rid = TS->shaped_get_run_font_rid(p_shaped_text, i); + if (font_rid != RID()) { + CharString font_name = TS->font_get_name(font_rid).utf8(); + if (font_name.length() > 0) { + accesskit_node_set_font_family(ae->node, font_name.ptr()); + } + if (TS->font_get_style(font_rid).has_flag(TextServer::FONT_ITALIC)) { + accesskit_node_set_italic(ae->node); + } + accesskit_node_set_font_weight(ae->node, TS->font_get_weight(font_rid)); } - if (TS->font_get_style(font_rid).has_flag(TextServer::FONT_ITALIC)) { - accesskit_node_set_italic(ae->node); + accesskit_node_set_font_size(ae->node, TS->shaped_get_run_font_size(p_shaped_text, i)); + CharString language = TS->shaped_get_run_language(p_shaped_text, i).utf8(); + if (language.length() > 0) { + accesskit_node_set_language(ae->node, language.ptr()); } - accesskit_node_set_font_weight(ae->node, TS->font_get_weight(font_rid)); - } - accesskit_node_set_font_size(ae->node, TS->shaped_get_run_font_size(p_shaped_text, i)); - CharString language = TS->shaped_get_run_language(p_shaped_text, i).utf8(); - if (language.length() > 0) { - accesskit_node_set_language(ae->node, language.ptr()); - } - accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT); - accesskit_rect rect; - rect.x0 = run_off_x; - rect.y0 = 0; - rect.x1 = run_off_x + size_x; - rect.y1 = text_height; - accesskit_node_set_bounds(ae->node, rect); - accesskit_node_add_action(ae->node, ACCESSKIT_ACTION_SCROLL_INTO_VIEW); + accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT); - run_off_x += size_x; + accesskit_rect rect; + rect.x0 = run_off_x; + rect.y0 = 0; + rect.x1 = run_off_x + size_x; + rect.y1 = text_height; + accesskit_node_set_bounds(ae->node, rect); + accesskit_node_add_action(ae->node, ACCESSKIT_ACTION_SCROLL_INTO_VIEW); + + run_off_x += size_x; + } } if (!p_is_last_line || text_elements.is_empty()) { // Add "\n" at the end. @@ -1292,18 +1319,24 @@ void AccessibilityDriverAccessKit::accessibility_update_set_text_decorations(con ERR_FAIL_NULL(ae); _ensure_node(p_id, ae); + accesskit_color color; + color.red = 0; + color.blue = 0; + color.green = 0; + color.alpha = 255; + if (p_underline) { - accesskit_node_set_underline(ae->node, ACCESSKIT_TEXT_DECORATION_SOLID); + accesskit_node_set_underline(ae->node, { ACCESSKIT_TEXT_DECORATION_STYLE_SOLID, color }); } else { accesskit_node_clear_underline(ae->node); } if (p_overline) { - accesskit_node_set_overline(ae->node, ACCESSKIT_TEXT_DECORATION_SOLID); + accesskit_node_set_overline(ae->node, { ACCESSKIT_TEXT_DECORATION_STYLE_SOLID, color }); } else { accesskit_node_clear_overline(ae->node); } if (p_strikethrough) { - accesskit_node_set_strikethrough(ae->node, ACCESSKIT_TEXT_DECORATION_SOLID); + accesskit_node_set_strikethrough(ae->node, { ACCESSKIT_TEXT_DECORATION_STYLE_SOLID, color }); } else { accesskit_node_clear_strikethrough(ae->node); } @@ -1589,7 +1622,13 @@ void AccessibilityDriverAccessKit::accessibility_update_set_color_value(const RI ERR_FAIL_NULL(ae); _ensure_node(p_id, ae); - accesskit_node_set_color_value(ae->node, p_color.to_rgba32()); + accesskit_color color; + color.red = p_color.get_r8(); + color.blue = p_color.get_b8(); + color.green = p_color.get_g8(); + color.alpha = p_color.get_a8(); + + accesskit_node_set_color_value(ae->node, color); } void AccessibilityDriverAccessKit::accessibility_update_set_background_color(const RID &p_id, const Color &p_color) { @@ -1599,7 +1638,13 @@ void AccessibilityDriverAccessKit::accessibility_update_set_background_color(con ERR_FAIL_NULL(ae); _ensure_node(p_id, ae); - accesskit_node_set_background_color(ae->node, p_color.to_rgba32()); + accesskit_color color; + color.red = p_color.get_r8(); + color.blue = p_color.get_b8(); + color.green = p_color.get_g8(); + color.alpha = p_color.get_a8(); + + accesskit_node_set_background_color(ae->node, color); } void AccessibilityDriverAccessKit::accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) { @@ -1609,7 +1654,13 @@ void AccessibilityDriverAccessKit::accessibility_update_set_foreground_color(con ERR_FAIL_NULL(ae); _ensure_node(p_id, ae); - accesskit_node_set_foreground_color(ae->node, p_color.to_rgba32()); + accesskit_color color; + color.red = p_color.get_r8(); + color.blue = p_color.get_b8(); + color.green = p_color.get_g8(); + color.alpha = p_color.get_a8(); + + accesskit_node_set_foreground_color(ae->node, color); } Error AccessibilityDriverAccessKit::init() { diff --git a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c index c7badf707309..95dfc702d149 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c +++ b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c @@ -49,9 +49,6 @@ #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit @@ -202,6 +199,14 @@ #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit @@ -289,9 +294,9 @@ #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit @@ -484,9 +489,6 @@ #undef accesskit_node_is_disabled #undef accesskit_node_set_disabled #undef accesskit_node_clear_disabled -#undef accesskit_node_is_bold -#undef accesskit_node_set_bold -#undef accesskit_node_clear_bold #undef accesskit_node_is_italic #undef accesskit_node_set_italic #undef accesskit_node_clear_italic @@ -637,6 +639,14 @@ #undef accesskit_node_set_column_index_text #undef accesskit_node_set_column_index_text_with_length #undef accesskit_node_clear_column_index_text +#undef accesskit_node_braille_label +#undef accesskit_node_set_braille_label +#undef accesskit_node_set_braille_label_with_length +#undef accesskit_node_clear_braille_label +#undef accesskit_node_braille_role_description +#undef accesskit_node_set_braille_role_description +#undef accesskit_node_set_braille_role_description_with_length +#undef accesskit_node_clear_braille_role_description #undef accesskit_node_scroll_x #undef accesskit_node_set_scroll_x #undef accesskit_node_clear_scroll_x @@ -724,9 +734,9 @@ #undef accesskit_node_character_lengths #undef accesskit_node_set_character_lengths #undef accesskit_node_clear_character_lengths -#undef accesskit_node_word_lengths -#undef accesskit_node_set_word_lengths -#undef accesskit_node_clear_word_lengths +#undef accesskit_node_word_starts +#undef accesskit_node_set_word_starts +#undef accesskit_node_clear_word_starts #undef accesskit_node_character_positions #undef accesskit_node_set_character_positions #undef accesskit_node_clear_character_positions @@ -941,9 +951,6 @@ void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct a bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1094,6 +1101,14 @@ char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1127,11 +1142,11 @@ void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); @@ -1161,13 +1176,13 @@ struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_ void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration); @@ -1181,9 +1196,9 @@ void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct a struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); -void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); +void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *); void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1658,30 +1673,6 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_is_bold - *(void **) (&accesskit_node_is_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_set_bold - *(void **) (&accesskit_node_set_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_clear_bold - *(void **) (&accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } // accesskit_node_is_italic *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic"); if (verbose) { @@ -2882,6 +2873,70 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } +// accesskit_node_braille_label + *(void **) (&accesskit_node_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_label + *(void **) (&accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_label_with_length + *(void **) (&accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label_with_length"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_clear_braille_label + *(void **) (&accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_braille_role_description + *(void **) (&accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_role_description + *(void **) (&accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_role_description_with_length + *(void **) (&accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description_with_length"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_clear_braille_role_description + *(void **) (&accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } // accesskit_node_scroll_x *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x"); if (verbose) { @@ -3578,24 +3633,24 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_word_lengths - *(void **) (&accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_lengths"); +// accesskit_node_word_starts + *(void **) (&accesskit_node_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_set_word_lengths - *(void **) (&accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_lengths"); +// accesskit_node_set_word_starts + *(void **) (&accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_clear_word_lengths - *(void **) (&accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_lengths"); +// accesskit_node_clear_word_starts + *(void **) (&accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { diff --git a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h index 27cc8538be30..0e4835f9308d 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h +++ b/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h @@ -47,9 +47,6 @@ #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit @@ -200,6 +197,14 @@ #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit @@ -287,9 +292,9 @@ #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit @@ -482,9 +487,6 @@ #undef accesskit_node_is_disabled #undef accesskit_node_set_disabled #undef accesskit_node_clear_disabled -#undef accesskit_node_is_bold -#undef accesskit_node_set_bold -#undef accesskit_node_clear_bold #undef accesskit_node_is_italic #undef accesskit_node_set_italic #undef accesskit_node_clear_italic @@ -635,6 +637,14 @@ #undef accesskit_node_set_column_index_text #undef accesskit_node_set_column_index_text_with_length #undef accesskit_node_clear_column_index_text +#undef accesskit_node_braille_label +#undef accesskit_node_set_braille_label +#undef accesskit_node_set_braille_label_with_length +#undef accesskit_node_clear_braille_label +#undef accesskit_node_braille_role_description +#undef accesskit_node_set_braille_role_description +#undef accesskit_node_set_braille_role_description_with_length +#undef accesskit_node_clear_braille_role_description #undef accesskit_node_scroll_x #undef accesskit_node_set_scroll_x #undef accesskit_node_clear_scroll_x @@ -722,9 +732,9 @@ #undef accesskit_node_character_lengths #undef accesskit_node_set_character_lengths #undef accesskit_node_clear_character_lengths -#undef accesskit_node_word_lengths -#undef accesskit_node_set_word_lengths -#undef accesskit_node_clear_word_lengths +#undef accesskit_node_word_starts +#undef accesskit_node_set_word_starts +#undef accesskit_node_clear_word_starts #undef accesskit_node_character_positions #undef accesskit_node_set_character_positions #undef accesskit_node_clear_character_positions @@ -919,9 +929,6 @@ extern "C" { #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit @@ -1072,6 +1079,14 @@ extern "C" { #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit @@ -1159,9 +1174,9 @@ extern "C" { #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit @@ -1353,9 +1368,6 @@ extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(s extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1506,6 +1518,14 @@ extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); extern void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +extern void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +extern void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +extern void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +extern void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1539,11 +1559,11 @@ extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libacc extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +extern struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +extern struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); @@ -1573,13 +1593,13 @@ extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_w extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration); @@ -1593,9 +1613,9 @@ extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(s extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); -extern void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); +extern void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *); extern void (*accesskit_node_clear_character_positions_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 60ed72f4b5bf..3881b4f001b7 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c +++ b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c @@ -45,9 +45,6 @@ #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit @@ -198,6 +195,14 @@ #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit @@ -285,9 +290,9 @@ #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit @@ -486,9 +491,6 @@ #undef accesskit_node_is_disabled #undef accesskit_node_set_disabled #undef accesskit_node_clear_disabled -#undef accesskit_node_is_bold -#undef accesskit_node_set_bold -#undef accesskit_node_clear_bold #undef accesskit_node_is_italic #undef accesskit_node_set_italic #undef accesskit_node_clear_italic @@ -639,6 +641,14 @@ #undef accesskit_node_set_column_index_text #undef accesskit_node_set_column_index_text_with_length #undef accesskit_node_clear_column_index_text +#undef accesskit_node_braille_label +#undef accesskit_node_set_braille_label +#undef accesskit_node_set_braille_label_with_length +#undef accesskit_node_clear_braille_label +#undef accesskit_node_braille_role_description +#undef accesskit_node_set_braille_role_description +#undef accesskit_node_set_braille_role_description_with_length +#undef accesskit_node_clear_braille_role_description #undef accesskit_node_scroll_x #undef accesskit_node_set_scroll_x #undef accesskit_node_clear_scroll_x @@ -726,9 +736,9 @@ #undef accesskit_node_character_lengths #undef accesskit_node_set_character_lengths #undef accesskit_node_clear_character_lengths -#undef accesskit_node_word_lengths -#undef accesskit_node_set_word_lengths -#undef accesskit_node_clear_word_lengths +#undef accesskit_node_word_starts +#undef accesskit_node_set_word_starts +#undef accesskit_node_clear_word_starts #undef accesskit_node_character_positions #undef accesskit_node_set_character_positions #undef accesskit_node_clear_character_positions @@ -928,9 +938,6 @@ void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct a bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1081,6 +1088,14 @@ char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1114,11 +1129,11 @@ void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); @@ -1148,13 +1163,13 @@ struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_ void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration); @@ -1168,9 +1183,9 @@ void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct a struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); -void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); +void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *); void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1651,30 +1666,6 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_is_bold - *(void **) (&accesskit_node_is_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_set_bold - *(void **) (&accesskit_node_set_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_clear_bold - *(void **) (&accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } // accesskit_node_is_italic *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic"); if (verbose) { @@ -2875,6 +2866,70 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } +// accesskit_node_braille_label + *(void **) (&accesskit_node_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_label + *(void **) (&accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_label_with_length + *(void **) (&accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label_with_length"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_clear_braille_label + *(void **) (&accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_braille_role_description + *(void **) (&accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_role_description + *(void **) (&accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_role_description_with_length + *(void **) (&accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description_with_length"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_clear_braille_role_description + *(void **) (&accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } // accesskit_node_scroll_x *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x"); if (verbose) { @@ -3571,24 +3626,24 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_word_lengths - *(void **) (&accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_lengths"); +// accesskit_node_word_starts + *(void **) (&accesskit_node_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_set_word_lengths - *(void **) (&accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_lengths"); +// accesskit_node_set_word_starts + *(void **) (&accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_clear_word_lengths - *(void **) (&accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_lengths"); +// accesskit_node_clear_word_starts + *(void **) (&accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { diff --git a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h index e3b81af55dab..fd0d3553c678 100644 --- a/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h +++ b/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h @@ -47,9 +47,6 @@ #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit @@ -200,6 +197,14 @@ #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit @@ -287,9 +292,9 @@ #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit @@ -488,9 +493,6 @@ #undef accesskit_node_is_disabled #undef accesskit_node_set_disabled #undef accesskit_node_clear_disabled -#undef accesskit_node_is_bold -#undef accesskit_node_set_bold -#undef accesskit_node_clear_bold #undef accesskit_node_is_italic #undef accesskit_node_set_italic #undef accesskit_node_clear_italic @@ -641,6 +643,14 @@ #undef accesskit_node_set_column_index_text #undef accesskit_node_set_column_index_text_with_length #undef accesskit_node_clear_column_index_text +#undef accesskit_node_braille_label +#undef accesskit_node_set_braille_label +#undef accesskit_node_set_braille_label_with_length +#undef accesskit_node_clear_braille_label +#undef accesskit_node_braille_role_description +#undef accesskit_node_set_braille_role_description +#undef accesskit_node_set_braille_role_description_with_length +#undef accesskit_node_clear_braille_role_description #undef accesskit_node_scroll_x #undef accesskit_node_set_scroll_x #undef accesskit_node_clear_scroll_x @@ -728,9 +738,9 @@ #undef accesskit_node_character_lengths #undef accesskit_node_set_character_lengths #undef accesskit_node_clear_character_lengths -#undef accesskit_node_word_lengths -#undef accesskit_node_set_word_lengths -#undef accesskit_node_clear_word_lengths +#undef accesskit_node_word_starts +#undef accesskit_node_set_word_starts +#undef accesskit_node_clear_word_starts #undef accesskit_node_character_positions #undef accesskit_node_set_character_positions #undef accesskit_node_clear_character_positions @@ -931,9 +941,6 @@ extern "C" { #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit @@ -1084,6 +1091,14 @@ extern "C" { #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit @@ -1171,9 +1186,9 @@ extern "C" { #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit @@ -1371,9 +1386,6 @@ extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(s extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1524,6 +1536,14 @@ extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); extern void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +extern void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +extern void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +extern void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +extern void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1557,11 +1577,11 @@ extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libacc extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +extern struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +extern struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); @@ -1591,13 +1611,13 @@ extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_w extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration); @@ -1611,9 +1631,9 @@ extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(s extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); -extern void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); +extern void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *); extern void (*accesskit_node_clear_character_positions_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 248b6c14843f..36aadec7af12 100644 --- a/drivers/accesskit/dynwrappers/accesskit-so_wrap.c +++ b/drivers/accesskit/dynwrappers/accesskit-so_wrap.c @@ -45,9 +45,6 @@ #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit @@ -198,6 +195,14 @@ #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit @@ -285,9 +290,9 @@ #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit @@ -476,9 +481,6 @@ #undef accesskit_node_is_disabled #undef accesskit_node_set_disabled #undef accesskit_node_clear_disabled -#undef accesskit_node_is_bold -#undef accesskit_node_set_bold -#undef accesskit_node_clear_bold #undef accesskit_node_is_italic #undef accesskit_node_set_italic #undef accesskit_node_clear_italic @@ -629,6 +631,14 @@ #undef accesskit_node_set_column_index_text #undef accesskit_node_set_column_index_text_with_length #undef accesskit_node_clear_column_index_text +#undef accesskit_node_braille_label +#undef accesskit_node_set_braille_label +#undef accesskit_node_set_braille_label_with_length +#undef accesskit_node_clear_braille_label +#undef accesskit_node_braille_role_description +#undef accesskit_node_set_braille_role_description +#undef accesskit_node_set_braille_role_description_with_length +#undef accesskit_node_clear_braille_role_description #undef accesskit_node_scroll_x #undef accesskit_node_set_scroll_x #undef accesskit_node_clear_scroll_x @@ -716,9 +726,9 @@ #undef accesskit_node_character_lengths #undef accesskit_node_set_character_lengths #undef accesskit_node_clear_character_lengths -#undef accesskit_node_word_lengths -#undef accesskit_node_set_word_lengths -#undef accesskit_node_clear_word_lengths +#undef accesskit_node_word_starts +#undef accesskit_node_set_word_starts +#undef accesskit_node_clear_word_starts #undef accesskit_node_character_positions #undef accesskit_node_set_character_positions #undef accesskit_node_clear_character_positions @@ -908,9 +918,6 @@ void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct a bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1061,6 +1068,14 @@ char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1094,11 +1109,11 @@ void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); @@ -1128,13 +1143,13 @@ struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_ void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration); @@ -1148,9 +1163,9 @@ void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct a struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); -void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); +void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *); void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1621,30 +1636,6 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_is_bold - *(void **) (&accesskit_node_is_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_set_bold - *(void **) (&accesskit_node_set_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } -// accesskit_node_clear_bold - *(void **) (&accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bold"); - if (verbose) { - error = dlerror(); - if (error != NULL) { - fprintf(stderr, "%s\n", error); - } - } // accesskit_node_is_italic *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic"); if (verbose) { @@ -2845,6 +2836,70 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } +// accesskit_node_braille_label + *(void **) (&accesskit_node_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_label + *(void **) (&accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_label_with_length + *(void **) (&accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label_with_length"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_clear_braille_label + *(void **) (&accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_label"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_braille_role_description + *(void **) (&accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_role_description + *(void **) (&accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_set_braille_role_description_with_length + *(void **) (&accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description_with_length"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } +// accesskit_node_clear_braille_role_description + *(void **) (&accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_role_description"); + if (verbose) { + error = dlerror(); + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + } // accesskit_node_scroll_x *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x"); if (verbose) { @@ -3541,24 +3596,24 @@ int initialize_libaccesskit(int verbose, void *handle) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_word_lengths - *(void **) (&accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_lengths"); +// accesskit_node_word_starts + *(void **) (&accesskit_node_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_set_word_lengths - *(void **) (&accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_lengths"); +// accesskit_node_set_word_starts + *(void **) (&accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { fprintf(stderr, "%s\n", error); } } -// accesskit_node_clear_word_lengths - *(void **) (&accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_lengths"); +// accesskit_node_clear_word_starts + *(void **) (&accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_starts"); if (verbose) { error = dlerror(); if (error != NULL) { diff --git a/drivers/accesskit/dynwrappers/accesskit-so_wrap.h b/drivers/accesskit/dynwrappers/accesskit-so_wrap.h index 67b74aa95633..f9e11bba0416 100644 --- a/drivers/accesskit/dynwrappers/accesskit-so_wrap.h +++ b/drivers/accesskit/dynwrappers/accesskit-so_wrap.h @@ -47,9 +47,6 @@ #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit @@ -200,6 +197,14 @@ #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit @@ -287,9 +292,9 @@ #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit @@ -478,9 +483,6 @@ #undef accesskit_node_is_disabled #undef accesskit_node_set_disabled #undef accesskit_node_clear_disabled -#undef accesskit_node_is_bold -#undef accesskit_node_set_bold -#undef accesskit_node_clear_bold #undef accesskit_node_is_italic #undef accesskit_node_set_italic #undef accesskit_node_clear_italic @@ -631,6 +633,14 @@ #undef accesskit_node_set_column_index_text #undef accesskit_node_set_column_index_text_with_length #undef accesskit_node_clear_column_index_text +#undef accesskit_node_braille_label +#undef accesskit_node_set_braille_label +#undef accesskit_node_set_braille_label_with_length +#undef accesskit_node_clear_braille_label +#undef accesskit_node_braille_role_description +#undef accesskit_node_set_braille_role_description +#undef accesskit_node_set_braille_role_description_with_length +#undef accesskit_node_clear_braille_role_description #undef accesskit_node_scroll_x #undef accesskit_node_set_scroll_x #undef accesskit_node_clear_scroll_x @@ -718,9 +728,9 @@ #undef accesskit_node_character_lengths #undef accesskit_node_set_character_lengths #undef accesskit_node_clear_character_lengths -#undef accesskit_node_word_lengths -#undef accesskit_node_set_word_lengths -#undef accesskit_node_clear_word_lengths +#undef accesskit_node_word_starts +#undef accesskit_node_set_word_starts +#undef accesskit_node_clear_word_starts #undef accesskit_node_character_positions #undef accesskit_node_set_character_positions #undef accesskit_node_clear_character_positions @@ -911,9 +921,6 @@ extern "C" { #define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit #define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit -#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit #define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit #define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit @@ -1064,6 +1071,14 @@ extern "C" { #define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit #define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit +#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit +#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit #define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit #define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit @@ -1151,9 +1166,9 @@ extern "C" { #define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit #define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit -#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit +#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_wrapper_libaccesskit +#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit +#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit #define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit #define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit #define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit @@ -1341,9 +1356,6 @@ extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(s extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1494,6 +1506,14 @@ extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); extern void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +extern void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +extern void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *); +extern void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t); +extern void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); @@ -1527,11 +1547,11 @@ extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libacc extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +extern struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double); +extern struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float); extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); @@ -1561,13 +1581,13 @@ extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_w extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t); extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t); +extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color); extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration); @@ -1581,9 +1601,9 @@ extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(s extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); -extern struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); -extern void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); -extern void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); +extern struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); +extern void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *); +extern void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *); extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *); extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *); diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index d95674038b6a..550f4b868cc5 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -4855,6 +4855,7 @@ void TextServerAdvanced::_generate_runs(ShapedTextDataAdvanced *p_sd) const { p_sd->runs.push_back(run); } run.range = Vector2i(gl.start, gl.end); + run.gl_range = Vector2i(i, i); run.font_rid = gl.font_rid; run.font_size = gl.font_size; run.rtl = bool(gl.flags & GRAPHEME_IS_RTL); @@ -4862,6 +4863,8 @@ void TextServerAdvanced::_generate_runs(ShapedTextDataAdvanced *p_sd) const { } run.range.x = MIN(run.range.x, gl.start); run.range.y = MAX(run.range.y, gl.end); + run.gl_range.x = MIN(run.gl_range.x, i); + run.gl_range.y = MAX(run.gl_range.y, i); } if (run.span_index >= 0) { p_sd->runs.push_back(run); @@ -4910,6 +4913,20 @@ Vector2i TextServerAdvanced::_shaped_get_run_range(const RID &p_shaped, int64_t return sd->runs[p_index].range; } +Vector2i TextServerAdvanced::_shaped_get_run_glyph_range(const RID &p_shaped, int64_t p_index) const { + ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped); + ERR_FAIL_NULL_V(sd, Vector2i()); + MutexLock lock(sd->mutex); + if (!sd->valid.is_set()) { + const_cast(this)->_shaped_text_shape(p_shaped); + } + if (sd->runs_dirty) { + _generate_runs(sd); + } + ERR_FAIL_INDEX_V(p_index, sd->runs.size(), Vector2i()); + return sd->runs[p_index].gl_range; +} + RID TextServerAdvanced::_shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const { ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped); ERR_FAIL_NULL_V(sd, RID()); diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h index a04c23bdfcb6..c8c3fd6a4d0c 100644 --- a/modules/text_server_adv/text_server_adv.h +++ b/modules/text_server_adv/text_server_adv.h @@ -477,6 +477,7 @@ class TextServerAdvanced : public TextServerExtension { struct TextRun { Vector2i range; + Vector2i gl_range; RID font_rid; int font_size = 0; bool rtl = false; @@ -1074,6 +1075,7 @@ class TextServerAdvanced : public TextServerExtension { MODBIND1RC(int64_t, shaped_get_run_count, const RID &); MODBIND2RC(String, shaped_get_run_text, const RID &, int64_t); MODBIND2RC(Vector2i, shaped_get_run_range, const RID &, int64_t); + MODBIND2RC(Vector2i, shaped_get_run_glyph_range, const RID &, int64_t); MODBIND2RC(RID, shaped_get_run_font_rid, const RID &, int64_t); MODBIND2RC(int, shaped_get_run_font_size, const RID &, int64_t); MODBIND2RC(String, shaped_get_run_language, const RID &, int64_t); diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 75ea80d772ff..9d99c3a04817 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -3638,12 +3638,15 @@ void TextServerFallback::_generate_runs(ShapedTextDataFallback *p_sd) const { p_sd->runs.push_back(run); } run.range = Vector2i(gl.start, gl.end); + run.gl_range = Vector2i(i, i); run.font_rid = gl.font_rid; run.font_size = gl.font_size; run.span_index = span; } run.range.x = MIN(run.range.x, gl.start); run.range.y = MAX(run.range.y, gl.end); + run.gl_range.x = MIN(run.gl_range.x, i); + run.gl_range.y = MAX(run.gl_range.y, i); } if (run.span_index >= 0) { p_sd->runs.push_back(run); @@ -3692,6 +3695,20 @@ Vector2i TextServerFallback::_shaped_get_run_range(const RID &p_shaped, int64_t return sd->runs[p_index].range; } +Vector2i TextServerFallback::_shaped_get_run_glyph_range(const RID &p_shaped, int64_t p_index) const { + ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped); + ERR_FAIL_NULL_V(sd, Vector2i()); + MutexLock lock(sd->mutex); + if (!sd->valid.is_set()) { + const_cast(this)->_shaped_text_shape(p_shaped); + } + if (sd->runs_dirty) { + _generate_runs(sd); + } + ERR_FAIL_INDEX_V(p_index, sd->runs.size(), Vector2i()); + return sd->runs[p_index].gl_range; +} + RID TextServerFallback::_shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const { ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped); ERR_FAIL_NULL_V(sd, RID()); diff --git a/modules/text_server_fb/text_server_fb.h b/modules/text_server_fb/text_server_fb.h index d714062ed9ff..833c96de6adf 100644 --- a/modules/text_server_fb/text_server_fb.h +++ b/modules/text_server_fb/text_server_fb.h @@ -412,6 +412,7 @@ class TextServerFallback : public TextServerExtension { struct TextRun { Vector2i range; + Vector2i gl_range; RID font_rid; int font_size = 0; int64_t span_index = -1; @@ -854,6 +855,7 @@ class TextServerFallback : public TextServerExtension { MODBIND1RC(int64_t, shaped_get_run_count, const RID &); MODBIND2RC(String, shaped_get_run_text, const RID &, int64_t); MODBIND2RC(Vector2i, shaped_get_run_range, const RID &, int64_t); + MODBIND2RC(Vector2i, shaped_get_run_glyph_range, const RID &, int64_t); MODBIND2RC(RID, shaped_get_run_font_rid, const RID &, int64_t); MODBIND2RC(int, shaped_get_run_font_size, const RID &, int64_t); MODBIND2RC(String, shaped_get_run_language, const RID &, int64_t); diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 7babf9dcaf58..c8e2f057208b 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -898,12 +898,16 @@ void Window::hide() { void Window::_accessibility_activate() { _accessibility_notify_enter(this); - DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id()); + if (!get_embedder()) { + DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id()); + } } void Window::_accessibility_deactivate() { _accessibility_notify_exit(this); - DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id()); + if (!get_embedder()) { + DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id()); + } } void Window::_accessibility_notify_enter(Node *p_node) { @@ -988,12 +992,16 @@ void Window::set_visible(bool p_visible) { if (get_tree() && get_tree()->is_accessibility_supported()) { get_tree()->_accessibility_force_update(); _accessibility_notify_enter(this); - DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id()); + if (!embedder_vp) { + DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id()); + } } } else { if (get_tree() && get_tree()->is_accessibility_supported()) { _accessibility_notify_exit(this); - DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id()); + if (!embedder_vp) { + DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id()); + } } focused = false; if (focused_window == this) { @@ -1598,7 +1606,9 @@ void Window::_notification(int p_what) { if (window_id != DisplayServer::MAIN_WINDOW_ID && get_tree() && get_tree()->is_accessibility_supported()) { get_tree()->_accessibility_force_update(); _accessibility_notify_enter(this); - DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id()); + if (!embedder) { + DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id()); + } } notification(NOTIFICATION_VISIBILITY_CHANGED); emit_signal(SceneStringName(visibility_changed)); @@ -1653,7 +1663,9 @@ void Window::_notification(int p_what) { if (visible && window_id != DisplayServer::MAIN_WINDOW_ID) { if (get_tree() && get_tree()->is_accessibility_supported()) { _accessibility_notify_exit(this); - DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id()); + if (!embedder) { + DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id()); + } if (get_parent()) { get_parent()->queue_accessibility_update(); } diff --git a/servers/text/text_server.cpp b/servers/text/text_server.cpp index fcf73e74b98f..5514ec957f45 100644 --- a/servers/text/text_server.cpp +++ b/servers/text/text_server.cpp @@ -451,6 +451,7 @@ void TextServer::_bind_methods() { ClassDB::bind_method(D_METHOD("shaped_get_run_count", "shaped"), &TextServer::shaped_get_run_count); ClassDB::bind_method(D_METHOD("shaped_get_run_text", "shaped", "index"), &TextServer::shaped_get_run_text); ClassDB::bind_method(D_METHOD("shaped_get_run_range", "shaped", "index"), &TextServer::shaped_get_run_range); + ClassDB::bind_method(D_METHOD("shaped_get_run_glyph_range", "shaped", "index"), &TextServer::shaped_get_run_glyph_range); ClassDB::bind_method(D_METHOD("shaped_get_run_font_rid", "shaped", "index"), &TextServer::shaped_get_run_font_rid); ClassDB::bind_method(D_METHOD("shaped_get_run_font_size", "shaped", "index"), &TextServer::shaped_get_run_font_size); ClassDB::bind_method(D_METHOD("shaped_get_run_language", "shaped", "index"), &TextServer::shaped_get_run_language); diff --git a/servers/text/text_server.h b/servers/text/text_server.h index fc3a2b75bb8e..89c9b5ef621d 100644 --- a/servers/text/text_server.h +++ b/servers/text/text_server.h @@ -507,6 +507,7 @@ class TextServer : public RefCounted { virtual int64_t shaped_get_run_count(const RID &p_shaped) const = 0; virtual String shaped_get_run_text(const RID &p_shaped, int64_t p_index) const = 0; virtual Vector2i shaped_get_run_range(const RID &p_shaped, int64_t p_index) const = 0; + virtual Vector2i shaped_get_run_glyph_range(const RID &p_shaped, int64_t p_index) const = 0; virtual RID shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const = 0; virtual int shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const = 0; virtual String shaped_get_run_language(const RID &p_shaped, int64_t p_index) const = 0; diff --git a/servers/text/text_server_extension.cpp b/servers/text/text_server_extension.cpp index 47e4ea4798fa..0add1a9c6804 100644 --- a/servers/text/text_server_extension.cpp +++ b/servers/text/text_server_extension.cpp @@ -295,6 +295,7 @@ void TextServerExtension::_bind_methods() { GDVIRTUAL_BIND(_shaped_get_run_count, "shaped"); GDVIRTUAL_BIND(_shaped_get_run_text, "shaped", "index"); GDVIRTUAL_BIND(_shaped_get_run_range, "shaped", "index"); + GDVIRTUAL_BIND(_shaped_get_run_glyph_range, "shaped", "index"); GDVIRTUAL_BIND(_shaped_get_run_font_rid, "shaped", "index"); GDVIRTUAL_BIND(_shaped_get_run_font_size, "shaped", "index"); GDVIRTUAL_BIND(_shaped_get_run_language, "shaped", "index"); @@ -1327,6 +1328,12 @@ Vector2i TextServerExtension::shaped_get_run_range(const RID &p_shaped, int64_t return ret; } +Vector2i TextServerExtension::shaped_get_run_glyph_range(const RID &p_shaped, int64_t p_index) const { + Vector2i ret; + GDVIRTUAL_CALL(_shaped_get_run_glyph_range, p_shaped, p_index, ret); + return ret; +} + RID TextServerExtension::shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const { RID ret; GDVIRTUAL_CALL(_shaped_get_run_font_rid, p_shaped, p_index, ret); diff --git a/servers/text/text_server_extension.h b/servers/text/text_server_extension.h index b5b16e97a859..0924758d91a4 100644 --- a/servers/text/text_server_extension.h +++ b/servers/text/text_server_extension.h @@ -486,6 +486,7 @@ class TextServerExtension : public TextServer { virtual int64_t shaped_get_run_count(const RID &p_shaped) const override; virtual String shaped_get_run_text(const RID &p_shaped, int64_t p_index) const override; virtual Vector2i shaped_get_run_range(const RID &p_shaped, int64_t p_index) const override; + virtual Vector2i shaped_get_run_glyph_range(const RID &p_shaped, int64_t p_index) const override; virtual RID shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const override; virtual int shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const override; virtual String shaped_get_run_language(const RID &p_shaped, int64_t p_index) const override; @@ -494,6 +495,7 @@ class TextServerExtension : public TextServer { GDVIRTUAL1RC(int64_t, _shaped_get_run_count, RID); GDVIRTUAL2RC(String, _shaped_get_run_text, RID, int64_t); GDVIRTUAL2RC(Vector2i, _shaped_get_run_range, RID, int64_t); + GDVIRTUAL2RC(Vector2i, _shaped_get_run_glyph_range, RID, int64_t); GDVIRTUAL2RC(RID, _shaped_get_run_font_rid, RID, int64_t); GDVIRTUAL2RC(int, _shaped_get_run_font_size, RID, int64_t); GDVIRTUAL2RC(String, _shaped_get_run_language, RID, int64_t); diff --git a/thirdparty/README.md b/thirdparty/README.md index fc2982ace650..cc810d7f493e 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -8,7 +8,7 @@ readability. ## accesskit - Upstream: https://github.com/AccessKit/accesskit-c -- Version: 0.18.0 (0c52a8ce2357bbeb927f90dc9a1c19c8ec1bd2c3, 2025) +- Version: 0.21.2 (72460cd52d1b24492393cdf54a6f19d2fd63e258, 2026) - License: MIT Files extracted from upstream source: diff --git a/thirdparty/accesskit/include/accesskit.h b/thirdparty/accesskit/include/accesskit.h index feff33c90ee2..eab9e353703e 100644 --- a/thirdparty/accesskit/include/accesskit.h +++ b/thirdparty/accesskit/include/accesskit.h @@ -16,6 +16,9 @@ #ifdef _WIN32 #include #endif +#ifdef __ANDROID__ +#include +#endif /** * An action to be taken on an accessibility node. @@ -312,11 +315,8 @@ enum accesskit_role ACCESSKIT_ROLE_CONTENT_INFO, ACCESSKIT_ROLE_DEFINITION, ACCESSKIT_ROLE_DESCRIPTION_LIST, - ACCESSKIT_ROLE_DESCRIPTION_LIST_DETAIL, - ACCESSKIT_ROLE_DESCRIPTION_LIST_TERM, ACCESSKIT_ROLE_DETAILS, ACCESSKIT_ROLE_DIALOG, - ACCESSKIT_ROLE_DIRECTORY, ACCESSKIT_ROLE_DISCLOSURE_TRIANGLE, ACCESSKIT_ROLE_DOCUMENT, ACCESSKIT_ROLE_EMBEDDED_OBJECT, @@ -325,12 +325,11 @@ enum accesskit_role ACCESSKIT_ROLE_FIGURE_CAPTION, ACCESSKIT_ROLE_FIGURE, ACCESSKIT_ROLE_FOOTER, - ACCESSKIT_ROLE_FOOTER_AS_NON_LANDMARK, ACCESSKIT_ROLE_FORM, ACCESSKIT_ROLE_GRID, + ACCESSKIT_ROLE_GRID_CELL, ACCESSKIT_ROLE_GROUP, ACCESSKIT_ROLE_HEADER, - ACCESSKIT_ROLE_HEADER_AS_NON_LANDMARK, ACCESSKIT_ROLE_HEADING, ACCESSKIT_ROLE_IFRAME, ACCESSKIT_ROLE_IFRAME_PRESENTATIONAL, @@ -352,8 +351,6 @@ enum accesskit_role ACCESSKIT_ROLE_NAVIGATION, ACCESSKIT_ROLE_NOTE, ACCESSKIT_ROLE_PLUGIN_OBJECT, - ACCESSKIT_ROLE_PORTAL, - ACCESSKIT_ROLE_PRE, ACCESSKIT_ROLE_PROGRESS_INDICATOR, ACCESSKIT_ROLE_RADIO_GROUP, ACCESSKIT_ROLE_REGION, @@ -364,6 +361,8 @@ enum accesskit_role ACCESSKIT_ROLE_SCROLL_VIEW, ACCESSKIT_ROLE_SEARCH, ACCESSKIT_ROLE_SECTION, + ACCESSKIT_ROLE_SECTION_FOOTER, + ACCESSKIT_ROLE_SECTION_HEADER, ACCESSKIT_ROLE_SLIDER, ACCESSKIT_ROLE_SPIN_BUTTON, ACCESSKIT_ROLE_SPLITTER, @@ -519,19 +518,19 @@ enum accesskit_text_align typedef uint8_t accesskit_text_align; #endif // __cplusplus -enum accesskit_text_decoration +enum accesskit_text_decoration_style #ifdef __cplusplus : uint8_t #endif // __cplusplus { - ACCESSKIT_TEXT_DECORATION_SOLID, - ACCESSKIT_TEXT_DECORATION_DOTTED, - ACCESSKIT_TEXT_DECORATION_DASHED, - ACCESSKIT_TEXT_DECORATION_DOUBLE, - ACCESSKIT_TEXT_DECORATION_WAVY, + ACCESSKIT_TEXT_DECORATION_STYLE_SOLID, + ACCESSKIT_TEXT_DECORATION_STYLE_DOTTED, + ACCESSKIT_TEXT_DECORATION_STYLE_DASHED, + ACCESSKIT_TEXT_DECORATION_STYLE_DOUBLE, + ACCESSKIT_TEXT_DECORATION_STYLE_WAVY, }; #ifndef __cplusplus -typedef uint8_t accesskit_text_decoration; +typedef uint8_t accesskit_text_decoration_style; #endif // __cplusplus enum accesskit_text_direction @@ -573,6 +572,24 @@ enum accesskit_vertical_offset typedef uint8_t accesskit_vertical_offset; #endif // __cplusplus +#if defined(__ANDROID__) +typedef struct accesskit_android_adapter accesskit_android_adapter; +#endif + +#if defined(__ANDROID__) +typedef struct accesskit_android_injecting_adapter + accesskit_android_injecting_adapter; +#endif + +#if defined(__ANDROID__) +typedef struct accesskit_android_platform_action + accesskit_android_platform_action; +#endif + +#if defined(__ANDROID__) +typedef struct accesskit_android_queued_events accesskit_android_queued_events; +#endif + typedef struct accesskit_custom_action accesskit_custom_action; #if defined(__APPLE__) @@ -629,6 +646,24 @@ typedef struct accesskit_opt_node_id { accesskit_node_id value; } accesskit_opt_node_id; +/** + * A 128-bit identifier for a tree, represented as a UUID in big-endian byte + * order. + */ +typedef struct accesskit_tree_id { + uint8_t bytes[16]; +} accesskit_tree_id; + +/** + * Represents an optional value. + * + * If `has_value` is false, do not read the `value` field. + */ +typedef struct accesskit_opt_tree_id { + bool has_value; + struct accesskit_tree_id value; +} accesskit_opt_tree_id; + /** * Represents an optional value. * @@ -639,6 +674,16 @@ typedef struct accesskit_opt_double { double value; } accesskit_opt_double; +/** + * Represents an optional value. + * + * If `has_value` is false, do not read the `value` field. + */ +typedef struct accesskit_opt_float { + bool has_value; + float value; +} accesskit_opt_float; + /** * Represents an optional value. * @@ -649,6 +694,16 @@ typedef struct accesskit_opt_index { size_t value; } accesskit_opt_index; +/** + * A color represented in 8-bit sRGB plus alpha. + */ +typedef struct accesskit_color { + uint8_t red; + uint8_t green; + uint8_t blue; + uint8_t alpha; +} accesskit_color; + /** * Represents an optional value. * @@ -656,9 +711,17 @@ typedef struct accesskit_opt_index { */ typedef struct accesskit_opt_color { bool has_value; - uint32_t value; + struct accesskit_color value; } accesskit_opt_color; +/** + * The style and color for a type of text decoration. + */ +typedef struct accesskit_text_decoration { + accesskit_text_decoration_style style; + struct accesskit_color color; +} accesskit_text_decoration; + /** * Represents an optional value. * @@ -666,7 +729,7 @@ typedef struct accesskit_opt_color { */ typedef struct accesskit_opt_text_decoration { bool has_value; - accesskit_text_decoration value; + struct accesskit_text_decoration value; } accesskit_opt_text_decoration; typedef struct accesskit_lengths { @@ -947,7 +1010,8 @@ typedef struct accesskit_opt_action_data { typedef struct accesskit_action_request { accesskit_action action; - accesskit_node_id target; + struct accesskit_tree_id target_tree; + accesskit_node_id target_node; struct accesskit_opt_action_data data; } accesskit_action_request; @@ -983,13 +1047,6 @@ typedef struct accesskit_size { double height; } accesskit_size; -/** - * Ownership of `request` is transferred to the callback. `request` must - * be freed using `accesskit_action_request_free`. - */ -typedef void (*accesskit_action_handler_callback)( - struct accesskit_action_request *request, void *userdata); - typedef void *accesskit_tree_update_factory_userdata; /** @@ -1002,6 +1059,13 @@ typedef struct accesskit_tree_update *(*accesskit_tree_update_factory)( typedef struct accesskit_tree_update *(*accesskit_activation_handler_callback)( void *userdata); +/** + * Ownership of `request` is transferred to the callback. `request` must + * be freed using `accesskit_action_request_free`. + */ +typedef void (*accesskit_action_handler_callback)( + struct accesskit_action_request *request, void *userdata); + typedef void (*accesskit_deactivation_handler_callback)(void *userdata); #if defined(_WIN32) @@ -1020,6 +1084,8 @@ typedef struct accesskit_opt_lresult { extern "C" { #endif // __cplusplus +extern const struct accesskit_tree_id ACCESSKIT_TREE_ID_ROOT; + accesskit_role accesskit_node_role(const struct accesskit_node *node); void accesskit_node_set_role(struct accesskit_node *node, accesskit_role value); @@ -1122,12 +1188,6 @@ void accesskit_node_set_disabled(struct accesskit_node *node); void accesskit_node_clear_disabled(struct accesskit_node *node); -bool accesskit_node_is_bold(const struct accesskit_node *node); - -void accesskit_node_set_bold(struct accesskit_node *node); - -void accesskit_node_clear_bold(struct accesskit_node *node); - bool accesskit_node_is_italic(const struct accesskit_node *node); void accesskit_node_set_italic(struct accesskit_node *node); @@ -1344,6 +1404,14 @@ void accesskit_node_set_popup_for(struct accesskit_node *node, void accesskit_node_clear_popup_for(struct accesskit_node *node); +struct accesskit_opt_tree_id accesskit_node_tree_id( + const struct accesskit_node *node); + +void accesskit_node_set_tree_id(struct accesskit_node *node, + struct accesskit_tree_id value); + +void accesskit_node_clear_tree_id(struct accesskit_node *node); + /** * Only call this function with a string that originated from AccessKit. */ @@ -1694,6 +1762,46 @@ void accesskit_node_set_column_index_text_with_length( void accesskit_node_clear_column_index_text(struct accesskit_node *node); +/** + * Caller must call `accesskit_string_free` with the return value. + */ +char *accesskit_node_braille_label(const struct accesskit_node *node); + +/** + * Caller is responsible for freeing the memory pointed by `value`. + */ +void accesskit_node_set_braille_label(struct accesskit_node *node, + const char *value); + +/** + * Caller is responsible for freeing the memory pointed by `value`. + */ +void accesskit_node_set_braille_label_with_length(struct accesskit_node *node, + const char *value, + size_t length); + +void accesskit_node_clear_braille_label(struct accesskit_node *node); + +/** + * Caller must call `accesskit_string_free` with the return value. + */ +char *accesskit_node_braille_role_description( + const struct accesskit_node *node); + +/** + * Caller is responsible for freeing the memory pointed by `value`. + */ +void accesskit_node_set_braille_role_description(struct accesskit_node *node, + const char *value); + +/** + * Caller is responsible for freeing the memory pointed by `value`. + */ +void accesskit_node_set_braille_role_description_with_length( + struct accesskit_node *node, const char *value, size_t length); + +void accesskit_node_clear_braille_role_description(struct accesskit_node *node); + struct accesskit_opt_double accesskit_node_scroll_x( const struct accesskit_node *node); @@ -1776,17 +1884,17 @@ void accesskit_node_set_numeric_value_jump(struct accesskit_node *node, void accesskit_node_clear_numeric_value_jump(struct accesskit_node *node); -struct accesskit_opt_double accesskit_node_font_size( +struct accesskit_opt_float accesskit_node_font_size( const struct accesskit_node *node); -void accesskit_node_set_font_size(struct accesskit_node *node, double value); +void accesskit_node_set_font_size(struct accesskit_node *node, float value); void accesskit_node_clear_font_size(struct accesskit_node *node); -struct accesskit_opt_double accesskit_node_font_weight( +struct accesskit_opt_float accesskit_node_font_weight( const struct accesskit_node *node); -void accesskit_node_set_font_weight(struct accesskit_node *node, double value); +void accesskit_node_set_font_weight(struct accesskit_node *node, float value); void accesskit_node_clear_font_weight(struct accesskit_node *node); @@ -1858,7 +1966,7 @@ struct accesskit_opt_color accesskit_node_color_value( const struct accesskit_node *node); void accesskit_node_set_color_value(struct accesskit_node *node, - uint32_t value); + struct accesskit_color value); void accesskit_node_clear_color_value(struct accesskit_node *node); @@ -1866,7 +1974,7 @@ struct accesskit_opt_color accesskit_node_background_color( const struct accesskit_node *node); void accesskit_node_set_background_color(struct accesskit_node *node, - uint32_t value); + struct accesskit_color value); void accesskit_node_clear_background_color(struct accesskit_node *node); @@ -1874,7 +1982,7 @@ struct accesskit_opt_color accesskit_node_foreground_color( const struct accesskit_node *node); void accesskit_node_set_foreground_color(struct accesskit_node *node, - uint32_t value); + struct accesskit_color value); void accesskit_node_clear_foreground_color(struct accesskit_node *node); @@ -1882,7 +1990,7 @@ struct accesskit_opt_text_decoration accesskit_node_overline( const struct accesskit_node *node); void accesskit_node_set_overline(struct accesskit_node *node, - accesskit_text_decoration value); + struct accesskit_text_decoration value); void accesskit_node_clear_overline(struct accesskit_node *node); @@ -1890,7 +1998,7 @@ struct accesskit_opt_text_decoration accesskit_node_strikethrough( const struct accesskit_node *node); void accesskit_node_set_strikethrough(struct accesskit_node *node, - accesskit_text_decoration value); + struct accesskit_text_decoration value); void accesskit_node_clear_strikethrough(struct accesskit_node *node); @@ -1898,7 +2006,7 @@ struct accesskit_opt_text_decoration accesskit_node_underline( const struct accesskit_node *node); void accesskit_node_set_underline(struct accesskit_node *node, - accesskit_text_decoration value); + struct accesskit_text_decoration value); void accesskit_node_clear_underline(struct accesskit_node *node); @@ -1913,16 +2021,16 @@ void accesskit_node_set_character_lengths(struct accesskit_node *node, void accesskit_node_clear_character_lengths(struct accesskit_node *node); -struct accesskit_lengths accesskit_node_word_lengths( +struct accesskit_lengths accesskit_node_word_starts( const struct accesskit_node *node); /** * Caller is responsible for freeing `values`. */ -void accesskit_node_set_word_lengths(struct accesskit_node *node, size_t length, - const uint8_t *values); +void accesskit_node_set_word_starts(struct accesskit_node *node, size_t length, + const uint8_t *values); -void accesskit_node_clear_word_lengths(struct accesskit_node *node); +void accesskit_node_clear_word_starts(struct accesskit_node *node); struct accesskit_opt_coords accesskit_node_character_positions( const struct accesskit_node *node); @@ -2117,7 +2225,8 @@ struct accesskit_custom_actions *accesskit_node_custom_actions( const struct accesskit_node *node); /** - * Caller is responsible for freeing each `custom_action` in the array. + * Caller is responsible for freeing each `custom_action` in the array + * as well as the `values` array itself. */ void accesskit_node_set_custom_actions( struct accesskit_node *node, size_t length, @@ -2213,6 +2322,12 @@ void accesskit_tree_update_clear_tree(struct accesskit_tree_update *update); void accesskit_tree_update_set_focus(struct accesskit_tree_update *update, accesskit_node_id focus); +struct accesskit_tree_id accesskit_tree_update_get_tree_id( + const struct accesskit_tree_update *update); + +void accesskit_tree_update_set_tree_id(struct accesskit_tree_update *update, + struct accesskit_tree_id tree_id); + /** * Caller must call `accesskit_string_free` with the return value. */ @@ -2344,6 +2459,108 @@ struct accesskit_vec2 accesskit_vec2_scale(struct accesskit_vec2 vec, struct accesskit_vec2 accesskit_vec2_neg(struct accesskit_vec2 vec); +#if defined(__ANDROID__) +struct accesskit_android_platform_action * +accesskit_android_platform_action_from_java(JNIEnv *env, jint action, + jobject arguments); +#endif + +#if defined(__ANDROID__) +void accesskit_android_platform_action_free( + struct accesskit_android_platform_action *action); +#endif + +#if defined(__ANDROID__) +/** + * Memory is also freed when calling this function. + */ +void accesskit_android_queued_events_raise( + struct accesskit_android_queued_events *events, JNIEnv *env, jobject host); +#endif + +#if defined(__ANDROID__) +struct accesskit_android_adapter *accesskit_android_adapter_new(void); +#endif + +#if defined(__ANDROID__) +void accesskit_android_adapter_free(struct accesskit_android_adapter *adapter); +#endif + +#if defined(__ANDROID__) +/** + * You must call `accesskit_android_queued_events_raise` on the returned + * pointer. It can be null if the adapter is not active. + */ +struct accesskit_android_queued_events * +accesskit_android_adapter_update_if_active( + struct accesskit_android_adapter *adapter, + accesskit_tree_update_factory update_factory, + void *update_factory_userdata); +#endif + +#if defined(__ANDROID__) +jobject accesskit_android_adapter_create_accessibility_node_info( + struct accesskit_android_adapter *adapter, + accesskit_activation_handler_callback activation_handler, + void *activation_handler_userdata, JNIEnv *env, jobject host, + jint virtual_view_id); +#endif + +#if defined(__ANDROID__) +jobject accesskit_android_adapter_find_focus( + struct accesskit_android_adapter *adapter, + accesskit_activation_handler_callback activation_handler, + void *activation_handler_userdata, JNIEnv *env, jobject host, + jint focus_type); +#endif + +#if defined(__ANDROID__) +/** + * You must call `accesskit_android_queued_events_raise` on the returned + * pointer. It can be null if the adapter is not active. + */ +struct accesskit_android_queued_events * +accesskit_android_adapter_perform_action( + struct accesskit_android_adapter *adapter, + accesskit_action_handler_callback action_handler, + void *action_handler_userdata, jint virtual_view_id, + const struct accesskit_android_platform_action *action); +#endif + +#if defined(__ANDROID__) +/** + * You must call `accesskit_android_queued_events_raise` on the returned + * pointer. It can be null if the adapter is not active. + */ +struct accesskit_android_queued_events * +accesskit_android_adapter_on_hover_event( + struct accesskit_android_adapter *adapter, + accesskit_activation_handler_callback activation_handler, + void *activation_handler_userdata, jint action, jfloat x, jfloat y); +#endif + +#if defined(__ANDROID__) +struct accesskit_android_injecting_adapter * +accesskit_android_injecting_adapter_new( + JNIEnv *env, jobject host, + accesskit_activation_handler_callback activation_handler, + void *activation_handler_userdata, + accesskit_action_handler_callback action_handler, + void *action_handler_userdata); +#endif + +#if defined(__ANDROID__) +void accesskit_android_injecting_adapter_free( + struct accesskit_android_injecting_adapter *adapter); +#endif + +#if defined(__ANDROID__) +void accesskit_android_injecting_adapter_update_if_active( + struct accesskit_android_injecting_adapter *adapter, + accesskit_tree_update_factory update_factory, + void *update_factory_userdata); +#endif + #if defined(__APPLE__) /** * Memory is also freed when calling this function.