1. Delete useless class such as capi, AccessibleUtils.
2. Delete commented out codes.
3. Delete useless build configure.
4. Delete uesless methods.
5. Delete useless event types.
6. Code indentations.
Change-Id: I5bd1495ebfd41990b52f5c9ecc4a630ed43a057f
+++ /dev/null
-#pragma once
-
-
-typedef enum _KeyRequestType {
- STROKE,
- LONG_STROKE,
- PRESS,
- RELEASE,
-} KeyRequestType;
-
-typedef enum _TimeRequestType {
- WALLCLOCK,
- MONOTONIC,
-} TimeRequestType;
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_click(const int x, const int y);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_interval_click(const int x, const int y, const unsigned int intv);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_drag(const int sx, const int sy, const int ex, const int ey,
- const int steps, const int durationMs);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_touchDown(const int x, const int y);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_touchMove(const int x, const int y, const int seq);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_touchUp(const int x, const int y, const int seq);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_wheelUp(int amount, const int durationMs);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_wheelDown(int amount, const int durationMs);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressBack(KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressHome(KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressMenu(KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressVolUp(KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressVolDown(KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressPower(KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_pressKeyCode(char* keycode, KeyRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_takeScreenshot(char* path, float scale, int quality);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-long long aurum_uidevice_getSystemTime(TimeRequestType type);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-int aurum_uidevice_hasObject(const std::shared_ptr<UiSelector> selector);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-std::shared_ptr<UiObject> aurum_uidevice_findObject(
- const std::shared_ptr<UiSelector> selector) const;
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-std::vector<std::shared_ptr<UiObject>> aurum_uidevice_findObjects(
- const std::shared_ptr<UiSelector> selector) const;
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-/*
-bool aurum_uidevice_waitFor(
- const std::function<bool(const ISearchable *)> condition) const;
-*/
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-std::shared_ptr<UiObject> aurum_uidevice_waitFor(
- const std::function<std::shared_ptr<UiObject>(const ISearchable *)>
- condition) const;
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-std::shared_ptr<UiDevice> aurum_uidevice_getInstance(IDevice *deviceImpl = nullptr);
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-std::vector<std::shared_ptr<AccessibleNode>> aurum_uidevice_getWindowRoot() const;
+++ /dev/null
-#include "capi_uidevice.h"
\ No newline at end of file
#pragma once
#include "AccessibleNode.h"
-#include "AccessibleUtils.h"
#include "AccessibleWatcher.h"
#include "AccessibleApplication.h"
#include "AccessibleWindow.h"
#include <vector>
#include <mutex>
-#include "AccessibleUtils.h"
#include "IEventConsumer.h"
-
#include "Rect.h"
#include "config.h"
* @since_tizen 5.5
*/
class AccessibleNode : public std::enable_shared_from_this<AccessibleNode>, public IEventConsumer {
-public: // Constructor & Destructor
+public:
/**
* @brief TBD
* @since_tizen 5.5
+++ /dev/null
-#pragma once
-
-//#include <atspi/atspi.h>
-#include <gio/gio.h>
-
-#include <string.h>
-#include <memory>
-
-#include "config.h"
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-struct GobjDeletor {
- void operator()(gpointer ptr) const
- {
- if (ptr) g_object_unref(ptr);
- }
-};
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-struct GarrayDeletor {
- void operator()(GArray *ptr) const
- {
- if (ptr) g_array_free(ptr, 1);
- }
-};
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-using unique_ptr_gobj = std::unique_ptr<T, GobjDeletor>;
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-using unique_ptr_garray = std::unique_ptr<T, GarrayDeletor>;
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-unique_ptr_gobj<T> make_gobj_unique(T *ptr)
-{
- return unique_ptr_gobj<T>(ptr);
-}
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-unique_ptr_garray<T> make_garray_unique(T *ptr)
-{
- return unique_ptr_garray<T>(ptr);
-}
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-unique_ptr_gobj<T> make_gobj_ref_unique(T *ptr)
-{
- g_object_ref(ptr);
- return unique_ptr_gobj<T>(ptr);
-}
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-std::shared_ptr<T> make_gobj_shared(T *ptr)
-{
- return std::shared_ptr<T>(ptr, [](T *ptr){ if(ptr) g_object_unref(ptr); });
-}
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-std::shared_ptr<T> make_garray_shared(T *ptr)
-{
- return std::shared_ptr<T>(ptr, [](T *ptr){ if(ptr) g_array_free(ptr, 1); });
-}
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-template <class T>
-std::shared_ptr<T> make_gobj_ref_shared(T *ptr)
-{
- g_object_ref(ptr);
- return std::shared_ptr<T>(ptr, [](T *ptr){ if(ptr) g_object_unref(ptr); });
-}
-
-/**
- * @brief TBD
- * @since_tizen 5.5
- */
-//char *state_to_char(AtspiStateType state);
#include "AccessibleApplication.h"
#include "AccessibleWindow.h"
#include "AccessibleNode.h"
-#include "AccessibleUtils.h"
#include "IEventSource.h"
#include "Runnable.h"
#include "A11yEvent.h"
*/
virtual std::vector<std::shared_ptr<AccessibleApplication>> getApplications(void) const = 0;
- /**s
+ /**
* @brief TBD
* @since_tizen 6.5
*/
virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) = 0;
+ /**
+ * @brief TBD
+ * @since_tizen 6.5
+ */
virtual std::map<AtspiAccessible *, std::shared_ptr<AccessibleApplication>> getActiveAppMap(void) = 0;
+
public:
/**
* @brief TBD
#pragma once
enum class EventType {
- Window,
- Object,
-};
-
-enum class WindowEventType {
- WindowActivated,
- WindowDeactivated,
- WindowCreated,
- WindowDestroyed,
+ none = 0,
+ Object = 1,
};
enum class ObjectEventType {
- ObjectStateVisible,
- ObjectStateDefunct,
+ none = 0,
+ ObjectStateDefunct = 1,
};
class IEventConsumer
*/
virtual ~IAtspiEvents() {}
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- virtual void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) = 0;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- virtual void onWindowDeactivated(AtspiAccessible *node) = 0;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- virtual void onWindowCreated(AtspiAccessible *node) = 0;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- virtual void onWindowDestroyed(AtspiAccessible *node) = 0;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- virtual void onVisibilityChanged(AtspiAccessible *node, bool visible) = 0;
-
/**
* @brief TBD
* @since_tizen 5.5
*/
static void onAtspiEvents(AtspiEvent *event, void *user_data);
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) override;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- void onWindowDeactivated(AtspiAccessible *node) override;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- void onWindowCreated(AtspiAccessible *node) override;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- void onWindowDestroyed(AtspiAccessible *node) override;
-
- /**
- * @brief TBD
- * @since_tizen 5.5
- */
- void onVisibilityChanged(AtspiAccessible *node, bool visible) override;
-
/**
* @brief TBD
* @since_tizen 5.5
*/
bool addToWindowSet(AtspiAccessible *node);
- void print_debug();
-
/**
* @brief TBD
* @since_tizen 6.5
#pragma once
#include "config.h"
-
#include "IDevice.h"
-#include <set>
-#ifdef GBS_BUILD
+#include <set>
#include <efl_util.h>
-#endif
+
/**
* @brief TizenDeviceImpl Class
* @since_tizen 5.5
* @since_tizen 5.5
*/
Waiter(const ISearchable *searchableObject,
- const UiObject *uiObject = nullptr); // : mObject{object}
+ const UiObject *uiObject = nullptr);
/**
* @brief TBD
+++ /dev/null
-#include "Aurum.h"
-
-#include <string.h>
-
-char* state_to_char(AtspiStateType state)
-{
- switch (state) {
- case ATSPI_STATE_INVALID:
- return strdup("ATSPI_STATE_INVALID");
- case ATSPI_STATE_ACTIVE:
- return strdup("ATSPI_STATE_ACTIVE");
- case ATSPI_STATE_ARMED:
- return strdup("ATSPI_STATE_ARMED");
- case ATSPI_STATE_BUSY:
- return strdup("ATSPI_STATE_BUSY");
- case ATSPI_STATE_CHECKED:
- return strdup("ATSPI_STATE_CHECKED");
- case ATSPI_STATE_COLLAPSED:
- return strdup("ATSPI_STATE_COLLAPSED");
- case ATSPI_STATE_DEFUNCT:
- return strdup("ATSPI_STATE_DEFUNCT");
- case ATSPI_STATE_EDITABLE:
- return strdup("ATSPI_STATE_EDITABLE");
- case ATSPI_STATE_ENABLED:
- return strdup("ATSPI_STATE_ENABLED");
- case ATSPI_STATE_EXPANDABLE:
- return strdup("ATSPI_STATE_EXPANDABLE");
- case ATSPI_STATE_EXPANDED:
- return strdup("ATSPI_STATE_EXPANDED");
- case ATSPI_STATE_FOCUSABLE:
- return strdup("ATSPI_STATE_FOCUSABLE");
- case ATSPI_STATE_FOCUSED:
- return strdup("ATSPI_STATE_FOCUSED");
- case ATSPI_STATE_HAS_TOOLTIP:
- return strdup("ATSPI_STATE_HAS_TOOLTIP");
- case ATSPI_STATE_HORIZONTAL:
- return strdup("ATSPI_STATE_HORIZONTAL");
- case ATSPI_STATE_ICONIFIED:
- return strdup("ATSPI_STATE_ICONIFIED");
- case ATSPI_STATE_MULTI_LINE:
- return strdup("ATSPI_STATE_MULTI_LINE");
- case ATSPI_STATE_MULTISELECTABLE:
- return strdup("ATSPI_STATE_MULTISELECTABLE");
- case ATSPI_STATE_OPAQUE:
- return strdup("ATSPI_STATE_OPAQUE");
- case ATSPI_STATE_PRESSED:
- return strdup("ATSPI_STATE_PRESSED");
- case ATSPI_STATE_RESIZABLE:
- return strdup("ATSPI_STATE_RESIZABLE");
- case ATSPI_STATE_SELECTABLE:
- return strdup("ATSPI_STATE_SELECTABLE");
- case ATSPI_STATE_SELECTED:
- return strdup("ATSPI_STATE_SELECTED");
- case ATSPI_STATE_SENSITIVE:
- return strdup("ATSPI_STATE_SENSITIVE");
- case ATSPI_STATE_SHOWING:
- return strdup("ATSPI_STATE_SHOWING");
- case ATSPI_STATE_SINGLE_LINE:
- return strdup("ATSPI_STATE_SINGLE_LINE");
- case ATSPI_STATE_STALE:
- return strdup("ATSPI_STATE_STALE");
- case ATSPI_STATE_TRANSIENT:
- return strdup("ATSPI_STATE_TRANSIENT");
- case ATSPI_STATE_VERTICAL:
- return strdup("ATSPI_STATE_VERTICAL");
- case ATSPI_STATE_VISIBLE:
- return strdup("ATSPI_STATE_VISIBLE");
- case ATSPI_STATE_MANAGES_DESCENDANTS:
- return strdup("ATSPI_STATE_MANAGES_DESCENDANTS");
- case ATSPI_STATE_INDETERMINATE:
- return strdup("ATSPI_STATE_INDETERMINATE");
- case ATSPI_STATE_REQUIRED:
- return strdup("ATSPI_STATE_REQUIRED");
- case ATSPI_STATE_TRUNCATED:
- return strdup("ATSPI_STATE_TRUNCATED");
- case ATSPI_STATE_ANIMATED:
- return strdup("ATSPI_STATE_ANIMATED");
- case ATSPI_STATE_INVALID_ENTRY:
- return strdup("ATSPI_STATE_INVALID_ENTRY");
- case ATSPI_STATE_SUPPORTS_AUTOCOMPLETION:
- return strdup("ATSPI_STATE_SUPPORTS_AUTOCOMPLETION");
- case ATSPI_STATE_SELECTABLE_TEXT:
- return strdup("ATSPI_STATE_SELECTABLE_TEXT");
- case ATSPI_STATE_IS_DEFAULT:
- return strdup("ATSPI_STATE_IS_DEFAULT");
- case ATSPI_STATE_VISITED:
- return strdup("ATSPI_STATE_VISITED");
- case ATSPI_STATE_CHECKABLE:
- return strdup("ATSPI_STATE_CHECKABLE");
- case ATSPI_STATE_HAS_POPUP:
- return strdup("ATSPI_STATE_HAS_POPUP");
- case ATSPI_STATE_READ_ONLY:
- return strdup("ATSPI_STATE_READ_ONLY");
- case ATSPI_STATE_LAST_DEFINED:
- return strdup("ATSPI_STATE_LAST_DEFINED");
- case ATSPI_STATE_MODAL:
- return strdup("ATSPI_STATE_MODAL");
- default:
- return strdup("\0");
- }
-}
-
-static void _print_stateset_debug( AtspiStateSet *stateSet)
-{
- if (!stateSet) return;
- GArray *states = AtspiWrapper::Atspi_state_set_get_states(stateSet);
- if (!states) return;
-
- char *state_name = NULL;
- AtspiStateType stat;
- LOGI("check ss:%p s:%p, len:%d", stateSet, states, states->len);
- for (int i = 0; states && (i < states->len); ++i) {
- stat = g_array_index(states, AtspiStateType, i);
- state_name = state_to_char(stat);
- LOGI("state: %s", state_name);
- free(state_name);
- }
- g_array_free(states, 1);
-}
\ No newline at end of file
libaurum_src += [
files('AccessibleApplication.cc'),
files('AccessibleNode.cc'),
- #files('AccessibleUtils.cc'),
files('AccessibleWatcher.cc'),
files('AccessibleWindow.cc'),
]
\ No newline at end of file
#include <thread>
#include <iostream>
+#define COMPARE(A, B) \
+ (B != A11yEvent::EVENT_NONE) && ((A & B) == B)
+
std::vector<std::shared_ptr<A11yEventInfo>> AtspiAccessibleWatcher::mEventQueue;
GThread *AtspiAccessibleWatcher::mEventThread = nullptr;
std::mutex AtspiAccessibleWatcher::mMutex = std::mutex{};
if (pkg) free(pkg);
}
-void AtspiAccessibleWatcher::print_debug()
-{
- LOGI("activatewindowlist-------------------");
- std::for_each(mActivatedWindowList.begin(), mActivatedWindowList.end(), [](auto acc){
- LOGI("child:%p", acc);
- });
-
- LOGI("mActivatedApplicationList--------------------------");
- std::for_each(mActivatedApplicationList.begin(), mActivatedApplicationList.end(), [](auto acc){
- LOGI("child:%p", acc);
- });
-
- LOGI("mWindowSet------------------------------");
- std::for_each(mWindowSet.begin(), mWindowSet.end(), [](auto acc){
- LOGI("child:%p", acc);
- });
- LOGI("------------------------------");
-}
-
-void AtspiAccessibleWatcher::onWindowActivated(AtspiAccessible *node,
- WindowActivateInfoType type)
-{
- LOGI("onWindowActivated obj:%p", node);
- notifyAll((int)EventType::Window, (int)WindowEventType::WindowActivated, node);
-}
-
-void AtspiAccessibleWatcher::onWindowDeactivated(AtspiAccessible *node)
-{
- LOGI("onWindowDeactivated obj:%p", node);
- notifyAll((int)EventType::Window, (int)WindowEventType::WindowDeactivated, node);
-}
-
-void AtspiAccessibleWatcher::onWindowCreated(AtspiAccessible *node)
-{
- LOGI("onWindowCreated obj:%p", node);
- notifyAll((int)EventType::Window, (int)WindowEventType::WindowCreated, node);
-}
-
-void AtspiAccessibleWatcher::onWindowDestroyed(AtspiAccessible *node)
-{
- LOGI("onWindowDestroyed obj:%p", node);
- notifyAll((int)EventType::Window, (int)WindowEventType::WindowDestroyed, node);
-}
-
-void AtspiAccessibleWatcher::onVisibilityChanged(AtspiAccessible *node, bool visible)
-{
- LOGI("onVisibilityChanged obj:%p", node);
- notifyAll((int)EventType::Object, (int)ObjectEventType::ObjectStateVisible, node);
-}
-
void AtspiAccessibleWatcher::onObjectDefunct(AtspiAccessible *node)
{
LOGI("onObjectDefunct obj:%p", node);
return ret;
}
-#define COMPARE(A, B) \
- (B != A11yEvent::EVENT_NONE) && ((A & B) == B)
-
bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout)
{
mMutex.lock();
{
}
-// UiObject::UiObject(const UiObject &src)
-// : mDevice(src.mDevice),
-// mSelector(src.mSelector),
-// mNode(src.mNode),
-// mWaiter{src.mWaiter},
-// mNode_src(std::move(src.mNode_src))
-
-// {
-// }
-
UiObject::UiObject(UiObject &&src)
: mDevice(src.mDevice),
mSelector(std::move(src.mSelector)),
config_h = configuration_data()
if get_option('tizen') == true
- config_h.set10('GBS_BUILD', true)
- config_h.set10('GBSBUILD', true)
config_h.set10('TIZEN', true)
else
message('')
#include "CloseAppCommand.h"
#include <chrono>
#include <thread>
-#ifdef GBSBUILD
#include <app_manager_extension.h>
-#endif
CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request,
::aurum::RspCloseApp *response)
::grpc::Status CloseAppCommand::execute()
{
LOGI("CloseApp --------------- ");
-#ifdef GBSBUILD
+
std::string packageName = mRequest->packagename();
app_context_h app_context = NULL;
mResponse->set_status(::aurum::RspStatus::ERROR);
return grpc::Status::OK;
}
-#endif
+
return grpc::Status::OK;
}
#include "bootstrap.h"
#include "GetAppInfoCommand.h"
-#ifdef GBSBUILD
#include <app_manager_extension.h>
#include <package_manager.h>
-#endif
GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request,
::aurum::RspGetAppInfo *response)
::grpc::Status GetAppInfoCommand::execute()
{
LOGI("GetAppInfo --------------- ");
-#ifdef GBSBUILD
+
std::string packageName = mRequest->packagename();
app_context_h app_context;
}
}
-#endif
return grpc::Status::OK;
}
#include <fstream>
#include <chrono>
#include <thread>
-#ifdef GBSBUILD
#include <package_manager.h>
-#endif
InstallAppCommand::InstallAppCommand(
::grpc::ServerReader<::aurum::ReqInstallApp> *request,
::grpc::Status InstallAppCommand::execute()
{
LOGI("InstallApp --------------- ");
-#ifdef GBSBUILD
+
::aurum::ReqInstallApp chunk;
std::ofstream outfile("/tmp/app.tpk", std::ofstream::binary);
package_manager_request_create(&pkgRequest);
package_manager_request_install(pkgRequest, "/tmp/app.tpk", &id);
-#endif
+
return grpc::Status::OK;
}
#include "RemoveAppCommand.h"
#include <chrono>
#include <thread>
-#ifdef GBSBUILD
#include <package_manager.h>
-#endif
RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request,
::aurum::RspRemoveApp* response)
{
LOGI("RemoveAppCommand::execute");
-#ifdef GBSBUILD
package_manager_request_h pkgRequest;
std::string name = mRequest->packagename();
int id;
mResponse->set_status(::aurum::RspStatus::OK);
}
}
-#endif
+
return grpc::Status::OK;
}
#include "bootstrap.h"
#include "LaunchAppCommand.h"
#include "LaunchAppRunnable.h"
-
-#ifdef GBSBUILD
#include <app_control.h>
-#endif
LaunchAppRunnable::LaunchAppRunnable(std::string pkg, const google::protobuf::RepeatedPtrField<aurum::LaunchData>& data)
: mPkg{pkg}, mData(data)
void LaunchAppRunnable::run() const
{
-#ifdef GBSBUILD
app_control_h appControl;
std::string packageName = mPkg;
int ret = -1;
}
app_control_destroy(appControl);
-#endif
}
std::string LaunchAppRunnable::getPkgName()
projects / platform / core / uifw / aurum.git / commitdiff