[dali_2.3.42] Merge branch 'devel/master'

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / accessibility.h

diff --git a/dali/devel-api/adaptor-framework/accessibility.h b/dali/devel-api/adaptor-framework/accessibility.h
index 77c7257..87ffe24 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility.h
+++ b/dali/devel-api/adaptor-framework/accessibility.h
@@ -1,7 +1,7 @@
 #ifndef DALI_ATSPI_ACCESSIBILITY_H\r
 #define DALI_ATSPI_ACCESSIBILITY_H\r
 /*\r
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -18,12 +18,14 @@
  */\r
 \r
 // EXTERNAL INCLUDES\r
+#include <cstdint>\r
 #include <string>\r
 #include <unordered_map>\r
 #include <vector>\r
 \r
 // INTERNAL INCLUDES\r
 #include <dali/devel-api/adaptor-framework/accessibility-bitset.h>\r
+#include <dali/public-api/actors/actor.h>\r
 #include <dali/public-api/dali-adaptor-common.h>\r
 \r
 namespace Dali\r
@@ -341,6 +343,17 @@ enum class WindowEvent
   SHADE,\r
   UU_SHADE,\r
   RESTYLE,\r
+  POST_RENDER,\r
+};\r
+\r
+/**\r
+ * @brief Restored window state\r
+ * @see Accessibility::Accessible::Emit\r
+ */\r
+enum class WindowRestoreType\r
+{\r
+  RESTORE_FROM_ICONIFY, // The Window is Deiconified.\r
+  RESTORE_FROM_MAXIMIZE // The Window is Unmaximized.\r
 };\r
 \r
 /**\r
@@ -496,14 +509,26 @@ enum class AtspiEvent
   ATTRIBUTES_CHANGED,\r
   MOVED_OUT,\r
   WINDOW_CHANGED,\r
+  SCROLL_STARTED,\r
+  SCROLL_FINISHED,\r
+  MAX_COUNT\r
+};\r
+\r
+enum class ActionType\r
+{\r
+  ACTIVATE,\r
+  ESCAPE,\r
+  INCREMENT,\r
+  DECREMENT,\r
+  SCROLL_TO_CHILD,\r
   MAX_COUNT\r
 };\r
 \r
-using AtspiInterfaces   = EnumBitSet<AtspiInterface, AtspiInterface::MAX_COUNT>;\r
-using AtspiEvents       = EnumBitSet<AtspiEvent, AtspiEvent::MAX_COUNT>;\r
-using ReadingInfoTypes  = EnumBitSet<ReadingInfoType, ReadingInfoType::MAX_COUNT>;\r
-using States            = EnumBitSet<State, State::MAX_COUNT>;\r
-using Attributes        = std::unordered_map<std::string, std::string>;\r
+using AtspiInterfaces  = EnumBitSet<AtspiInterface, AtspiInterface::MAX_COUNT>;\r
+using AtspiEvents      = EnumBitSet<AtspiEvent, AtspiEvent::MAX_COUNT>;\r
+using ReadingInfoTypes = EnumBitSet<ReadingInfoType, ReadingInfoType::MAX_COUNT>;\r
+using States           = EnumBitSet<State, State::MAX_COUNT>;\r
+using Attributes       = std::unordered_map<std::string, std::string>;\r
 \r
 namespace Internal\r
 {\r
@@ -580,26 +605,6 @@ private:
 };\r
 \r
 /**\r
- * @brief Enumeration describing type of key event\r
- * @see Adaptor::AccessibilityObserver::OnAccessibleKeyEvent\r
- */\r
-enum class KeyEventType\r
-{\r
-  KEY_PRESSED,\r
-  KEY_RELEASED,\r
-};\r
-\r
-/**\r
- * @brief Enumeration with human readable values describing state of event\r
- * @see Dali::Accessibility::Bridge::Emit\r
- */\r
-enum class Consumed\r
-{\r
-  NO,\r
-  YES\r
-};\r
-\r
-/**\r
  * @brief Helper class representing two dimensional point with integer coordinates\r
  */\r
 struct DALI_ADAPTOR_API Point\r
@@ -674,7 +679,7 @@ struct DALI_ADAPTOR_API Range
   Range(size_t start, size_t end, std::string content)\r
   : startOffset(start),\r
     endOffset(end),\r
-    content(content)\r
+    content(std::move(content))\r
   {\r
   }\r
 };\r
@@ -735,6 +740,19 @@ struct DALI_ADAPTOR_API Relation
   std::vector<Accessible*> mTargets;\r
 };\r
 \r
+struct DALI_ADAPTOR_API ActionInfo\r
+{\r
+  ActionInfo() = default;\r
+  ActionInfo(ActionType type, Actor target)\r
+  : type{type},\r
+    target{target}\r
+  {\r
+  }\r
+\r
+  ActionType type{ActionType::MAX_COUNT};\r
+  Actor      target{};\r
+};\r
+\r
 } // namespace Accessibility\r
 } // namespace Dali\r
 \r