Skip to content

Use a library for signals/slots #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adazem009 merged 8 commits into from
Mar 23, 2024
Merged

Use a library for signals/slots #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c396baf
Add sigslot library
adazem009 Mar 21, 2024
3027921
Replace redraw handler with a signal
adazem009 Mar 21, 2024
9949e33
Replace monitor added/removed handlers with signals
adazem009 Mar 21, 2024
118be3e
Replace question asked/answered handlers with signals
adazem009 Mar 21, 2024
d3e1e25
Replace download progress callback with a signal
adazem009 Mar 22, 2024
5d0ac93
Add stop all bypass test
adazem009 Mar 22, 2024
85f8b13
Add thread about to stop signal
adazem009 Mar 22, 2024
049fc34
Remove stopped threads in blocks implementation
adazem009 Mar 22, 2024
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
30 changes: 14 additions & 16 deletions include/scratchcpp/iengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <functional>

#include "global.h"
#include "signal.h"

namespace libscratchcpp
{
Expand Down Expand Up @@ -109,8 +110,11 @@ class LIBSCRATCHCPP_EXPORT IEngine
/*! Stops the event loop which is running in another thread. */
virtual void stopEventLoop() = 0;

/*! Sets the function which is called on every frame. */
virtual void setRedrawHandler(const std::function<void()> &handler) = 0;
/*! Emits when rendering should occur. */
virtual sigslot::signal<> &aboutToRender() = 0;

/*! Emits when a script is about to stop. */
virtual sigslot::signal<VirtualMachine *> &threadAboutToStop() = 0;

/*! Returns true if the project is currently running. */
virtual bool isRunning() const = 0;
Expand Down Expand Up @@ -345,23 +349,17 @@ class LIBSCRATCHCPP_EXPORT IEngine
/*! Sets the list of monitors. */
virtual void setMonitors(const std::vector<std::shared_ptr<Monitor>> &newMonitors) = 0;

/*! Sets the function which is called when a monitor is added. */
virtual void setAddMonitorHandler(const std::function<void(Monitor *)> &handler) = 0;

/*! Sets the function which is called when a monitor is removed. */
virtual void setRemoveMonitorHandler(const std::function<void(Monitor *, IMonitorHandler *)> &handler) = 0;

/*! Returns the function which is called when a question is asked, for example using the 'ask and wait' block. */
virtual const std::function<void(const std::string &)> &questionAsked() const = 0;
/*! Emits when a monitor is added. */
virtual sigslot::signal<Monitor *> &monitorAdded() = 0;

/*! Sets the function which is called when a question is asked, for example using the 'ask and wait' block. */
virtual void setQuestionAsked(const std::function<void(const std::string &)> &f) = 0;
/*! Emits when a monitor is removed. */
virtual sigslot::signal<Monitor *, IMonitorHandler *> &monitorRemoved() = 0;

/*! Returns the function which should be called when a question is answered. */
virtual const std::function<void(const std::string &)> &questionAnswered() const = 0;
/*! Emits when a question is asked, for example using the 'ask and wait' block. */
virtual sigslot::signal<const std::string &> &questionAsked() = 0;

/*! Sets the function which should be called when a question is answered. */
virtual void setQuestionAnswered(const std::function<void(const std::string &)> &f) = 0;
/*! Emits when a question is answered. */
virtual sigslot::signal<const std::string &> &questionAnswered() = 0;

/*! Returns the list of extension names. */
virtual const std::vector<std::string> &extensions() const = 0;
Expand Down
3 changes: 2 additions & 1 deletion include/scratchcpp/project.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "spimpl.h"

#include "global.h"
#include "signal.h"

namespace libscratchcpp
{
Expand Down Expand Up @@ -42,7 +43,7 @@ class LIBSCRATCHCPP_EXPORT Project

std::shared_ptr<IEngine> engine() const;

void setDownloadProgressCallback(const std::function<void(unsigned int, unsigned int)> &&f);
sigslot::signal<unsigned int, unsigned int> &downloadProgressChanged();

private:
spimpl::unique_impl_ptr<ProjectPrivate> impl;
Expand Down
Loading