-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
769c3ae
commit ca40f24
Showing
7 changed files
with
152 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule fcitx5
updated
10 files
| +1 −1 | CMakeLists.txt | |
| +10 −12 | src/lib/fcitx-utils/CMakeLists.txt | |
| +86 −0 | src/lib/fcitx-utils/event.cpp | |
| +8 −55 | src/lib/fcitx-utils/event.h | |
| +71 −274 | src/lib/fcitx-utils/event_libuv.cpp | |
| +249 −0 | src/lib/fcitx-utils/event_libuv.h | |
| +21 −0 | src/lib/fcitx-utils/event_p.h | |
| +64 −51 | src/lib/fcitx-utils/event_sdevent.cpp | |
| +8 −4 | src/lib/fcitx-utils/eventloopinterface.cpp | |
| +136 −0 | src/lib/fcitx-utils/eventloopinterface.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| #include "event_js.h" | ||
| #include <emscripten.h> | ||
| #include <fcitx-utils/event_p.h> | ||
| #include <fcitx-utils/log.h> | ||
|
|
||
| namespace fcitx { | ||
|
|
||
| std::unique_ptr<EventLoopInterface> createDefaultEventLoop() { | ||
| return std::make_unique<JSEventLoop>(); | ||
| } | ||
|
|
||
| const char *defaultEventLoopImplementation() { return "js"; } | ||
|
|
||
| template <typename Interface> struct JSEventSourceBase : public Interface { | ||
| public: | ||
| ~JSEventSourceBase() override {} | ||
|
|
||
| bool isEnabled() const override { return enabled_; } | ||
|
|
||
| void setEnabled(bool enabled) override { enabled_ = enabled; } | ||
|
|
||
| bool isOneShot() const override { return oneShot_; } | ||
|
|
||
| void setOneShot() override { oneShot_ = true; } | ||
|
|
||
| private: | ||
| bool enabled_ = false; | ||
| bool oneShot_ = false; | ||
| }; | ||
|
|
||
| struct JSEventSource : public JSEventSourceBase<EventSource> { | ||
| JSEventSource(EventCallback _callback) | ||
| : callback_(std::make_shared<EventCallback>(std::move(_callback))) {} | ||
|
|
||
| std::shared_ptr<EventCallback> callback_; | ||
| }; | ||
|
|
||
| struct JSEventSourceIO : public JSEventSourceBase<EventSourceIO> { | ||
| JSEventSourceIO(IOCallback _callback) {} | ||
|
|
||
| int fd() const override { return 0; } | ||
|
|
||
| void setFd(int fd) override {} | ||
|
|
||
| IOEventFlags events() const override { return IOEventFlag::In; } | ||
|
|
||
| void setEvents(IOEventFlags flags) override {} | ||
|
|
||
| IOEventFlags revents() const override { return IOEventFlag::In; } | ||
| }; | ||
|
|
||
| void TimeEventCallback(void *arg); | ||
|
|
||
| struct JSEventSourceTime : public JSEventSourceBase<EventSourceTime> { | ||
| JSEventSourceTime(TimeCallback _callback, uint64_t time, clockid_t clockid) | ||
| : callback_(std::make_shared<TimeCallback>(std::move(_callback))), | ||
| time_(time), clockid_(clockid) { | ||
| setOneShot(); | ||
| } | ||
|
|
||
| void setOneShot() override { | ||
| int t = std::max<int64_t>(0, time_ - now(CLOCK_MONOTONIC)) / 1000; | ||
| emscripten_async_call(TimeEventCallback, this, t); | ||
| } | ||
|
|
||
| uint64_t time() const override { return time_; } | ||
|
|
||
| void setTime(uint64_t time) override { time_ = time; } | ||
|
|
||
| uint64_t accuracy() const override { return 0; } | ||
|
|
||
| void setAccuracy(uint64_t time) override {} | ||
|
|
||
| clockid_t clock() const override { return clockid_; } | ||
|
|
||
| std::shared_ptr<TimeCallback> callback_; | ||
|
|
||
| private: | ||
| uint64_t time_; | ||
| clockid_t clockid_; | ||
| }; | ||
|
|
||
| void TimeEventCallback(void *arg) { | ||
| auto source = static_cast<JSEventSourceTime *>(arg); | ||
| (*source->callback_)(source, source->time()); | ||
| } | ||
|
|
||
| std::unique_ptr<EventSourceIO> | ||
| JSEventLoop::addIOEvent(int fd, IOEventFlags flags, IOCallback callback) { | ||
| auto source = std::make_unique<JSEventSourceIO>(std::move(callback)); | ||
| return source; | ||
| } | ||
|
|
||
| std::unique_ptr<EventSourceTime> | ||
| JSEventLoop::addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, | ||
| TimeCallback callback) { | ||
| auto source = | ||
| std::make_unique<JSEventSourceTime>(std::move(callback), usec, clock); | ||
| return source; | ||
| } | ||
|
|
||
| std::unique_ptr<EventSource> JSEventLoop::addExitEvent(EventCallback callback) { | ||
| auto source = std::make_unique<JSEventSource>(std::move(callback)); | ||
| return source; | ||
| } | ||
|
|
||
| std::unique_ptr<EventSource> | ||
| JSEventLoop::addDeferEvent(EventCallback callback) { | ||
| return addTimeEvent( | ||
| CLOCK_MONOTONIC, now(CLOCK_MONOTONIC), 0, | ||
| [callback = std::move(callback)](EventSourceTime *source, uint64_t) { | ||
| return callback(source); | ||
| }); | ||
| } | ||
|
|
||
| std::unique_ptr<EventSource> JSEventLoop::addPostEvent(EventCallback callback) { | ||
| FCITX_ERROR() << "Not implemented"; | ||
| return nullptr; | ||
| } | ||
|
|
||
| } // namespace fcitx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #pragma once | ||
|
|
||
| #include <fcitx-utils/eventloopinterface.h> | ||
|
|
||
| namespace fcitx { | ||
| class JSEventLoop : public EventLoopInterface { | ||
| public: | ||
| JSEventLoop() = default; | ||
| ~JSEventLoop() override = default; | ||
| bool exec() override { return true; } | ||
| void exit() override {} | ||
| const char *implementation() const override { return "js"; } | ||
| void *nativeHandle() override { return nullptr; } | ||
|
|
||
| std::unique_ptr<EventSourceIO> addIOEvent(int fd, IOEventFlags flags, | ||
| IOCallback callback) override; | ||
| std::unique_ptr<EventSourceTime> | ||
| addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, | ||
| TimeCallback callback) override; | ||
| std::unique_ptr<EventSource> addExitEvent(EventCallback callback) override; | ||
| std::unique_ptr<EventSource> addDeferEvent(EventCallback callback) override; | ||
| std::unique_ptr<EventSource> addPostEvent(EventCallback callback) override; | ||
| }; | ||
| } // namespace fcitx |