flicks now take fingers arg in batch mode

Change-Id: I450a4bd557673072c2eab8ff86e5bd9519680e9b

diff --git a/src/Atspi.cpp b/src/Atspi.cpp
index e73b7c8..f8c2de4 100644 (file)
--- a/src/Atspi.cpp
+++ b/src/Atspi.cpp
@@ -777,7 +777,7 @@ Optional<Rectangle> Atspi::getScreenPosition(const AtspiComponentPtr &accessible
        if (!res)
                return {};
        Rectangle rectangle{ { res->x, res->y }, { res->width, res->height } };
-       g_object_unref(res);
+       g_free(res);
        return rectangle;
 }
 

diff --git a/src/UIElement.cpp b/src/UIElement.cpp
index 1fc1760..cd3da7b 100644 (file)
--- a/src/UIElement.cpp
+++ b/src/UIElement.cpp
@@ -81,6 +81,11 @@ void UIElement::getAttributeAsync(const std::string &key, std::function<void(std
        find(true);
 }
 
+void UIElement::setScanningCoordinates(Point p)
+{
+       scanningCoordinates = p;
+}
+
 Point UIElement::getScanningCoordinates() const
 {
        return scanningCoordinates;

diff --git a/src/UIElement.hpp b/src/UIElement.hpp
index 5cf2ca2..f34c82f 100644 (file)
--- a/src/UIElement.hpp
+++ b/src/UIElement.hpp
@@ -50,6 +50,7 @@ public:
 
        void printDebug();
 
+       void setScanningCoordinates(Point);
 private:
        void getAttributesAsync(std::function<void(bool)> callback);
 

diff --git a/src/batch/BatchRunner.cpp b/src/batch/BatchRunner.cpp
index 3b71d8f..c3f74f8 100644 (file)
--- a/src/batch/BatchRunner.cpp
+++ b/src/batch/BatchRunner.cpp
@@ -294,6 +294,20 @@ Atspi::StateSet BatchExecutor::getUIElementStates(const std::shared_ptr<UIElemen
        });
 }
 
+Rectangle BatchExecutor::getUIElementPosition(const std::shared_ptr<UIElement> &uiElem)
+{
+       return executeOnMainThread([&]() {
+               auto atspi = Singleton<UniversalSwitch>::instance().getAtspi();
+               auto component = atspi->getComponentInterface(uiElem->getObject());
+               if (component) {
+                       auto found = atspi->getScreenPosition(component);
+                       if (found)
+                               return std::move(*found);
+               }
+               throw EvaluationFailure{} << "failed to get at-spi object's position (use dlogutil to get at-spi error message)";
+       });
+}
+
 std::string BatchExecutor::getUIElementName(const std::shared_ptr<UIElement> &uiElem)
 {
        return executeOnMainThread([&]() {
@@ -898,6 +912,7 @@ void BatchExecutor::insertMethods()
                                        target = this->convertToUIElement(target.convertToString());
                                }
                                auto dest = target.convertToUIElement();
+                               auto coord = getUIElementPosition(dest).getCenterPoint();
                                auto fingerCount = fingers.convertToInteger();
                                if (fingerCount <= 0 || fingerCount > 3)
                                        throw EvaluationFailure{} << "invalid finger count (must be between 1 and 3)";
@@ -906,7 +921,6 @@ void BatchExecutor::insertMethods()
                                for (auto i = 0u; i < tapCount; ++i)
                                {
                                        executeOnMainThread([&]() {
-                                               auto coord = dest->getScanningCoordinates();
                                                auto res = utils::generateTapGesture(coord.x, coord.y, 0.0f, fingerCount);
                                                if (!res)
                                                        throw EvaluationFailure{} << "failed to execute " << tapCount << " tap gesture, " << res.getError().message;
@@ -922,23 +936,27 @@ void BatchExecutor::insertMethods()
        variables["TRIPLE_TAP"] = generateTapFunction(3);
 
        auto generateFlickFunction = [&](int x0, int y0, int x1, int y1) {
-               return EvaluationValueFunction{ [ &, x0, y0, x1, y1]() -> EvaluationValue {
+               return EvaluationValueFunction{ [ &, x0, y0, x1, y1](EvaluationValue fingers) -> EvaluationValue {
                                auto root = getVisibleRoot();
                                if (!root) throw EvaluationFailure{} << "no visible root (context changed didn't happen)";
                                ASSERT(root->getObject());
 
+                               auto fingerCount = fingers.convertToInteger();
+                               if (fingerCount <= 0 || fingerCount > 3)
+                                       throw EvaluationFailure{} << "invalid finger count (must be between 1 and 3)";
+
                                executeOnMainThread([&]()
                                {
-                                       utils::generateDragGesture(x0, y0, x1, y1, 10, 0.0);
+                                       utils::generateDragGesture(x0, y0, x1, y1, 10, 0.0, fingerCount);
                                });
-                               std::this_thread::sleep_for(std::chrono::milliseconds{ 150 });
+                               std::this_thread::sleep_for(std::chrono::milliseconds{ 1000 });
                                return EvaluationValue{};
-                       }, { } };
+                       }, { { "fingers", 1 } } };
        };
        variables["FLICK_RIGHT"] = generateFlickFunction(200, 200, 400, 200);
        variables["FLICK_LEFT"] = generateFlickFunction(400, 200, 200, 200);
-       variables["FLICK_UP"] = generateFlickFunction(300, 400, 300, 200);
-       variables["FLICK_DOWN"] = generateFlickFunction(300, 200, 300, 400);
+       variables["FLICK_UP"] = generateFlickFunction(300, 600, 300, 200);
+       variables["FLICK_DOWN"] = generateFlickFunction(300, 200, 300, 600);
 }
 
 class PredicateWaitInterface : public EvaluationValueWaitInterface

diff --git a/src/batch/BatchRunner.hpp b/src/batch/BatchRunner.hpp
index 6d18fc4..43108a9 100644 (file)
--- a/src/batch/BatchRunner.hpp
+++ b/src/batch/BatchRunner.hpp
@@ -93,6 +93,7 @@ public:
        std::shared_ptr<UIElement> getVisibleRoot() override;
        std::shared_ptr<UIElement> convertToUIElement(Point pt) override;
        std::string getUIElementName(const std::shared_ptr<UIElement> &uiElem) override;
+       Rectangle getUIElementPosition(const std::shared_ptr<UIElement> &uiElem) override;
        Atspi::StateSet getUIElementStates(const std::shared_ptr<UIElement> &o) override;
        unsigned int getUIElementRole(const std::shared_ptr<UIElement> &o) override;
        std::unordered_map<std::string, std::string> getUIElementAttributes(const std::shared_ptr<UIElement> &o) override;

diff --git a/src/batch/EvaluationContext.cpp b/src/batch/EvaluationContext.cpp
index 5e2c75b..735c0c1 100644 (file)
--- a/src/batch/EvaluationContext.cpp
+++ b/src/batch/EvaluationContext.cpp
@@ -106,6 +106,11 @@ std::unordered_map<std::string, std::string> ExecutorInterface::getUIElementAttr
        throw EvaluationFailure{} << "getUIElementAttributes not implemeneted";
 }
 
+Rectangle ExecutorInterface::getUIElementPosition(const std::shared_ptr<UIElement> &uiElem)
+{
+       throw EvaluationFailure{} << "getUIElementPosition not implemeneted";
+}
+
 std::string ExecutorInterface::getUIElementName(const std::shared_ptr<UIElement> &elem)
 {
        throw EvaluationFailure{} << "getUIElementName not implemeneted";

diff --git a/src/batch/EvaluationContext.hpp b/src/batch/EvaluationContext.hpp
index 4d007d8..714abcb 100644 (file)
--- a/src/batch/EvaluationContext.hpp
+++ b/src/batch/EvaluationContext.hpp
@@ -77,6 +77,7 @@ struct ExecutorInterface {
         */
        virtual std::string getUIElementName(const std::shared_ptr<UIElement> &);
 
+       virtual Rectangle getUIElementPosition(const std::shared_ptr<UIElement> &uiElem);
        virtual Atspi::StateSet getUIElementStates(const std::shared_ptr<UIElement> &);
        virtual unsigned int getUIElementRole(const std::shared_ptr<UIElement> &);
        virtual std::unordered_map<std::string, std::string> getUIElementAttributes(const std::shared_ptr<UIElement> &);

diff --git a/src/batch/EvaluationValueUIElement.cpp b/src/batch/EvaluationValueUIElement.cpp
index e4b69c8..88aa286 100644 (file)
--- a/src/batch/EvaluationValueUIElement.cpp
+++ b/src/batch/EvaluationValueUIElement.cpp
@@ -72,8 +72,10 @@ public:
        {
                if (name == "name")
                        return create(EvaluationContext::getCurrentEvaluationContext().executionInterface().getUIElementName(value));
-               if (name == "center")
-                       return create(value->getScanningCoordinates());
+               if (name == "center") {
+                       auto v = EvaluationContext::getCurrentEvaluationContext().executionInterface().getUIElementPosition(value);
+                       return create(v.getCenterPoint());
+               }
                if (name == "role")
                        return create(EvaluationContext::getCurrentEvaluationContext().executionInterface().getUIElementRole(value));
                if (name == "states") {