Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/libinputactions/scripting/Promise.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,16 @@ void Promise::reject(const QString &errorMessage) const
QThreadHelpers::runOnThread(
QThreadHelpers::mainThread(),
[this, errorMessage]() {
if (m_reject.isCallable()) {
m_engine->call(m_reject, {m_engine->ensureEngine().newErrorObject(QJSValue::GenericError, errorMessage)});
}
reject(m_engine->ensureEngine().newErrorObject(QJSValue::GenericError, errorMessage));
},
true);
}

void Promise::reject(const QJSValue &error) const
{
if (m_reject.isCallable()) {
m_engine->call(m_reject, {error});
}
}

}
4 changes: 4 additions & 0 deletions src/libinputactions/scripting/Promise.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ class Promise
true);
}

/**
* Thread-safe.
*/
void reject(const QString &errorMessage) const;
void reject(const QJSValue &error) const;

private:
ScriptingEngine *m_engine;
Expand Down
2 changes: 1 addition & 1 deletion src/libinputactions/scripting/ScriptingEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void ScriptingEngine::initialize()
}
)");

m_coreModule = std::make_unique<CoreModule>(m_engine->globalObject());
m_coreModule = std::make_unique<CoreModule>(this);
QJSEngine::setObjectOwnership(m_coreModule.get(), QJSEngine::CppOwnership);
auto coreModule = m_engine->newQObject(m_coreModule.get());
coreModule.setProperty("Point", m_engine->newQMetaObject(&PointF::staticMetaObject));
Expand Down
5 changes: 0 additions & 5 deletions src/libinputactions/scripting/ScriptingEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ class ScriptingEngine : public QObject
QString errorToString(const QJSValue &error) const;
void logError(const QJSValue &error) const;

/**
* Thread-safe.
*/
void throwError(const QString &message) const;

template<typename TReturn, typename... TArgs, typename TFunction>
QJSValue newFunction(TFunction &&function)
{
Expand Down
23 changes: 20 additions & 3 deletions src/libinputactions/scripting/modules/core/CoreModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,37 @@
#include "Config.h"
#include <QJSEngine>
#include <libinputactions/input/backends/InputBackend.h>
#include <libinputactions/scripting/Promise.h>
#include <libinputactions/scripting/ScriptingEngine.h>
#include <libinputactions/variables/VariableRegistry.h>

namespace InputActions
{

CoreModule::CoreModule(QJSValue globalObject)
: m_config(std::make_unique<Config>())
, m_globalObject(std::move(globalObject))
CoreModule::CoreModule(ScriptingEngine *engine)
: m_engine(engine)
, m_config(std::make_unique<Config>())
, m_globalObject(engine->ensureEngine().globalObject())
{
QJSEngine::setObjectOwnership(m_config.get(), QJSEngine::CppOwnership);
}

CoreModule::~CoreModule() = default;

QJSValue CoreModule::delay(double duration)
{
auto promise = g_scriptingEngine->newPromise();
if (duration < 1 || duration > INT32_MAX) {
promise.reject(m_engine->ensureEngine().newErrorObject(QJSValue::RangeError, QString("Value %1 is out of range.").arg(QString::number(duration))));
return promise.promise();
}

QTimer::singleShot(std::floor(duration), Qt::PreciseTimer, this, [promise]() {
promise.fulfill();
});
return promise.promise();
}

Config *CoreModule::config() const
{
return m_config.get();
Expand Down
6 changes: 5 additions & 1 deletion src/libinputactions/scripting/modules/core/CoreModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace InputActions

class Config;
class InputBackend;
class ScriptingEngine;
class VariableRegistry;

class CoreModule : public QObject
Expand All @@ -38,15 +39,18 @@ class CoreModule : public QObject
Q_PROPERTY(VariableRegistry *variableRegistry READ variableRegistry)

public:
CoreModule(QJSValue globalObject);
CoreModule(ScriptingEngine *engine);
~CoreModule() override;

Config *config() const;
QJSValue globalThis() const { return m_globalObject; }
InputBackend *input() const;
VariableRegistry *variableRegistry() const;

Q_INVOKABLE QJSValue delay(double duration);

private:
ScriptingEngine *m_engine;
std::unique_ptr<Config> m_config;
QJSValue m_globalObject;
};
Expand Down