Skip to content

JBR-9994 Enable AccessibleAnnouncer for both X11 and Wayland #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tanya011 wants to merge 5 commits into from
Closed

JBR-9994 Enable AccessibleAnnouncer for both X11 and Wayland #587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6a35f9
JBR-9994 Enable AccessibleAnnouncer for both X11 and Wayland
tanya011 Feb 10, 2026
2e9c945
JBR-9994 Consolidate A11Y_SPEECHD_ANNOUNCING_CFLAGS setup for Linux X…
tanya011 Mar 7, 2026
8e40f33
JBR-9994 Use IBAWT_XAWT_EXTRA_SRC instead of LIBAWT_WLAWT_EXTRA_HEADE…
tanya011 Mar 7, 2026
3b7416a
JBR-9994 Append `-DNO_A11Y_SPEECHD_ANNOUNCING` unconditionally to avo…
tanya011 Mar 7, 2026
0f8b5f3
JBR-9995 Move AccessibleAnnouncer out of common/awt to common/accessi…
tanya011 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions make/modules/java.desktop/lib/Awt2dLibraries.gmk
View file
Open in desktop
Comment thread
OnePatchGuy marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -280,18 +280,6 @@ ifeq ($(call isTargetOs, windows macosx), false)
common/font \
#

ifeq ($(A11Y_SPEECHD_ANNOUNCING_ENABLED), true)
A11Y_SPEECHD_ANNOUNCING_CFLAGS :=
else
A11Y_SPEECHD_ANNOUNCING_CFLAGS := -DNO_A11Y_SPEECHD_ANNOUNCING
endif

ifeq ($(call isTargetOs, linux), true)
LIBAWT_XAWT_EXTRA_SRC += \
$(TOPDIR)/src/$(MODULE)/linux/native/libawt_xawt \
#
endif

LIBAWT_XAWT_EXCLUDES := medialib debug wl $(VULKAN_EXCLUDES)

LIBPIPEWIRE_HEADER_DIRS := \
Expand All @@ -303,6 +291,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
include \
common/awt/debug \
common/awt/systemscale \
common/awt/AccessibleAnnouncer \
Copy link
Copy Markdown
Member

@OnePatchGuy OnePatchGuy Mar 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should expose the headers from that directory because they're only supposed to be used by that directory itself. I'd say LIBAWT_XAWT_EXTRA_SRC should be used instead (if needed at all).

Copy link
Copy Markdown
Contributor Author

@tanya011 tanya011 Mar 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

8e40f33

common/font \
common/java2d/opengl \
common/java2d/x11
Expand All @@ -315,10 +304,19 @@ ifeq ($(call isTargetOs, windows macosx), false)
LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
$(FONTCONFIG_CFLAGS) \
$(CUPS_CFLAGS) \
$(SPEECHD_CFLAGS) \
$(A11Y_SPEECHD_ANNOUNCING_CFLAGS) \
#

# Setup speech-dispatcher a11y announcer for Linux xawt
ifeq ($(call isTargetOs, linux), true)
ifeq ($(A11Y_SPEECHD_ANNOUNCING_ENABLED), true)
A11Y_SPEECHD_ANNOUNCING_CFLAGS := $(SPEECHD_CFLAGS)
else
A11Y_SPEECHD_ANNOUNCING_CFLAGS := $(SPEECHD_CFLAGS) -DNO_A11Y_SPEECHD_ANNOUNCING
endif

LIBAWT_XAWT_CFLAGS += $(A11Y_SPEECHD_ANNOUNCING_CFLAGS)
Comment thread
OnePatchGuy marked this conversation as resolved.
Outdated
endif

ifeq ($(call isTargetOs, linux), true)
ifeq ($(DISABLE_XRENDER), true)
LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
Expand Down Expand Up @@ -408,6 +406,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
include \
common/awt/debug \
common/awt/systemscale \
common/awt/AccessibleAnnouncer \
Comment thread
OnePatchGuy marked this conversation as resolved.
Outdated
common/font \
common/java2d \
common/java2d/wl \
Expand All @@ -425,6 +424,17 @@ ifeq ($(call isTargetOs, windows macosx), false)
$(VULKAN_FLAGS) \
$(CUPS_CFLAGS)

# Setup speech-dispatcher a11y announcer for Linux wlawt
ifeq ($(call isTargetOs, linux), true)
ifeq ($(A11Y_SPEECHD_ANNOUNCING_ENABLED), true)
A11Y_SPEECHD_ANNOUNCING_CFLAGS_WLAWT := $(SPEECHD_CFLAGS)
else
A11Y_SPEECHD_ANNOUNCING_CFLAGS_WLAWT := $(SPEECHD_CFLAGS) -DNO_A11Y_SPEECHD_ANNOUNCING
endif

LIBAWT_WLAWT_CFLAGS += $(A11Y_SPEECHD_ANNOUNCING_CFLAGS_WLAWT)
endif

Comment thread
OnePatchGuy marked this conversation as resolved.
Outdated
LIBAWT_WLAWT_LIBS := $(LIBM) -lawt $(WAYLAND_LIBS) $(LIBDL) -ljava -ljvm -lrt

ifeq ($(call isTargetOs, linux), true)
Expand Down
0 ...AccessibleAnnouncer/AccessibleAnnouncer.c → ...AccessibleAnnouncer/AccessibleAnnouncer.c
View file
Open in desktop
File renamed without changes.
0 ...leAnnouncer/AccessibleAnnouncerJNIUtils.h → ...leAnnouncer/AccessibleAnnouncerJNIUtils.h
View file
Open in desktop
File renamed without changes.
0 ..._xawt/AccessibleAnnouncer/OrcaAnnouncer.c → ...n/awt/AccessibleAnnouncer/OrcaAnnouncer.c
View file
Open in desktop
File renamed without changes.
0 ..._xawt/AccessibleAnnouncer/OrcaAnnouncer.h → ...n/awt/AccessibleAnnouncer/OrcaAnnouncer.h
View file
Open in desktop
File renamed without changes.
0 ...xawt/AccessibleAnnouncer/libspeechd_dyn.c → .../awt/AccessibleAnnouncer/libspeechd_dyn.c
View file
Open in desktop
File renamed without changes.