Merge branch 'master' into NSLayoutConstraint_branch

ChangeLog

@@ -1,3 +1,17 @@
+2020-06-15 Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/AppKit.h
+	* Headers/AppKit/NSAccessibilityCustomAction.h
+	* Headers/AppKit/NSAccessibilityCustomRotor.h
+	* Headers/AppKit/NSAccessibilityElement.h
+	* Headers/AppKit/NSAccessibilityProtocols.h
+	* Source/GNUmakefile
+	* Source/NSAccessibilityCustomAction.m
+	* Source/NSAccessibilityCustomRotor.m
+	* Source/NSAccessibilityElement.m: Add skeletons for
+        these classes. Future support of accessibility features
+        will fill these in.
+
 2020-06-12  Yavor Doganov  <yavor@gnu.org>
 
 	* Headers/AppKit/NSApplication.h: Remove semicolons from the

Headers/AppKit/AppKit.h

@@ -47,6 +47,9 @@
 
 #import <AppKit/NSAccessibility.h>
 #import <AppKit/NSAccessibilityConstants.h>
+#import <AppKit/NSAccessibilityCustomAction.h>
+#import <AppKit/NSAccessibilityCustomRotor.h>
+#import <AppKit/NSAccessibilityElement.h>
 #import <AppKit/NSAccessibilityProtocols.h>
 #import <AppKit/NSActionCell.h>
 #import <AppKit/NSAnimationContext.h>

Headers/AppKit/NSAccessibilityCustomAction.h

@@ -0,0 +1,68 @@
+/* Interface of class NSAccessibilityCustomAction
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Mon 15 Jun 2020 03:18:47 AM EDT
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#ifndef _NSAccessibilityCustomAction_h_GNUSTEP_GUI_INCLUDE
+#define _NSAccessibilityCustomAction_h_GNUSTEP_GUI_INCLUDE
+
+#import <Foundation/NSObject.h>
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST)
+
+#if	defined(__cplusplus)
+extern "C" {
+#endif
+
+DEFINE_BLOCK_TYPE(GSCustomActionHandler, void, BOOL);
+  
+@interface NSAccessibilityCustomAction : NSObject
+
+- (instancetype)initWithName: (NSString *)name
+                     handler: (GSCustomActionHandler)handler;
+
+- (instancetype)initWithName: (NSString *)name
+                      target: (id)target
+                    selector: (SEL)selector;
+
+- (NSString *) name;
+- (void) setName: (NSString *)name;
+  
+- (GSCustomActionHandler) handler;
+- (void) setHandler: (GSCustomActionHandler)handler;
+
+- (id) target;
+- (void) setTarget: (id)target;
+
+- (SEL) selector;
+- (void) setSelector: (SEL)selector;
+  
+@end
+
+#if	defined(__cplusplus)
+}
+#endif
+
+#endif	/* GS_API_MACOSX */
+
+#endif	/* _NSAccessibilityCustomAction_h_GNUSTEP_GUI_INCLUDE */
+

Headers/AppKit/NSAccessibilityCustomRotor.h

@@ -0,0 +1,141 @@
+/* Interface of class NSAccessibilityCustomRotor
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Mon 15 Jun 2020 03:18:59 AM EDT
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#ifndef _NSAccessibilityCustomRotor_h_GNUSTEP_GUI_INCLUDE
+#define _NSAccessibilityCustomRotor_h_GNUSTEP_GUI_INCLUDE
+
+#import <Foundation/NSObject.h>
+#import <Foundation/NSRange.h>
+#import <Foundation/NSGeometry.h>
+
+#import <AppKit/NSAccessibilityProtocols.h>
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST)
+
+#if	defined(__cplusplus)
+extern "C" {
+#endif
+
+@protocol NSAccessibilityCustomRotorItemSearchDelegate;
+@protocol NSAccessibilityCustomRotorItemLoadDelegate;
+
+@class NSAccessibilityCustomRotor;
+@class NSAccessibilityCustomRotorItemResult;
+@class NSAccessibilityCustomRotorSearchParameters;
+@class NSString;
+@class NSAccessibilityElement;
+  
+enum
+  {
+   NSAccessibilityCustomRotorSearchDirectionPrevious,
+   NSAccessibilityCustomRotorSearchDirectionNext,
+};
+typedef NSInteger NSAccessibilityCustomRotorSearchDirection;
+  
+enum
+  {
+   NSAccessibilityCustomRotorTypeCustom = 0,
+   NSAccessibilityCustomRotorTypeAny = 1,
+   NSAccessibilityCustomRotorTypeAnnotation,
+   NSAccessibilityCustomRotorTypeBoldText,
+   NSAccessibilityCustomRotorTypeHeading,
+   NSAccessibilityCustomRotorTypeHeadingLevel1,
+   NSAccessibilityCustomRotorTypeHeadingLevel2,
+   NSAccessibilityCustomRotorTypeHeadingLevel3,
+   NSAccessibilityCustomRotorTypeHeadingLevel4,
+   NSAccessibilityCustomRotorTypeHeadingLevel5,
+   NSAccessibilityCustomRotorTypeHeadingLevel6,
+   NSAccessibilityCustomRotorTypeImage,
+   NSAccessibilityCustomRotorTypeItalicText,
+   NSAccessibilityCustomRotorTypeLandmark,
+   NSAccessibilityCustomRotorTypeLink,
+   NSAccessibilityCustomRotorTypeList,
+   NSAccessibilityCustomRotorTypeMisspelledWord,
+   NSAccessibilityCustomRotorTypeTable,
+   NSAccessibilityCustomRotorTypeTextField,
+   NSAccessibilityCustomRotorTypeUnderlinedText,
+   NSAccessibilityCustomRotorTypeVisitedLink,
+}; 
+typedef NSInteger NSAccessibilityCustomRotorType;
+
+// Rotor...
+@interface NSAccessibilityCustomRotor : NSObject
+  
+- (instancetype) initWithLabel: (NSString *)label
+                   itemSearchDelegate: (id<NSAccessibilityCustomRotorItemSearchDelegate>)delegate;
+
+- (instancetype) initWithRotorType: (NSAccessibilityCustomRotorType)rotorType
+                   itemSearchDelegate: (id<NSAccessibilityCustomRotorItemSearchDelegate>)delegate;
+
+- (NSAccessibilityCustomRotorType) type;
+- (void) setType: (NSAccessibilityCustomRotorType)type;
+
+- (NSString *) label;
+- (void) setLabel: (NSString *)label;
+
+- (id<NSAccessibilityCustomRotorItemSearchDelegate>) itemSearchDelegate;
+- (void) setItemSearchDelegate: (id<NSAccessibilityCustomRotorItemSearchDelegate>) delegate;
+
+- (id<NSAccessibilityElementLoading>) itemLoadingDelegate;
+- (void) setItemLoadingDelegate: (id<NSAccessibilityElementLoading>) delegate;
+  
+@end
+
+// Results...
+@interface NSAccessibilityCustomRotorItemResult : NSObject
+
+- (instancetype)initWithTargetElement:(id<NSAccessibilityElement>)targetElement;
+
+- (instancetype)initWithItemLoadingToken: (id<NSAccessibilityLoadingToken>)token
+                             customLabel: (NSString *)customLabel;
+
+- (id<NSAccessibilityElement>) targetElement;
+  
+- (id<NSAccessibilityLoadingToken>) itemLoadingToken;
+
+- (NSRange) targetRange;
+
+- (NSString *) customLabel;
+
+@end
+
+
+// Protocol...
+@protocol NSAccessibilityCustomRotorItemSearchDelegate <NSObject>
+
+@required
+- (NSAccessibilityCustomRotorItemResult *) rotor: (NSAccessibilityCustomRotor *)rotor
+                       resultForSearchParameters: (NSAccessibilityCustomRotorSearchParameters *)parameters;
+
+@end
+
+
+#if	defined(__cplusplus)
+}
+#endif
+
+#endif	/* GS_API_MACOSX */
+
+#endif	/* _NSAccessibilityCustomRotor_h_GNUSTEP_GUI_INCLUDE */
+

Headers/AppKit/NSAccessibilityElement.h

@@ -0,0 +1,47 @@
+/* Interface of class NSAccessibilityCustomElement
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Mon 15 Jun 2020 03:19:09 AM EDT
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#ifndef _NSAccessibilityElement_h_GNUSTEP_GUI_INCLUDE
+#define _NSAccessibilityElement_h_GNUSTEP_GUI_INCLUDE
+
+#import <Foundation/NSObject.h>
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST)
+
+#if	defined(__cplusplus)
+extern "C" {
+#endif
+
+@interface NSAccessibilityElement : NSObject
+
+@end
+
+#if	defined(__cplusplus)
+}
+#endif
+
+#endif	/* GS_API_MACOSX */
+
+#endif	/* _NSAccessibilityElement_h_GNUSTEP_GUI_INCLUDE */
+

Headers/AppKit/NSAccessibilityProtocols.h

@@ -51,6 +51,65 @@ extern "C" {
 - (NSString *) accessibilityValue;
 @end
 
+@protocol NSAccessibilityLoadingToken
+@end
+
+@protocol NSAccessibilityGroup <NSAccessibilityElement>
+@end
+
+@protocol NSAccessibilityRadioButton <NSAccessibilityButton>
+@end
+
+@protocol NSAccessibilityCheckBox <NSAccessibilityButton>
+@end
+
+@protocol NSAccessibilityStaticText <NSAccessibilityElement>
+@end
+
+@protocol NSAccessibilityNavigableStaticText <NSAccessibilityStaticText>
+@end
+
+@protocol NSAccessibilityProgressIndicator <NSAccessibilityGroup>
+@end
+
+@protocol NSAccessibilityStepper <NSAccessibilityElement>
+@end
+
+@protocol NSAccessibilitySlider <NSAccessibilityElement>
+@end
+
+@protocol NSAccessibilityImage <NSAccessibilityElement>
+@end
+
+@protocol NSAccessibilityContainsTransientUI <NSAccessibilityElement>
+@end
+
+@protocol NSAccessibilityRow;
+
+@protocol NSAccessibilityTable <NSAccessibilityGroup>
+@end
+
+@protocol NSAccessibilityOutline <NSAccessibilityTable>
+@end
+
+@protocol NSAccessibilityList <NSAccessibilityTable>
+@end
+
+@protocol NSAccessibilityRow <NSAccessibilityGroup>
+@end
+
+@protocol NSAccessibilityLayoutArea <NSAccessibilityGroup>
+@end
+
+@protocol NSAccessibilityLayoutItem <NSAccessibilityGroup>
+@end
+
+@protocol NSAccessibilityElementLoading <NSObject>
+@end
+
+@protocol NSAccessibility <NSObject>
+@end
+
 #if	defined(__cplusplus)
 }
 #endif

MISSING

@@ -1,9 +1,6 @@
 MISSING HEADERS
 ---
 > NSATSTypesetter.h
-> NSAccessibilityCustomAction.h
-> NSAccessibilityCustomRotor.h
-> NSAccessibilityElement.h
 > NSCollectionViewCompositionalLayout.h
 > NSCollectionViewFlowLayout.h
 > NSCollectionViewGridLayout.h

Source/GNUmakefile

@@ -45,6 +45,9 @@ libgnustep-gui_C_FILES =
 # The Objective-C source files to be compiled
 libgnustep-gui_OBJC_FILES = Functions.m \
 NSAccessibility.m \
+NSAccessibilityCustomAction.m \
+NSAccessibilityCustomRotor.m \
+NSAccessibilityElement.m \
 NSActionCell.m \
 NSAffineTransform.m \
 NSAlert.m \
@@ -360,6 +363,9 @@ AppKitErrors.h \
 AppKitExceptions.h \
 NSAccessibility.h \
 NSAccessibilityConstants.h \
+NSAccessibilityCustomAction.h \
+NSAccessibilityCustomRotor.h \
+NSAccessibilityElement.h \
 NSAccessibilityProtocols.h \
 NSActionCell.h \
 NSAffineTransform.h \

Source/NSAccessibilityCustomAction.m

@@ -0,0 +1,79 @@
+/* Implementation of class NSAccessibilityCustomAction
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Mon 15 Jun 2020 03:18:47 AM EDT
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#import "AppKit/NSAccessibilityCustomAction.h"
+
+@implementation NSAccessibilityCustomAction
+
+- (instancetype)initWithName: (NSString *)name
+                     handler: (GSCustomActionHandler)handler
+{
+  return nil;
+}
+
+- (instancetype)initWithName: (NSString *)name
+                      target: (id)target
+                    selector: (SEL)selector
+{
+  return nil;
+}
+
+- (NSString *) name
+{
+  return nil;
+}
+
+- (void) setName: (NSString *)name
+{
+}
+  
+- (GSCustomActionHandler) handler
+{
+  return nil;
+}
+
+- (void) setHandler: (GSCustomActionHandler)handler
+{
+}
+
+- (id) target
+{
+  return nil;
+}
+
+- (void) setTarget: (id)target
+{
+}
+
+- (SEL) selector
+{
+  return NULL;
+}
+
+- (void) setSelector: (SEL)selector
+{
+}
+
+@end
+

Source/NSAccessibilityCustomRotor.m

@@ -0,0 +1,114 @@
+/* Implementation of class NSAccessibilityCustomRotor
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Mon 15 Jun 2020 03:18:59 AM EDT
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#import "AppKit/NSAccessibilityCustomRotor.h"
+
+@implementation NSAccessibilityCustomRotor
+  
+- (instancetype) initWithLabel: (NSString *)label
+            itemSearchDelegate: (id<NSAccessibilityCustomRotorItemSearchDelegate>)delegate
+{
+  return nil;
+}
+
+- (instancetype) initWithRotorType: (NSAccessibilityCustomRotorType)rotorType
+                itemSearchDelegate: (id<NSAccessibilityCustomRotorItemSearchDelegate>)delegate
+{
+  return nil;
+}
+
+- (NSAccessibilityCustomRotorType) type
+{
+  return 0;
+}
+
+- (void) setType: (NSAccessibilityCustomRotorType)type
+{
+}
+
+- (NSString *) label
+{
+  return nil;
+}
+
+- (void) setLabel: (NSString *)label
+{
+}
+
+- (id<NSAccessibilityCustomRotorItemSearchDelegate>) itemSearchDelegate
+{
+  return nil;
+}
+
+- (void) setItemSearchDelegate: (id<NSAccessibilityCustomRotorItemSearchDelegate>) delegate
+{
+}
+
+- (id<NSAccessibilityElementLoading>) itemLoadingDelegate
+{
+  return nil;
+}
+
+- (void) setItemLoadingDelegate: (id<NSAccessibilityElementLoading>) delegate
+{
+}
+  
+@end
+
+// Results...
+@implementation NSAccessibilityCustomRotorItemResult : NSObject
+
+- (instancetype)initWithTargetElement:(id<NSAccessibilityElement>)targetElement
+{
+  return nil;
+}
+
+- (instancetype)initWithItemLoadingToken: (id<NSAccessibilityLoadingToken>)token
+                             customLabel: (NSString *)customLabel
+{
+  return nil;
+}
+
+- (id<NSAccessibilityElement>) targetElement;
+{
+  return nil;
+}
+
+- (id<NSAccessibilityLoadingToken>) itemLoadingToken
+{
+  return nil;
+}
+
+- (NSRange) targetRange
+{
+  return NSMakeRange(0,NSNotFound);
+}
+
+- (NSString *) customLabel
+{
+  return nil;
+}
+
+@end
+

Source/NSAccessibilityElement.m

@@ -0,0 +1,30 @@
+/* Implementation of class NSAccessibilityCustomElement
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Mon 15 Jun 2020 03:19:09 AM EDT
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#import "AppKit/NSAccessibilityElement.h"
+
+@implementation NSAccessibilityElement
+
+@end
+