From 3739aeb76b1f150ddd7b49dc2e9bd033ae09ea0d Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Mon, 4 Jun 2018 11:17:44 +0900 Subject: Rename APIs init -> registerMyApplication activateSurface -> allocateWindowResource deactivateSurface -> releaseWindowResource Change-Id: I0540014289ebb67bf1aeb59a30a24b5e642f1d86 Signed-off-by: Yuta Doi --- src/qlibwindowmanager.cpp | 45 +++++++++++++++++++++++++++++++++++---------- src/qlibwindowmanager.h | 19 ++++++++++++++----- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/src/qlibwindowmanager.cpp b/src/qlibwindowmanager.cpp index bc313e5..69e5b10 100644 --- a/src/qlibwindowmanager.cpp +++ b/src/qlibwindowmanager.cpp @@ -26,9 +26,14 @@ using namespace std; -int QLibWindowmanager::init(int port, const QString &token) { +int QLibWindowmanager::registerMyApplication(int port, const QString &token) { string ctoken = token.toStdString(); - return this->wm->init(port, ctoken.c_str()); + return this->wm->registerMyApplication(port, ctoken.c_str()); +} + +// This API is old, please use new API. +int QLibWindowmanager::init(int port, const QString &token) { + return this->registerMyApplication(port, token); } int QLibWindowmanager::requestSurface(const QString &label) { @@ -51,30 +56,45 @@ int QLibWindowmanager::requestSurface(const QString &label) { } } -int QLibWindowmanager::activateSurface(const QString &label) { +int QLibWindowmanager::allocateWindowResource(const QString &label) { json_object *obj = json_object_new_object(); string clabel = label.toStdString(); // Request default drawing area "normal.full" string cdrawing_area = wm->kStrLayoutNormal + wm->kStrAreaFull; json_object_object_add(obj, wm->kKeyDrawingName, json_object_new_string(clabel.c_str())); json_object_object_add(obj, wm->kKeyDrawingArea, json_object_new_string(cdrawing_area.c_str())); - return this->wm->activateSurface(obj); + return this->wm->allocateWindowResource(obj); } -int QLibWindowmanager::activateSurface(const QString &label, const QString &drawing_area) { +int QLibWindowmanager::allocateWindowResource(const QString &label, const QString &drawing_area) { json_object *obj = json_object_new_object(); string clabel = label.toStdString(); string cdrawing_area = drawing_area.toStdString(); json_object_object_add(obj, wm->kKeyDrawingName, json_object_new_string(clabel.c_str())); json_object_object_add(obj, wm->kKeyDrawingArea, json_object_new_string(cdrawing_area.c_str())); - return this->wm->activateSurface(obj); + return this->wm->allocateWindowResource(obj); } -int QLibWindowmanager::deactivateSurface(const QString &label) { +int QLibWindowmanager::releaseWindowResource(const QString &label) { json_object *obj = json_object_new_object(); string clabel = label.toStdString(); json_object_object_add(obj, wm->kKeyDrawingName, json_object_new_string(clabel.c_str())); - return this->wm->deactivateSurface(obj); + return this->wm->releaseWindowResource(obj); +} + +// This API is old, please use new API. +int QLibWindowmanager::activateSurface(const QString &label) { + return this->allocateWindowResource(label); +} + +// This API is old, please use new API. +int QLibWindowmanager::activateSurface(const QString &label, const QString &drawing_area) { + return this->allocateWindowResource(label, drawing_area); +} + +// This API is old, please use new API. +int QLibWindowmanager::deactivateSurface(const QString &label) { + return this->releaseWindowResource(label); } int QLibWindowmanager::endDraw(const QString &label) { @@ -90,15 +110,20 @@ void QLibWindowmanager::set_event_handler(enum QEventType et, return this->wm->set_event_handler(wet, std::move(f)); } -void QLibWindowmanager::slotActivateSurface(){ +void QLibWindowmanager::slotAllocateWindowResource(){ // This is needed for first rendering when the app is launched if(!isActive){ qDebug("Let's show %s", qPrintable(applabel)); isActive = true; - this->activateSurface(applabel); + this->allocateWindowResource(applabel); } } +// This API is old, please use new API. +void QLibWindowmanager::slotActivateSurface(){ + this->slotAllocateWindowResource(); +} + QLibWindowmanager::QLibWindowmanager(QObject *parent) :QObject(parent), isActive(false) { diff --git a/src/qlibwindowmanager.h b/src/qlibwindowmanager.h index 6b796f6..3064df0 100644 --- a/src/qlibwindowmanager.h +++ b/src/qlibwindowmanager.h @@ -44,18 +44,27 @@ public: Event_FlushDraw, }; - int init(int port, const QString &token); + int registerMyApplication(int port, const QString &token); // WM API Q_INVOKABLE int requestSurface(const QString &label); - Q_INVOKABLE int activateSurface(const QString &label); - Q_INVOKABLE int activateSurface(const QString &label, const QString &drawing_area); - Q_INVOKABLE int deactivateSurface(const QString &label); + Q_INVOKABLE int allocateWindowResource(const QString &label); + Q_INVOKABLE int allocateWindowResource(const QString &label, const QString &drawing_area); + Q_INVOKABLE int releaseWindowResource(const QString &label); Q_INVOKABLE int endDraw(const QString &label); void set_event_handler(enum QEventType et, handler_fun f); + // This API is old, please use new API. + THIS_FUNCTION_IS_DEPRECATED(int init(int port, const QString &token)); + THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &label)); + THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &label, const QString &drawing_area)); + THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int deactivateSurface(const QString &label)); + public slots: - void slotActivateSurface(); + void slotAllocateWindowResource(); + + // This API is old, please use new API. + THIS_FUNCTION_IS_DEPRECATED(void slotActivateSurface()); private: LibWindowmanager* wm; -- cgit 1.2.3-korg