Merge pull request dorianj#32 from dusek/accessibility

Fix accessibility

Author: Dorian Johnson

Source/PSMTabBarCell.m

@@ -740,8 +740,17 @@ - (id)accessibilityAttributeValue:(NSString *)attribute {
 		} else {
 			attributeValue = [self stringValue];
 		}
-	} else if([attribute isEqualToString: NSAccessibilityFocusedAttribute]) {
-		attributeValue = [NSNumber numberWithBool:([self tabState] == 2)];
+	} else if([attribute isEqualToString: NSAccessibilityValueAttribute]) {
+		attributeValue = [NSNumber numberWithBool:([self tabState] & PSMTab_SelectedMask)];
+    } else if ([attribute isEqualToString:NSAccessibilityPositionAttribute] || [attribute isEqualToString:NSAccessibilitySizeAttribute]) {
+        NSRect rect = [self frame];
+        rect = [[self controlView] convertRect:rect toView:nil];
+        rect = [[[self controlView] window] convertRectToScreen:rect];
+        if ([attribute isEqualToString:NSAccessibilityPositionAttribute])
+            attributeValue = [NSValue valueWithPoint:rect.origin];
+        else
+            attributeValue = [NSValue valueWithSize:rect.size];
+
 	} else {
 		attributeValue = [super accessibilityAttributeValue:attribute];
 	}

Source/PSMTabBarControl.m

@@ -222,6 +222,7 @@ - (void)initAddedProperties {
 	_overflowPopUpButton = [[PSMOverflowPopUpButton alloc] initWithFrame:overflowButtonRect pullsDown:YES];
 	[_overflowPopUpButton setAutoresizingMask:NSViewNotSizable | NSViewMinXMargin];
 	[_overflowPopUpButton setHidden:YES];
+    [[_overflowPopUpButton cell] accessibilitySetOverrideValue:NSLocalizedString(@"More tabs", nil) forAttribute:NSAccessibilityDescriptionAttribute];
 	[self addSubview:_overflowPopUpButton];
 	[self _positionOverflowMenu];
 
@@ -246,6 +247,7 @@ - (void)initAddedProperties {
 		[_addTabButton setButtonType:NSMomentaryChangeButton];
 		[_addTabButton setBordered:NO];
 		[_addTabButton setBezelStyle:NSShadowlessSquareBezelStyle];
+		[[_addTabButton cell] accessibilitySetOverrideValue:NSLocalizedString(@"Add Tab", nil) forAttribute:NSAccessibilityDescriptionAttribute];
 		[self addSubview:_addTabButton];
 
 		if(_showAddTabButton) {
@@ -1996,6 +1998,8 @@ - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)tabV
 			[self setNeedsDisplay:YES];
 		}
 	}
+    
+    NSAccessibilityPostNotification(self, NSAccessibilityValueChangedNotification);
 
 	if([[self delegate] respondsToSelector:@selector(tabView:didSelectTabViewItem:)]) {
 		[[self delegate] performSelector:@selector(tabView:didSelectTabViewItem:) withObject:aTabView withObject:tabViewItem];
@@ -2288,16 +2292,47 @@ -(BOOL)accessibilityIsIgnored {
 	return NO;
 }
 
+- (NSArray*)accessibilityAttributeNames
+{
+    static NSArray *attributes = nil;
+    if (!attributes) {
+        NSSet *set = [NSSet setWithArray:[super accessibilityAttributeNames]];
+        set = [set setByAddingObjectsFromArray:[NSArray arrayWithObjects:
+                                                NSAccessibilityTabsAttribute,
+                                                NSAccessibilityValueAttribute,
+                                                nil]];
+        attributes = [[set allObjects] retain];
+    }
+    return attributes;
+}
+
 - (id)accessibilityAttributeValue:(NSString *)attribute {
-	id attributeValue = nil;
-	if([attribute isEqualToString: NSAccessibilityRoleAttribute]) {
-		attributeValue = NSAccessibilityGroupRole;
-	} else if([attribute isEqualToString: NSAccessibilityChildrenAttribute]) {
-		attributeValue = NSAccessibilityUnignoredChildren(_cells);
-	} else {
-		attributeValue = [super accessibilityAttributeValue:attribute];
-	}
-	return attributeValue;
+    id attributeValue = nil;
+    if ([attribute isEqualToString: NSAccessibilityRoleAttribute]) {
+        attributeValue = NSAccessibilityTabGroupRole;
+    } else if ([attribute isEqualToString: NSAccessibilityChildrenAttribute]) {
+        NSMutableArray *children = [NSMutableArray arrayWithArray:[_cells objectsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfVisibleTabs])]]];
+        if(![_overflowPopUpButton isHidden])
+            [children addObject:_overflowPopUpButton];
+        if(![_addTabButton isHidden])
+            [children addObject:_addTabButton];
+        attributeValue = NSAccessibilityUnignoredChildren(children);
+    } else if ([attribute isEqualToString: NSAccessibilityTabsAttribute]) {
+        attributeValue = NSAccessibilityUnignoredChildren(_cells);
+    } else if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
+        NSTabViewItem *tabViewItem = [tabView selectedTabViewItem];
+        for (NSActionCell *cell in _cells) {
+            if ([cell representedObject] == tabViewItem)
+                attributeValue = cell;
+        }
+        if (!attributeValue)
+        {
+            NSLog(@"WARNING: seems no tab cell is currently selected");
+        }
+    } else {
+        attributeValue = [super accessibilityAttributeValue:attribute];
+    }
+    return attributeValue;
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {