Tk Source Code

Artifact [d81c24b5]
Login

Artifact d81c24b50ba7a529a3e3511041886dd52881742a3a5a53ed95d7734cf760676e:

Attachment "01.patch" to ticket [3b2c972f] added by anonymous 2026-10-03 17:32:36. (unpublished)
--- a/unix/tkUnixAccessibility.c
+++ b/unix/tkUnixAccessibility.c
@@ -304,6 +304,28 @@
 	    y >= comp_y && y < comp_y + comp_height);
 }
 
+/*
+ * "active-descendant-changed" is meant for containers that manage their own
+ * items (lists, trees, tables, menus). Emitted from an ordinary parent such as
+ * a frame on every focus change, it makes screen readers (Orca) present the
+ * focused widget a second time, right after the focus event itself.
+ */
+static gboolean ParentManagesDescendants(AtkObject *parent)
+{
+    switch (atk_object_get_role(parent)) {
+    case ATK_ROLE_LIST:
+    case ATK_ROLE_LIST_BOX:
+    case ATK_ROLE_TREE:
+    case ATK_ROLE_TREE_TABLE:
+    case ATK_ROLE_TABLE:
+    case ATK_ROLE_MENU:
+    case ATK_ROLE_MENU_BAR:
+	return TRUE;
+    default:
+	return FALSE;
+    }
+}
+
 /* Force accessible focus on a Tk widget. */
 static gboolean tk_grab_focus(AtkComponent *component)
 {
@@ -327,7 +349,9 @@
    AtkObject *parent = atk_object_get_parent(obj);
    if (parent) {
        /* Notify parent about active descendant */
-       g_signal_emit_by_name(parent, "active-descendant-changed", obj);
+       if (ParentManagesDescendants(parent)) {
+	   g_signal_emit_by_name(parent, "active-descendant-changed", obj);
+       }
 
        /* Also emit children-changed to ensure ATK hierarchy is refreshed. */
        g_signal_emit_by_name(parent, "children-changed::add",
@@ -1256,7 +1280,9 @@
 		Tk_Window parent = Tk_Parent(tkwin);
 		AtkObject *parentAc = GetAtkObjectForTkWindow(parent);
 		if (parentAc) {
-		    g_signal_emit_by_name(parentAc, "active-descendant-changed", acc);
+		    if (ParentManagesDescendants(parentAc)) {
+			g_signal_emit_by_name(parentAc, "active-descendant-changed", acc);
+		    }
 		}
 	    }
 	}
@@ -1364,7 +1390,9 @@
 		/* Notify parent about active descendant. */
 		AtkObject *childAcc = GetAtkObjectForTkWindow(current);
 		if (childAcc) {
-		    g_signal_emit_by_name(parentAcc, "active-descendant-changed", childAcc);
+		    if (ParentManagesDescendants(parentAcc)) {
+			g_signal_emit_by_name(parentAcc, "active-descendant-changed", childAcc);
+		    }
 		}
 
 		/* Also emit children-changed to refresh ATK's view. */
@@ -1669,7 +1697,9 @@
 	if (role != ATK_ROLE_WINDOW) {
 	    AtkObject *parent = atk_object_get_parent(obj);
 	    if (parent) {
-		g_signal_emit_by_name(parent, "active-descendant-changed", obj);
+		if (ParentManagesDescendants(parent)) {
+		    g_signal_emit_by_name(parent, "active-descendant-changed", obj);
+		}
 
 		/* Also emit children-changed to refresh ATK's view. */
 		g_signal_emit_by_name(parent, "children-changed::add",