From 2a605916eabc314a1effd067635221ebd1e6dbaf Mon Sep 17 00:00:00 2001 From: ANZ1217 Date: Tue, 25 Apr 2023 16:56:51 +0900 Subject: [PATCH] Aurum: Change not to delete XML information when window is minimized Change-Id: I088ad699fbe694405875cffc1efd2c381f9affb6 --- libaurum/inc/Accessibility/AccessibleWatcher.h | 8 ------- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 6 ----- .../inc/Impl/Accessibility/MockAccessibleWatcher.h | 2 -- .../Impl/Accessibility/AtspiAccessibleWatcher.cc | 27 +++------------------- .../Impl/Accessibility/MockAccessibleWatcher.cc | 4 ---- 5 files changed, 3 insertions(+), 44 deletions(-) diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index 533b857..dd026a4 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -114,14 +114,6 @@ public: virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout, const std::string packageName, std::shared_ptr obj, const int count) = 0; /** - * @brief Gets active application map. - * - * @return map (pure Atspi Node ptr(@AtspiAccessible), @AccessibleApplication) - * @since_tizen 6.5 - */ - virtual std::map> getActiveAppMap(void) = 0; - - /** * @brief Gets XML Document map. * * @return map (package std::string, @AurumXML) diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 802bc28..cefbf64 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -123,11 +123,6 @@ public: virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout, const std::string packageName, std::shared_ptr obj, const int count) override; /** - * @copydoc @AccessibleWatcher::getActiveAppMap() - */ - virtual std::map> getActiveAppMap(void) override; - - /** * @copydoc @AccessibleWatcher::getXMLDocMap() */ virtual std::map> getXMLDocMap(void) override; @@ -184,7 +179,6 @@ private: std::list mActivatedWindowList; std::list mActivatedApplicationList; std::set mWindowSet; - std::map> mActiveAppMap; std::map> mXMLDocMap; static GThread *mEventThread; static std::vector> mEventQueue; diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index 6de46f8..cbfa21e 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -75,8 +75,6 @@ public: virtual bool registerCallback(const A11yEvent type, EventHandler cb, void *data) override; - std::map> getActiveAppMap(void); - std::map> getXMLDocMap(void); std::shared_ptr getXMLDoc(std::string pkgName); diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index a8c42d4..9774412 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -195,15 +195,6 @@ AtspiAccessibleWatcher::~AtspiAccessibleWatcher() void AtspiAccessibleWatcher::appendApp(AtspiAccessibleWatcher *instance, AtspiAccessible *app, char *pkg) { LOGI("window activated in app(%s)", pkg); - if (!instance->mActiveAppMap.count(app)) { - LOGI("add activated window's app in map"); - instance->mActiveAppMap.insert(std::pair>(app, - std::make_shared(std::make_shared(app)))); - } - else { - LOGI("app(%s) is already in map", pkg); - } - if (mXMLSync) { std::string package(pkg); @@ -223,14 +214,6 @@ void AtspiAccessibleWatcher::appendApp(AtspiAccessibleWatcher *instance, AtspiAc void AtspiAccessibleWatcher::removeApp(AtspiAccessibleWatcher *instance, AtspiAccessible *app, char *pkg) { LOGI("window deactivate in app(%s)", pkg); - if (instance->mActiveAppMap.count(app)) { - LOGI("window deactivated delete app(%s) in map", pkg); - instance->mActiveAppMap.erase(app); - } - else { - LOGE("deactivated window's app(%s) is not in map", pkg); - } - if (mXMLSync) { if (instance->mXMLDocMap.count(std::string(pkg))) { @@ -302,8 +285,9 @@ void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *watcher) if (name && app) { pkg = AtspiWrapper::Atspi_accessible_get_name(app, NULL); - if (!strncmp(event->type, "window:activate", 15)) instance->appendApp(instance, app, pkg); - else if (!strncmp(event->type, "window:deactivate", 16)) instance->removeApp(instance, app, pkg); + if (!strncmp(event->type, "window:create", 13)) instance->appendApp(instance, app, pkg); + else if (!strncmp(event->type, "window:activate", 15) && instance->mXMLDocMap.count(pkg) == 0) instance->appendApp(instance, app, pkg); + else if (!strncmp(event->type, "window:destroy", 14)) instance->removeApp(instance, app, pkg); // To support focus skipped window if (instance->isTv) { @@ -458,11 +442,6 @@ bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const return false; } -std::map> AtspiAccessibleWatcher::getActiveAppMap(void) -{ - return mActiveAppMap; -} - std::map> AtspiAccessibleWatcher::getXMLDocMap(void) { LOGI("XMLsync: %s", (mXMLSync ? "TRUE" : "FALSE")); diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc index d5b1ec0..d08c76e 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc @@ -50,10 +50,6 @@ void MockAccessibleWatcher::addApplication(std::shared_ptr> MockAccessibleWatcher::getActiveAppMap(void) -{ - return mActiveAppMap; -} std::map> MockAccessibleWatcher::getXMLDocMap(void) { -- 2.7.4